Moved Multi finger gesture recognition into the library.
authorJim Grandpre <jim.tla@gmail.com>
Wed, 07 Jul 2010 04:13:08 -0700
changeset 4657 eed063a0bf5b
parent 4656 b5007b7995c6
child 4658 454385d76845
Moved Multi finger gesture recognition into the library.
include/SDL_events.h
src/events/SDL_events.c
src/events/SDL_events_c.h
src/events/SDL_gesture.c
src/events/SDL_gesture_c.h
src/events/SDL_touch.c
touchTest/gestureSDLTest.c
touchTest/makefile
touchTest/touchPong
touchTest/touchSimp
--- a/include/SDL_events.h	Tue Jul 06 02:05:27 2010 -0700
+++ b/include/SDL_events.h	Wed Jul 07 04:13:08 2010 -0700
@@ -86,13 +86,17 @@
     SDL_JOYBUTTONDOWN,          /**< Joystick button pressed */
     SDL_JOYBUTTONUP,            /**< Joystick button released */
 
-    /*Touch events - is 0x700 the correct place?*/
+    /*Touch events*/
     SDL_FINGERDOWN     = 0x700,
     SDL_FINGERUP,
     SDL_FINGERMOTION,
     SDL_TOUCHBUTTONDOWN,
     SDL_TOUCHBUTTONUP,    
 
+    /*Gesture events*/
+    SDL_DOLLARGESTURE     = 0x800,
+    SDL_MULTIGESTURE,
+
     /* Obsolete events */
     SDL_EVENT_COMPAT1 = 0x7000, /**< SDL 1.2 events for compatibility */
     SDL_EVENT_COMPAT2,
@@ -331,6 +335,28 @@
 } SDL_TouchButtonEvent;
 
 
+
+/**
+ *  \brief Multiple Finger Gesture Event
+ */
+typedef struct SDL_MultiGestureEvent
+{
+    Uint32 type;        /**< ::SDL_MULTIGESTURE */
+    Uint32 windowID;    /**< The window with mouse focus, if any */
+    Uint8 touchId;        /**< The touch device index */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    float dTheta;
+    float dDist;
+    float x;  //currently 0...1. Change to screen coords?
+    float y;  
+
+} SDL_MultiGestureEvent;
+
+
+
+
 /**
  *  \brief The "quit requested" event
  */
@@ -416,6 +442,7 @@
     SDL_ProximityEvent proximity;   /**< Proximity In or Out event */
     SDL_TouchFingerEvent tfinger;   /**< Touch finger event data */
     SDL_TouchButtonEvent tbutton;   /**< Touch button event data */
+    SDL_MultiGestureEvent mgesture; /**< Multi Finger Gesture data*/
 
     /** Temporarily here for backwards compatibility */
     /*@{*/
--- a/src/events/SDL_events.c	Tue Jul 06 02:05:27 2010 -0700
+++ b/src/events/SDL_events.c	Wed Jul 07 04:13:08 2010 -0700
@@ -493,6 +493,10 @@
     if (SDL_PeepEvents(event, 1, SDL_ADDEVENT, 0, 0) <= 0) {
         return -1;
     }
+
+    SDL_GestureProcessEvent(event);
+    
+
     return 1;
 }
 
--- a/src/events/SDL_events_c.h	Tue Jul 06 02:05:27 2010 -0700
+++ b/src/events/SDL_events_c.h	Wed Jul 07 04:13:08 2010 -0700
@@ -28,7 +28,7 @@
 #include "SDL_keyboard_c.h"
 #include "SDL_touch_c.h"
 #include "SDL_windowevents_c.h"
-
+#include "SDL_gesture_c.h"
 /* Start and stop the event processing loop */
 extern int SDL_StartEventLoop(Uint32 flags);
 extern void SDL_StopEventLoop(void);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/events/SDL_gesture.c	Wed Jul 07 04:13:08 2010 -0700
@@ -0,0 +1,189 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2010 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+/* General mouse handling code for SDL */
+
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+#include "SDL_gesture_c.h"
+
+//TODO: Replace with malloc
+#define MAXFINGERS 3
+#define MAXTOUCHES 2
+
+typedef struct {
+  float x,y;
+} Point;
+
+
+typedef struct {
+  Point p;
+  float pressure;
+  int id;
+} Finger;
+
+typedef struct {
+  Finger f;
+  Point cv;
+  float dtheta,dDist;
+} TouchPoint;
+
+
+typedef struct {
+  int id;
+  Point res;
+  Point centroid;
+  TouchPoint gestureLast[MAXFINGERS];
+  int numDownFingers;
+} GestureTouch;
+
+GestureTouch gestureTouch[MAXTOUCHES];
+int numGestureTouches = 0;
+int SDL_GestureAddTouch(SDL_Touch* touch) { 
+  if(numGestureTouches >= MAXTOUCHES) return -1;
+  
+  gestureTouch[numGestureTouches].res.x = touch->xres;
+  gestureTouch[numGestureTouches].res.y = touch->yres;
+  gestureTouch[numGestureTouches].numDownFingers = 0;
+
+  gestureTouch[numGestureTouches].res.x = touch->xres;
+  gestureTouch[numGestureTouches].id = touch->id;
+
+  numGestureTouches++;
+  return 0;
+}
+
+GestureTouch * SDL_GetGestureTouch(int id) {
+  int i;
+  for(i = 0;i < numGestureTouches; i++) {
+    //printf("%i ?= %i\n",gestureTouch[i].id,id);
+    if(gestureTouch[i].id == id) return &gestureTouch[i];
+  }
+  return NULL;
+}
+
+int SDL_SendGestureMulti(GestureTouch* touch,float dTheta,float dDist) {
+  SDL_Event event;
+  event.mgesture.type = SDL_MULTIGESTURE;
+  event.mgesture.touchId = touch->id;
+  event.mgesture.x = touch->centroid.x;
+  event.mgesture.y = touch->centroid.y;
+  event.mgesture.dTheta = dTheta;
+  event.mgesture.dDist = dDist;  
+  return SDL_PushEvent(&event) > 0;
+}
+
+void SDL_GestureProcessEvent(SDL_Event* event)
+{
+  if(event->type == SDL_FINGERMOTION || 
+     event->type == SDL_FINGERDOWN ||
+     event->type == SDL_FINGERUP) {
+    GestureTouch* inTouch = SDL_GetGestureTouch(event->tfinger.touchId);
+
+
+    //Shouldn't be possible
+    if(inTouch == NULL) return;
+    
+    
+    float x = ((float)event->tfinger.x)/inTouch->res.x;
+    float y = ((float)event->tfinger.y)/inTouch->res.y;
+    int j,empty = -1;
+    
+    for(j = 0;j<inTouch->numDownFingers;j++) {
+      if(inTouch->gestureLast[j].f.id != event->tfinger.fingerId) continue;
+
+      if(event->type == SDL_FINGERUP) {
+	inTouch->numDownFingers--;
+	inTouch->gestureLast[j] = inTouch->gestureLast[inTouch->numDownFingers];
+	break;
+      }
+      else {
+	float dx = x - inTouch->gestureLast[j].f.p.x;
+	float dy = y - inTouch->gestureLast[j].f.p.y;
+	inTouch->centroid.x += dx/inTouch->numDownFingers;
+	inTouch->centroid.y += dy/inTouch->numDownFingers;    
+	if(inTouch->numDownFingers > 1) {
+	  Point lv; //Vector from centroid to last x,y position
+	  Point v; //Vector from centroid to current x,y position
+	  lv = inTouch->gestureLast[j].cv;
+	  float lDist = sqrt(lv.x*lv.x + lv.y*lv.y);
+	  //printf("lDist = %f\n",lDist);
+	  v.x = x - inTouch->centroid.x;
+	  v.y = y - inTouch->centroid.y;
+	  inTouch->gestureLast[j].cv = v;
+	  float Dist = sqrt(v.x*v.x+v.y*v.y);
+	  // cos(dTheta) = (v . lv)/(|v| * |lv|)
+	  
+	  //Normalize Vectors to simplify angle calculation
+	  lv.x/=lDist;
+	  lv.y/=lDist;
+	  v.x/=Dist;
+	  v.y/=Dist;
+	  float dtheta = atan2(lv.x*v.y - lv.y*v.x,lv.x*v.x + lv.y*v.y);
+	  
+	  float dDist = (Dist - lDist);
+	  if(lDist == 0) {dDist = 0;dtheta = 0;} //To avoid impossible values
+	  inTouch->gestureLast[j].dDist = dDist;
+	  inTouch->gestureLast[j].dtheta = dtheta;
+	  
+	  //printf("dDist = %f, dTheta = %f\n",dDist,dtheta);
+	  //gdtheta = gdtheta*.9 + dtheta*.1;
+	  //gdDist  =  gdDist*.9 +  dDist*.1
+	  //knob.r += dDist/numDownFingers;
+	  //knob.ang += dtheta;
+	  //printf("thetaSum = %f, distSum = %f\n",gdtheta,gdDist);
+	  //printf("id: %i dTheta = %f, dDist = %f\n",j,dtheta,dDist);
+	  SDL_SendGestureMulti(inTouch,dtheta,dDist);
+	}
+	else {
+	  inTouch->gestureLast[j].dDist = 0;
+	  inTouch->gestureLast[j].dtheta = 0;
+	  inTouch->gestureLast[j].cv.x = 0;
+	  inTouch->gestureLast[j].cv.y = 0;
+	}
+	inTouch->gestureLast[j].f.p.x = x;
+	inTouch->gestureLast[j].f.p.y = y;
+	break;
+	//pressure?
+      }      
+    }
+    
+    if(j == inTouch->numDownFingers) {
+      //printf("Finger Down!!!\n");
+      inTouch->numDownFingers++;
+      inTouch->centroid.x = (inTouch->centroid.x*(inTouch->numDownFingers - 1)+ 
+			     x)/inTouch->numDownFingers;
+      inTouch->centroid.y = (inTouch->centroid.y*(inTouch->numDownFingers - 1)+
+			     y)/inTouch->numDownFingers;
+      
+      inTouch->gestureLast[j].f.id = event->tfinger.fingerId;
+      inTouch->gestureLast[j].f.p.x  = x;
+      inTouch->gestureLast[j].f.p.y  = y;	
+      inTouch->gestureLast[j].cv.x = 0;
+      inTouch->gestureLast[j].cv.y = 0;
+    }
+  }
+}  
+  
+  /* vi: set ts=4 sw=4 expandtab: */
+  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/events/SDL_gesture_c.h	Wed Jul 07 04:13:08 2010 -0700
@@ -0,0 +1,32 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2010 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_gesture_c_h
+#define _SDL_gesture_c_h
+
+extern void SDL_GestureProcessEvent(SDL_Event* event);
+
+
+#endif /* _SDL_gesture_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
--- a/src/events/SDL_touch.c	Tue Jul 06 02:05:27 2010 -0700
+++ b/src/events/SDL_touch.c	Wed Jul 07 04:13:08 2010 -0700
@@ -140,6 +140,9 @@
     SDL_touchPads[index]->relative_mode = SDL_FALSE;
     SDL_touchPads[index]->flush_motion = SDL_FALSE;
     
+    //Do I want this here? Probably
+    SDL_GestureAddTouch(SDL_touchPads[index]);
+
     return index;
 }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/touchTest/gestureSDLTest.c	Wed Jul 07 04:13:08 2010 -0700
@@ -0,0 +1,687 @@
+#include <stdio.h>
+#include <SDL.h>
+#include <math.h>
+#include <SDL_touch.h>
+
+#define PI 3.1415926535897
+#define PHI ((sqrt(5)-1)/2)
+#define WIDTH 640
+#define HEIGHT 480
+#define BPP 4
+#define DEPTH 32
+
+#define MAXFINGERS 3
+
+#define DOLLARNPOINTS 64
+#define DOLLARSIZE 256
+
+//MUST BE A POWER OF 2!
+#define EVENT_BUF_SIZE 256
+
+SDL_Event events[EVENT_BUF_SIZE];
+int eventWrite;
+
+int mousx,mousy;
+int keystat[512];
+int bstatus;
+
+int colors[7] = {0xFF,0xFF00,0xFF0000,0xFFFF00,0x00FFFF,0xFF00FF,0xFFFFFF};
+
+int index2fingerid[MAXFINGERS];
+int fingersDown;
+
+typedef struct {
+  float x,y;
+} Point;
+
+typedef struct {
+  Point p;
+  float pressure;
+  int id;
+} Finger;
+
+typedef struct {
+  Finger f;
+  Point cv;
+  float dtheta,dDist;
+} TouchPoint;
+
+ 
+typedef struct { //dt + s
+  Point d,s; //direction, start
+  int points;
+} Line;
+
+
+typedef struct {
+  float length;
+  
+  int numPoints;
+  Point p[EVENT_BUF_SIZE]; //To be safe
+} DollarPath;
+
+typedef struct {
+  float ang,r;
+  Point p;
+} Knob;
+
+Knob knob;
+
+Finger finger[MAXFINGERS];
+
+
+DollarPath dollarPath[MAXFINGERS];
+
+#define MAXTEMPLATES 4
+
+Point dollarTemplate[MAXTEMPLATES][DOLLARNPOINTS];
+int numDollarTemplates = 0;
+#ifdef DRAW_VECTOR_EST
+Line gestureLine[MAXFINGERS];
+#endif
+
+void handler (int sig)
+{
+  printf ("\exiting...(%d)\n", sig);
+  exit (0);
+}
+
+void perror_exit (char *error)
+{
+  perror (error);
+  handler (9);
+}
+
+
+void setpix(SDL_Surface *screen, int x, int y, unsigned int col)
+{
+  Uint32 *pixmem32;
+  Uint32 colour;
+  
+  if((unsigned)x > screen->w) return;
+  if((unsigned)y > screen->h) return;
+
+  pixmem32 = (Uint32*) screen->pixels  + y*screen->pitch/BPP + x;
+  
+  Uint8 r,g,b;
+  float a;
+  
+  memcpy(&colour,pixmem32,screen->format->BytesPerPixel);
+
+  SDL_GetRGB(colour,screen->format,&r,&g,&b); //Always returns 0xFFFFFF?
+  //r = 0;g = 0; b = 0;
+  a = (col>>24)&0xFF;
+  if(a == 0) a = 0xFF; //Hack, to make things easier.
+  a /= 0xFF;
+  r = r*(1-a) + ((col>>16)&0xFF)*(a);
+  g = g*(1-a) + ((col>> 8)&0xFF)*(a);
+  b = b*(1-a) + ((col>> 0)&0xFF)*(a);
+  colour = SDL_MapRGB( screen->format,r, g, b);
+  
+
+  *pixmem32 = colour;
+}
+
+void drawLine(SDL_Surface *screen,int x0,int y0,int x1,int y1,unsigned int col) {
+  float t;
+  for(t=0;t<1;t+=1.f/SDL_max(abs(x0-x1),abs(y0-y1)))
+    setpix(screen,x1+t*(x0-x1),y1+t*(y0-y1),col);
+}
+void drawCircle(SDL_Surface* screen,int x,int y,int r,unsigned int c)
+{
+
+  float a;
+  int tx;
+  
+  int ty;
+  float xr;
+  for(ty = -abs(r);ty <= abs(r);ty++) {
+    xr = sqrt(r*r - ty*ty);
+    if(r > 0) { //r > 0 ==> filled circle
+      for(tx=-xr+.5;tx<=xr-.5;tx++) {
+	setpix(screen,x+tx,y+ty,c);
+      }
+    }
+    else {
+      setpix(screen,x-xr+.5,y+ty,c);
+      setpix(screen,x+xr-.5,y+ty,c);
+    }
+  }
+}
+
+void drawKnob(SDL_Surface* screen,Knob k) {
+  //printf("Knob: x = %f, y = %f, r = %f, a = %f\n",k.p.x,k.p.y,k.r,k.ang);
+ 
+  drawCircle(screen,k.p.x*screen->w,k.p.y*screen->h,k.r*screen->w,0xFFFFFF);
+  
+  drawCircle(screen,(k.p.x+k.r/2*cos(k.ang))*screen->w,
+  	            (k.p.y+k.r/2*sin(k.ang))*screen->h,k.r/4*screen->w,0);
+  
+}
+
+void drawDollarPath(SDL_Surface* screen,Point* points,int numPoints,
+		    int rad,unsigned int col){
+  int i;
+  for(i=0;i<numPoints;i++) {
+    drawCircle(screen,points[i].x+screen->w/2,
+	       points[i].y+screen->h/2,
+	       rad,col);
+  }
+}
+
+float dollarDifference(Point* points,Point* templ,float ang) {
+  //  Point p[DOLLARNPOINTS];
+  float dist = 0;
+  Point p;
+  int i;
+  for(i = 0; i < DOLLARNPOINTS; i++) {
+    p.x = points[i].x * cos(ang) - points[i].y * sin(ang);
+    p.y = points[i].x * sin(ang) + points[i].y * cos(ang);
+    dist += sqrt((p.x-templ[i].x)*(p.x-templ[i].x)+
+		 (p.y-templ[i].y)*(p.y-templ[i].y));
+  }
+  return dist/DOLLARNPOINTS;
+  
+}
+
+float bestDollarDifference(Point* points,Point* templ) {
+  //------------BEGIN DOLLAR BLACKBOX----------------//
+  //-TRANSLATED DIRECTLY FROM PSUDEO-CODE AVAILABLE AT-//
+  //-"http://depts.washington.edu/aimgroup/proj/dollar/"-//
+  float ta = -PI/4;
+  float tb = PI/4;
+  float dt = PI/90;
+  float x1 = PHI*ta + (1-PHI)*tb;
+  float f1 = dollarDifference(points,templ,x1);
+  float x2 = (1-PHI)*ta + PHI*tb;
+  float f2 = dollarDifference(points,templ,x2);
+  while(abs(ta-tb) > dt) {
+    if(f1 < f2) {
+      tb = x2;
+      x2 = x1;
+      f2 = f1;
+      x1 = PHI*ta + (1-PHI)*tb;
+      f1 = dollarDifference(points,templ,x1);
+    }
+    else {
+      ta = x1;
+      x1 = x2;
+      f1 = f2;
+      x2 = (1-PHI)*ta + PHI*tb;
+      f2 = dollarDifference(points,templ,x2);
+    }
+  }
+  /*
+  if(f1 <= f2)
+    printf("Min angle (x1): %f\n",x1);
+  else if(f1 >  f2)
+    printf("Min angle (x2): %f\n",x2);
+  */
+  return SDL_min(f1,f2);  
+}
+
+float dollarRecognize(SDL_Surface* screen, DollarPath path,int *bestTempl) {
+
+  Point points[DOLLARNPOINTS];
+  int numPoints = dollarNormalize(path,points);
+  int i;
+  
+  int k;
+  /*
+  for(k = 0;k<DOLLARNPOINTS;k++) {
+    printf("(%f,%f)\n",points[k].x,
+	   points[k].y);
+  }
+  */
+  drawDollarPath(screen,points,numPoints,-15,0xFF6600);
+
+  int bestDiff = 10000;
+  *bestTempl = -1;
+  for(i = 0;i < numDollarTemplates;i++) {
+    int diff = bestDollarDifference(points,dollarTemplate[i]);
+    if(diff < bestDiff) {bestDiff = diff; *bestTempl = i;}
+  }
+  return bestDiff;
+}
+
+//DollarPath contains raw points, plus (possibly) the calculated length
+int dollarNormalize(DollarPath path,Point *points) {
+  int i;
+  //Calculate length if it hasn't already been done
+  if(path.length <= 0) {
+    for(i=1;i<path.numPoints;i++) {
+      float dx = path.p[i  ].x - 
+	         path.p[i-1].x;
+      float dy = path.p[i  ].y - 
+	         path.p[i-1].y;
+      path.length += sqrt(dx*dx+dy*dy);
+    }
+  }
+
+
+  //Resample
+  float interval = path.length/(DOLLARNPOINTS - 1);
+  float dist = 0;
+
+  int numPoints = 0;
+  Point centroid; centroid.x = 0;centroid.y = 0;
+  //printf("(%f,%f)\n",path.p[path.numPoints-1].x,path.p[path.numPoints-1].y);
+  for(i = 1;i < path.numPoints;i++) {
+    float d = sqrt((path.p[i-1].x-path.p[i].x)*(path.p[i-1].x-path.p[i].x)+
+		   (path.p[i-1].y-path.p[i].y)*(path.p[i-1].y-path.p[i].y));
+    //printf("d = %f dist = %f/%f\n",d,dist,interval);
+    while(dist + d > interval) {
+      points[numPoints].x = path.p[i-1].x + 
+	((interval-dist)/d)*(path.p[i].x-path.p[i-1].x);
+      points[numPoints].y = path.p[i-1].y + 
+	((interval-dist)/d)*(path.p[i].y-path.p[i-1].y);
+      centroid.x += points[numPoints].x;
+      centroid.y += points[numPoints].y;
+      numPoints++;
+
+      dist -= interval;
+    }
+    dist += d;
+  }
+  if(numPoints < 1) return 0;
+  centroid.x /= numPoints;
+  centroid.y /= numPoints;
+ 
+  //printf("Centroid (%f,%f)",centroid.x,centroid.y);
+  //Rotate Points so point 0 is left of centroid and solve for the bounding box
+  float xmin,xmax,ymin,ymax;
+  xmin = centroid.x;
+  xmax = centroid.x;
+  ymin = centroid.y;
+  ymax = centroid.y;
+  
+  float ang = atan2(centroid.y - points[0].y,
+		    centroid.x - points[0].x);
+
+  for(i = 0;i<numPoints;i++) {					       
+    float px = points[i].x;
+    float py = points[i].y;
+    points[i].x = (px - centroid.x)*cos(ang) - 
+                  (py - centroid.y)*sin(ang) + centroid.x;
+    points[i].y = (px - centroid.x)*sin(ang) + 
+                  (py - centroid.y)*cos(ang) + centroid.y;
+
+
+    if(points[i].x < xmin) xmin = points[i].x;
+    if(points[i].x > xmax) xmax = points[i].x; 
+    if(points[i].y < ymin) ymin = points[i].y;
+    if(points[i].y > ymax) ymax = points[i].y;
+  }
+
+  //Scale points to DOLLARSIZE, and translate to the origin
+  float w = xmax-xmin;
+  float h = ymax-ymin;
+
+  for(i=0;i<numPoints;i++) {
+    points[i].x = (points[i].x - centroid.x)*DOLLARSIZE/w;
+    points[i].y = (points[i].y - centroid.y)*DOLLARSIZE/h;
+  }  
+  return numPoints;
+}
+
+void DrawScreen(SDL_Surface* screen, int h)
+{
+  int x, y, xm,ym,c;
+  if(SDL_MUSTLOCK(screen))
+    {                                              
+      if(SDL_LockSurface(screen) < 0) return;
+    }
+  for(y = 0; y < screen->h; y++ )
+    {
+      for( x = 0; x < screen->w; x++ )
+        {
+	  //setpixel(screen, x, y, (x*x)/256+3*y+h, (y*y)/256+x+h, h);
+	  //xm = (x+h)%screen->w;
+	  //ym = (y+h)%screen->w;
+	  //c = sin(h/256*2*PI)*x*y/screen->w/screen->h;
+	  //setpix(screen,x,y,255*sin(xm/screen->w*2*PI),sin(h/255*2*PI)*255*y/screen->h,c);
+	  setpix(screen,x,y,((x%255)<<16) + ((y%255)<<8) + (x+y)%255);
+	  //setpix(screen,x,y,0); //Inefficient, but that's okay...
+        }
+    }
+  drawCircle(screen,mousx,mousy,-30,0xFFFFFF);
+  drawLine(screen,0,0,screen->w,screen->h,0xFFFFFF);
+
+  int i;
+//draw Touch History
+  TouchPoint gestureLast[MAXFINGERS];
+  //printf("------------------Start History------------------\n");
+  for(i = 0;i < MAXFINGERS;i++) {
+    gestureLast[i].f.id = -1;
+  }
+  int numDownFingers = 0;
+  Point centroid;
+  float gdtheta,gdDist;
+
+
+  for(i = SDL_max(0,eventWrite - EVENT_BUF_SIZE);i < eventWrite;i++) {
+    SDL_Event event = events[i&(EVENT_BUF_SIZE-1)];
+    int age = eventWrite - i - 1;
+    if(event.type == SDL_FINGERMOTION || 
+       event.type == SDL_FINGERDOWN ||
+       event.type == SDL_FINGERUP) {
+      SDL_Touch* inTouch = SDL_GetTouch(event.tfinger.touchId);
+      //SDL_Finger* inFinger = SDL_GetFinger(inTouch,event.tfinger.fingerId);
+	    
+      float x = ((float)event.tfinger.x)/inTouch->xres;
+      float y = ((float)event.tfinger.y)/inTouch->yres;
+      int j,empty = -1;
+      
+      for(j = 0;j<MAXFINGERS;j++) {
+	if(gestureLast[j].f.id == event.tfinger.fingerId) {
+	  if(event.type == SDL_FINGERUP) {
+	    numDownFingers--;
+	    if(numDownFingers <= 1) {
+	      gdtheta = 0;
+	      gdDist = 0;
+	    }
+	    if(!keystat[32]){ //spacebar
+	      int bestTempl;
+	      float error = dollarRecognize(screen,dollarPath[j],&bestTempl);
+	      if(bestTempl >= 0){
+		drawDollarPath(screen,dollarTemplate[bestTempl]
+			       ,DOLLARNPOINTS,-15,0x0066FF);		
+		printf("Dollar error: %f\n",error);
+	      }
+	      
+	    }
+	    else if(numDollarTemplates < MAXTEMPLATES) {
+	      
+	      dollarNormalize(dollarPath[j],
+			      dollarTemplate[numDollarTemplates]);
+	      /*
+	      int k;	      
+	      for(k = 0;k<DOLLARNPOINTS;k++) {
+		printf("(%f,%f)\n",dollarTemplate[numDollarTemplates][i].x,
+		       dollarTemplate[numDollarTemplates][i].y);
+		       }*/
+	      numDollarTemplates++;	      
+	    }
+
+	    gestureLast[j].f.id = -1;
+	    break;
+	  }
+	  else {
+	    dollarPath[j].p[dollarPath[j].numPoints].x = x;
+	    dollarPath[j].p[dollarPath[j].numPoints].y = y;
+	    float dx = (dollarPath[j].p[dollarPath[j].numPoints  ].x-
+			dollarPath[j].p[dollarPath[j].numPoints-1].x);
+	    float dy = (dollarPath[j].p[dollarPath[j].numPoints  ].y-
+			dollarPath[j].p[dollarPath[j].numPoints-1].y);
+	    dollarPath[j].length += sqrt(dx*dx + dy*dy);
+
+	    dollarPath[j].numPoints++;
+
+	    centroid.x = centroid.x + dx/numDownFingers;
+	    centroid.y = centroid.y + dy/numDownFingers;    
+	    if(numDownFingers > 1) {
+	      Point lv; //Vector from centroid to last x,y position
+	      Point v; //Vector from centroid to current x,y position
+	      lv.x = gestureLast[j].cv.x;
+	      lv.y = gestureLast[j].cv.y;
+	      float lDist = sqrt(lv.x*lv.x + lv.y*lv.y);
+	      
+	      v.x = x - centroid.x;
+	      v.y = y - centroid.y;
+	      gestureLast[j].cv = v;
+	      float Dist = sqrt(v.x*v.x+v.y*v.y);
+	      // cos(dTheta) = (v . lv)/(|v| * |lv|)
+	      
+	      lv.x/=lDist;
+	      lv.y/=lDist;
+	      v.x/=Dist;
+	      v.y/=Dist;
+	      float dtheta = atan2(lv.x*v.y - lv.y*v.x,lv.x*v.x + lv.y*v.y);
+	      
+	      float dDist = (lDist - Dist);	      
+	      
+	      gestureLast[j].dDist = dDist;
+	      gestureLast[j].dtheta = dtheta;
+
+	      //gdtheta = gdtheta*.9 + dtheta*.1;
+	      //gdDist  =  gdDist*.9 +  dDist*.1
+	      gdtheta += dtheta;
+	      gdDist += dDist;
+
+	      //printf("thetaSum = %f, distSum = %f\n",gdtheta,gdDist);
+	      //printf("id: %i dTheta = %f, dDist = %f\n",j,dtheta,dDist);
+	    }
+	    else {
+	      gestureLast[j].dDist = 0;
+	      gestureLast[j].dtheta = 0;
+	      gestureLast[j].cv.x = 0;
+	      gestureLast[j].cv.y = 0;
+	    }
+	    gestureLast[j].f.p.x = x;
+	    gestureLast[j].f.p.y = y;
+	    break;
+	    //pressure?
+	  }	  
+	}
+	else if(gestureLast[j].f.id == -1 && empty == -1) {
+	  empty = j;
+	}
+      }
+      
+      if(j >= MAXFINGERS && empty >= 0) {
+	//	printf("Finger Down!!!\n");
+	numDownFingers++;
+	centroid.x = (centroid.x*(numDownFingers - 1) + x)/numDownFingers;
+	centroid.y = (centroid.y*(numDownFingers - 1) + y)/numDownFingers;
+	
+	j = empty;
+	gestureLast[j].f.id = event.tfinger.fingerId;
+	gestureLast[j].f.p.x  = x;
+	gestureLast[j].f.p.y  = y;
+	
+	
+	dollarPath[j].length = 0;
+	dollarPath[j].p[0].x = x;
+	dollarPath[j].p[0].y = y;
+	dollarPath[j].numPoints = 1;
+      }
+      
+      //draw the touch:
+      
+      if(gestureLast[j].f.id < 0) continue; //Finger up. Or some error...
+      
+      unsigned int c = colors[gestureLast[j].f.id%7]; 
+      unsigned int col = 
+	((unsigned int)(c*(.1+.85))) |
+	((unsigned int)((0xFF*(1-((float)age)/EVENT_BUF_SIZE))) & 0xFF)<<24;
+      x = gestureLast[j].f.p.x;
+      y = gestureLast[j].f.p.y;
+      if(event.type == SDL_FINGERMOTION)
+	drawCircle(screen,x*screen->w,y*screen->h,5,col);
+      else if(event.type == SDL_FINGERDOWN)
+	drawCircle(screen,x*screen->w,y*screen->h,-10,col);     
+      
+      //if there is a centroid, draw it
+      if(numDownFingers > 1) {
+	unsigned int col = 
+	  ((unsigned int)(0xFFFFFF)) |
+	  ((unsigned int)((0xFF*(1-((float)age)/EVENT_BUF_SIZE))) & 0xFF)<<24;
+	drawCircle(screen,centroid.x*screen->w,centroid.y*screen->h,5,col);
+      }
+    }
+  }
+  
+
+  for(i=0;i<MAXFINGERS;i++)
+    if(finger[i].p.x >= 0 && finger[i].p.y >= 0)
+      if(finger[i].pressure > 0)
+	drawCircle(screen,finger[i].p.x*screen->w,finger[i].p.y*screen->h
+		   ,20,0xFF*finger[i].pressure);
+      else
+	drawCircle(screen,finger[i].p.x*screen->w,finger[i].p.y*screen->h
+		   ,20,0xFF);
+
+
+  
+  keystat[32] = 0;
+  
+  if(knob.p.x > 0)
+    drawKnob(screen,knob);
+  
+  if(SDL_MUSTLOCK(screen)) SDL_UnlockSurface(screen);
+  
+  SDL_Flip(screen);
+}
+
+SDL_Surface* initScreen(int width,int height)
+{
+  return SDL_SetVideoMode(width, height, DEPTH,
+			  SDL_HWSURFACE | SDL_RESIZABLE);
+}
+
+int main(int argc, char* argv[])
+{  
+  SDL_Surface *screen;
+  SDL_Event event;
+  
+  int keypress = 0;
+  int h=0,s=1,i,j;
+
+  //gesture variables
+  int numDownFingers = 0;
+  float gdtheta = 0,gdDist = 0;
+  Point centroid;
+  knob.r = .1;
+  knob.ang = 0;
+  TouchPoint gestureLast[MAXFINGERS];
+  
+
+
+  memset(keystat,0,512*sizeof(keystat[0]));
+  if (SDL_Init(SDL_INIT_VIDEO) < 0 ) return 1;
+  
+  if (!(screen = initScreen(WIDTH,HEIGHT)))
+    {
+      SDL_Quit();
+      return 1;
+    }
+
+  while(!keystat[27]) {
+    //Poll SDL
+    while(SDL_PollEvent(&event)) 
+      {
+	//Record _all_ events
+	events[eventWrite & (EVENT_BUF_SIZE-1)] = event;
+	eventWrite++;
+	
+	switch (event.type) 
+	  {
+	  case SDL_QUIT:
+	    keystat[27] = 1;
+	    break;
+	  case SDL_KEYDOWN:
+	    //printf("%i\n",event.key.keysym.sym);
+	    keystat[event.key.keysym.sym] = 1;
+	    //keypress = 1;
+	    break;
+	  case SDL_KEYUP:
+	      //printf("%i\n",event.key.keysym.sym);
+	    keystat[event.key.keysym.sym] = 0;
+	    //keypress = 1;
+	    break;
+	  case SDL_VIDEORESIZE:
+	    if (!(screen = initScreen(event.resize.w,
+				      event.resize.h)))
+	      {
+		SDL_Quit();
+		return 1;
+	      }
+	    break;
+	  case SDL_MOUSEMOTION:
+	    mousx = event.motion.x;
+	    mousy = event.motion.y; 
+	    break;
+	  case SDL_MOUSEBUTTONDOWN:
+	    bstatus |=  (1<<(event.button.button-1));
+	    break;
+	  case SDL_MOUSEBUTTONUP:
+	    bstatus &= ~(1<<(event.button.button-1));
+	    break;
+	  case SDL_FINGERMOTION:    
+	    ;
+	    //printf("Finger: %i,x: %i, y: %i\n",event.tfinger.fingerId,
+	    //	   event.tfinger.x,event.tfinger.y);
+	    SDL_Touch* inTouch = SDL_GetTouch(event.tfinger.touchId);
+	    SDL_Finger* inFinger = SDL_GetFinger(inTouch,event.tfinger.fingerId);
+
+	    for(i = 0;i<MAXFINGERS;i++) 
+	      if(index2fingerid[i] == event.tfinger.fingerId) 	      
+		break;
+	    if(i == MAXFINGERS) break;  
+	    if(inTouch > 0) {
+	      finger[i].p.x = ((float)event.tfinger.x)/
+		inTouch->xres;
+	      finger[i].p.y = ((float)event.tfinger.y)/
+		inTouch->yres;
+	      
+	      finger[i].pressure = 
+		((float)event.tfinger.pressure)/inTouch->pressureres;
+	      /*
+	      printf("Finger: %i, Pressure: %f Pressureres: %i\n",
+		     event.tfinger.fingerId,
+		     finger[i].pressure,
+		     inTouch->pressureres);
+	      */
+	      //printf("Finger: %i, pressure: %f\n",event.tfinger.fingerId,
+	      //   finger[event.tfinger.fingerId].pressure);
+	    }
+	    
+	    break;	    
+	  case SDL_FINGERDOWN:
+	    printf("Finger: %i down - x: %i, y: %i\n",event.tfinger.fingerId,
+		   event.tfinger.x,event.tfinger.y);
+
+	    for(i = 0;i<MAXFINGERS;i++) 
+	      if(index2fingerid[i] == -1) {
+		index2fingerid[i] = event.tfinger.fingerId;
+		break;
+	      }
+	    finger[i].p.x = event.tfinger.x;
+	    finger[i].p.y = event.tfinger.y;
+	    break;
+	  case SDL_FINGERUP:
+	    printf("Figner: %i up - x: %i, y: %i\n",event.tfinger.fingerId,
+	           event.tfinger.x,event.tfinger.y);
+	    for(i = 0;i<MAXFINGERS;i++) 
+	      if(index2fingerid[i] == event.tfinger.fingerId) {
+		index2fingerid[i] = -1;
+		break;
+	      }
+	    finger[i].p.x = -1;
+	    finger[i].p.y = -1;
+	    break;
+	  case SDL_MULTIGESTURE:
+	    knob.p.x = event.mgesture.x;
+	    knob.p.y = event.mgesture.y;
+	    knob.ang += event.mgesture.dTheta;
+	    knob.r += event.mgesture.dDist;
+	  }
+      
+    
+	
+	//And draw
+	
+      }
+    DrawScreen(screen,h);
+    //printf("c: (%f,%f)\n",centroid.x,centroid.y);
+    //printf("numDownFingers: %i\n",numDownFingers);
+    //for(i=0;i<512;i++) 
+    // if(keystat[i]) printf("%i\n",i);
+      
+    
+  }  
+  SDL_Quit();
+  
+  return 0;
+}
+
--- a/touchTest/makefile	Tue Jul 06 02:05:27 2010 -0700
+++ b/touchTest/makefile	Wed Jul 07 04:13:08 2010 -0700
@@ -1,4 +1,5 @@
 SDLTest : touchSimp.c touchPong.c
+	gcc gestureSDLTest.c -o gestureSDLTest `sdl-config --cflags --libs` -g
 	gcc gestureTest.c -o gestureTest `sdl-config --cflags --libs` -g
 	gcc touchTest.c -o touchTest `sdl-config --cflags --libs` -g		
 	gcc touchSimp.c -o touchSimp `sdl-config --cflags --libs` -g
Binary file touchTest/touchPong has changed
Binary file touchTest/touchSimp has changed