pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed newlines from log messages

Browse source 
Slightly speeded up event history processing each frame
This commit is contained in:
Sam Lantinga 2011-03-09 15:51:51 -08:00
parent 48ef3c9e2e
commit 608ec7da5f
1 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

48
test/testgesture.c
View file

@ -64,7 +64,7 @@ static Knob knob;
void handler (int sig) void handler (int sig)
{ {
SDL_Log ("exiting...(%d)\n", sig); SDL_Log ("exiting...(%d)", sig);
exit (0); exit (0);
} }
@ -147,30 +147,28 @@ void DrawScreen(SDL_Surface* screen)
#endif #endif
//draw Touch History //draw Touch History
for(i = SDL_max(0,eventWrite - EVENT_BUF_SIZE);i < eventWrite;i++) { for(i = eventWrite; i < eventWrite+EVENT_BUF_SIZE; ++i) {
SDL_Event event = events[i&(EVENT_BUF_SIZE-1)]; const SDL_Event *event = &events[i&(EVENT_BUF_SIZE-1)];
int age = eventWrite - i - 1; float age = (float)(i - eventWrite) / EVENT_BUF_SIZE;
float x, y; float x, y;
unsigned int c, col; unsigned int c, col;
if(event.type == SDL_FINGERMOTION || if(event->type == SDL_FINGERMOTION ||
event.type == SDL_FINGERDOWN || event->type == SDL_FINGERDOWN ||
event.type == SDL_FINGERUP) { event->type == SDL_FINGERUP) {
SDL_Touch* inTouch = SDL_GetTouch(event.tfinger.touchId); SDL_Touch* inTouch = SDL_GetTouch(event->tfinger.touchId);
if(inTouch == NULL) continue; if(inTouch == NULL) continue;
x = ((float)event.tfinger.x)/inTouch->xres; x = ((float)event->tfinger.x)/inTouch->xres;
y = ((float)event.tfinger.y)/inTouch->yres; y = ((float)event->tfinger.y)/inTouch->yres;
//draw the touch: //draw the touch:
c = colors[event.tfinger.touchId%7]; c = colors[event->tfinger.fingerId%7];
col = col = ((unsigned int)(c*(.1+.85))) | (unsigned int)(0xFF*age)<<24;
((unsigned int)(c*(.1+.85))) |
((unsigned int)((0xFF*(1-((float)age)/EVENT_BUF_SIZE))) & 0xFF)<<24;
if(event.type == SDL_FINGERMOTION) if(event->type == SDL_FINGERMOTION)
drawCircle(screen,x*screen->w,y*screen->h,5,col); drawCircle(screen,x*screen->w,y*screen->h,5,col);
else if(event.type == SDL_FINGERDOWN) else if(event->type == SDL_FINGERDOWN)
drawCircle(screen,x*screen->w,y*screen->h,-10,col); drawCircle(screen,x*screen->w,y*screen->h,-10,col);
} }
} }
@ -233,12 +231,12 @@ int main(int argc, char* argv[])
break; break;
case SDLK_s: case SDLK_s:
src = SDL_RWFromFile("gestureSave","w"); src = SDL_RWFromFile("gestureSave","w");
SDL_Log("Wrote %i templates\n",SDL_SaveAllDollarTemplates(src)); SDL_Log("Wrote %i templates",SDL_SaveAllDollarTemplates(src));
SDL_RWclose(src); SDL_RWclose(src);
break; break;
case SDLK_l: case SDLK_l:
src = SDL_RWFromFile("gestureSave","r"); src = SDL_RWFromFile("gestureSave","r");
SDL_Log("Loaded: %i\n",SDL_LoadDollarTemplates(-1,src)); SDL_Log("Loaded: %i",SDL_LoadDollarTemplates(-1,src));
SDL_RWclose(src); SDL_RWclose(src);
break; break;
case SDLK_ESCAPE: case SDLK_ESCAPE:
@ -257,7 +255,7 @@ int main(int argc, char* argv[])
break; break;
case SDL_FINGERMOTION: case SDL_FINGERMOTION:
#if VERBOSE #if VERBOSE
SDL_Log("Finger: %i,x: %i, y: %i\n",event.tfinger.fingerId, SDL_Log("Finger: %i,x: %i, y: %i",event.tfinger.fingerId,
event.tfinger.x,event.tfinger.y); event.tfinger.x,event.tfinger.y);
#endif #endif
{ {
@ -267,24 +265,24 @@ int main(int argc, char* argv[])
break; break;
case SDL_FINGERDOWN: case SDL_FINGERDOWN:
#if VERBOSE #if VERBOSE
SDL_Log("Finger: %"PRIs64" down - x: %i, y: %i\n", SDL_Log("Finger: %"PRIs64" down - x: %i, y: %i",
event.tfinger.fingerId,event.tfinger.x,event.tfinger.y); event.tfinger.fingerId,event.tfinger.x,event.tfinger.y);
#endif #endif
break; break;
case SDL_FINGERUP: case SDL_FINGERUP:
#if VERBOSE #if VERBOSE
SDL_Log("Finger: %"PRIs64" up - x: %i, y: %i\n", SDL_Log("Finger: %"PRIs64" up - x: %i, y: %i",
event.tfinger.fingerId,event.tfinger.x,event.tfinger.y); event.tfinger.fingerId,event.tfinger.x,event.tfinger.y);
#endif #endif
break; break;
case SDL_MULTIGESTURE: case SDL_MULTIGESTURE:
#if VERBOSE #if VERBOSE
SDL_Log("Multi Gesture: x = %f, y = %f, dAng = %f, dR = %f\n", SDL_Log("Multi Gesture: x = %f, y = %f, dAng = %f, dR = %f",
event.mgesture.x, event.mgesture.x,
event.mgesture.y, event.mgesture.y,
event.mgesture.dTheta, event.mgesture.dTheta,
event.mgesture.dDist); event.mgesture.dDist);
SDL_Log("MG: numDownTouch = %i\n",event.mgesture.numFingers); SDL_Log("MG: numDownTouch = %i",event.mgesture.numFingers);
#endif #endif
knob.p.x = event.mgesture.x; knob.p.x = event.mgesture.x;
knob.p.y = event.mgesture.y; knob.p.y = event.mgesture.y;
@ -292,12 +290,12 @@ int main(int argc, char* argv[])
knob.r += event.mgesture.dDist; knob.r += event.mgesture.dDist;
break; break;
case SDL_DOLLARGESTURE: case SDL_DOLLARGESTURE:
SDL_Log("Gesture %"PRIs64" performed, error: %f\n", SDL_Log("Gesture %"PRIs64" performed, error: %f",
event.dgesture.gestureId, event.dgesture.gestureId,
event.dgesture.error); event.dgesture.error);
break; break;
case SDL_DOLLARRECORD: case SDL_DOLLARRECORD:
SDL_Log("Recorded gesture: %"PRIs64"\n",event.dgesture.gestureId); SDL_Log("Recorded gesture: %"PRIs64"",event.dgesture.gestureId);
break; break;
} }
} }