sdl-ios-xcode: src/events/SDL

annotate src/events/SDL_gesture.c @ 4684:f47c2640c667

Re-enabled dollar gesture

author	Jim Grandpre <jim.tla@gmail.com>
date	Fri, 06 Aug 2010 01:55:38 -0400
parents	15dfe42edbfd
children	e0c3b09368a6

rev	line source
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	1 /*
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	4
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	9
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	13 Lesser General Public License for more details.
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	14
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	16 License along with this library; if not, write to the Free Software Founation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	17
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	18 Sam Lantinga
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	19 slouken@libsdl.org
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	20 */
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	21 #include "SDL_config.h"
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	22
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	23 /* General mouse handling code for SDL */
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	24
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	25 #include "SDL_events.h"
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	26 #include "SDL_events_c.h"
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	27 #include "SDL_gesture_c.h"
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	28
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	29 //TODO: Replace with malloc
4681 5378f2d0754f Fixed some Gesture bugs Jim Grandpre <jim.tla@gmail.com> parents: 4678 diff changeset	30 #define MAXFINGERS 5
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	31 #define MAXTOUCHES 2
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	32 #define MAXTEMPLATES 4
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	33 #define MAXPATHSIZE 1024
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	34
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	35 #define DOLLARNPOINTS 64
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	36 #define DOLLARSIZE 256
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	37
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	38 #define ENABLE_DOLLAR
f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	39
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	40 //PHI = ((sqrt(5)-1)/2)
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	41 #define PHI 0.618033989
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	42
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	43 typedef struct {
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	44 float x,y;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	45 } Point;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	46
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	47
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	48 typedef struct {
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	49 Point p;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	50 float pressure;
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	51 SDL_FingerID id;
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	52 } Finger;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	53
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	54
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	55 typedef struct {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	56 float length;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	57
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	58 int numPoints;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	59 Point p[MAXPATHSIZE];
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	60 } DollarPath;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	61
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	62 /*
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	63 typedef struct {
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	64 Finger f;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	65 Point cv;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	66 float dtheta,dDist;
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	67 DollarPath dollarPath;
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	68 } TouchPoint;
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	69 */
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	70 typedef struct {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	71 Point path[DOLLARNPOINTS];
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	72 unsigned long hash;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	73 } DollarTemplate;
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	74
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	75 typedef struct {
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	76 SDL_GestureID id;
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	77 Point res;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	78 Point centroid;
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	79 //TouchPoint gestureLast[MAXFINGERS];
f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	80 DollarPath dollarPath;
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	81 Uint16 numDownFingers;
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	82
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	83 int numDollarTemplates;
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	84 DollarTemplate dollarTemplate[MAXTEMPLATES];
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	85
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	86 SDL_bool recording;
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	87 } GestureTouch;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	88
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	89 GestureTouch gestureTouch[MAXTOUCHES];
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	90 int numGestureTouches = 0;
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	91 SDL_bool recordAll;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	92
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	93 int SDL_RecordGesture(SDL_TouchID touchId) {
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	94 int i;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	95 if(touchId < 0) recordAll = SDL_TRUE;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	96 for(i = 0;i < numGestureTouches; i++) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	97 if((touchId < 0) \|\| (gestureTouch[i].id == touchId)) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	98 gestureTouch[i].recording = SDL_TRUE;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	99 if(touchId >= 0)
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	100 return 1;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	101 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	102 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	103 return (touchId < 0);
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	104 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	105
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	106 unsigned long SDL_HashDollar(Point* points) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	107 unsigned long hash = 5381;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	108 int i;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	109 for(i = 0;i < DOLLARNPOINTS; i++) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	110 hash = ((hash<<5) + hash) + points[i].x;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	111 hash = ((hash<<5) + hash) + points[i].y;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	112 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	113 return hash;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	114 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	115
4665 c2493813a2f4 Merged changes Jim Grandpre <jim.tla@gmail.com> parents: 4664 4663 diff changeset	116
c2493813a2f4 Merged changes Jim Grandpre <jim.tla@gmail.com> parents: 4664 4663 diff changeset	117 static int SaveTemplate(DollarTemplate templ, SDL_RWops src) {
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	118 if(src == NULL) return 0;
4665 c2493813a2f4 Merged changes Jim Grandpre <jim.tla@gmail.com> parents: 4664 4663 diff changeset	119
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	120 int i;
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	121
317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	122 //No Longer storing the Hash, rehash on load
317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	123 //if(SDL_RWops.write(src,&(templ->hash),sizeof(templ->hash),1) != 1) return 0;
4665 c2493813a2f4 Merged changes Jim Grandpre <jim.tla@gmail.com> parents: 4664 4663 diff changeset	124
4682 4ba1048a324c Minimized functionality of gestureSDLTest. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	125 if(SDL_RWwrite(src,templ->path,
4ba1048a324c Minimized functionality of gestureSDLTest. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	126 sizeof(templ->path[0]),DOLLARNPOINTS) != DOLLARNPOINTS)
4ba1048a324c Minimized functionality of gestureSDLTest. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	127 return 0;
4ba1048a324c Minimized functionality of gestureSDLTest. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	128
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	129 return 1;
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	130 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	131
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	132
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	133 int SDL_SaveAllDollarTemplates(SDL_RWops *src) {
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	134 int i,j,rtrn = 0;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	135 for(i = 0; i < numGestureTouches; i++) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	136 GestureTouch* touch = &gestureTouch[i];
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	137 for(j = 0;j < touch->numDollarTemplates; j++) {
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	138 rtrn += SaveTemplate(&touch->dollarTemplate[i],src);
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	139 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	140 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	141 return rtrn;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	142 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	143
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	144 int SDL_SaveDollarTemplate(SDL_GestureID gestureId, SDL_RWops *src) {
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	145 int i,j;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	146 for(i = 0; i < numGestureTouches; i++) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	147 GestureTouch* touch = &gestureTouch[i];
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	148 for(j = 0;j < touch->numDollarTemplates; j++) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	149 if(touch->dollarTemplate[i].hash == gestureId) {
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	150 return SaveTemplate(&touch->dollarTemplate[i],src);
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	151 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	152 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	153 }
4663 56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	154 SDL_SetError("Unknown gestureId");
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	155 return -1;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	156 }
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	157
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	158 //path is an already sampled set of points
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	159 //Returns the index of the gesture on success, or -1
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	160 static int SDL_AddDollarGesture(GestureTouch* inTouch,Point* path) {
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	161 if(inTouch == NULL) {
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	162 if(numGestureTouches == 0) return -1;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	163 int i = 0;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	164 for(i = 0;i < numGestureTouches; i++) {
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	165 inTouch = &gestureTouch[i];
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	166 if(inTouch->numDollarTemplates < MAXTEMPLATES) {
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	167 DollarTemplate *templ =
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	168 &inTouch->dollarTemplate[inTouch->numDollarTemplates];
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	169 memcpy(templ->path,path,DOLLARNPOINTS*sizeof(Point));
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	170 templ->hash = SDL_HashDollar(templ->path);
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	171 inTouch->numDollarTemplates++;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	172 }
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	173 }
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	174 return inTouch->numDollarTemplates - 1;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	175 }else if(inTouch->numDollarTemplates < MAXTEMPLATES) {
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	176 DollarTemplate *templ =
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	177 &inTouch->dollarTemplate[inTouch->numDollarTemplates];
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	178 memcpy(templ->path,path,DOLLARNPOINTS*sizeof(Point));
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	179 templ->hash = SDL_HashDollar(templ->path);
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	180 inTouch->numDollarTemplates++;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	181 return inTouch->numDollarTemplates - 1;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	182 }
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	183 return -1;
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	184 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	185
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	186 int SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src) {
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	187 if(src == NULL) return 0;
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	188 int i,loaded = 0;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	189 GestureTouch *touch = NULL;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	190 if(touchId >= 0) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	191 for(i = 0;i < numGestureTouches; i++)
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	192 if(gestureTouch[i].id == touchId)
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	193 touch = &gestureTouch[i];
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	194 if(touch == NULL) return -1;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	195 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	196
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	197 while(1) {
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	198 DollarTemplate templ;
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	199 //fscanf(fp,"%lu ",&templ.hash);
317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	200 /*
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	201 for(i = 0;i < DOLLARNPOINTS; i++) {
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	202 int x,y;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	203 if(fscanf(fp,"%i %i ",&x,&y) != 2) break;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	204 templ.path[i].x = x;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	205 templ.path[i].y = y;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	206 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	207 fscanf(fp,"\n");
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	208 */
317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	209 if(SDL_RWread(src,templ.path,sizeof(templ.path[0]),DOLLARNPOINTS) < DOLLARNPOINTS) break;
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	210
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	211 if(touchId >= 0) {
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	212 printf("Adding loaded gesture to 1 touch\n");
317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	213 if(SDL_AddDollarGesture(touch,templ.path)) loaded++;
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	214 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	215 else {
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	216 printf("Adding to: %i touches\n",numGestureTouches);
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	217 for(i = 0;i < numGestureTouches; i++) {
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	218 touch = &gestureTouch[i];
317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	219 printf("Adding loaded gesture to + touches\n");
317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	220 //TODO: What if this fails?
317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	221 SDL_AddDollarGesture(touch,templ.path);
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	222 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	223 loaded++;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	224 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	225 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	226
4664 317a151b79ad Bug fixes, now using RWops instead of File pointers. Jim Grandpre <jim.tla@gmail.com> parents: 4659 diff changeset	227 return loaded;
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	228 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	229
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	230
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	231 float dollarDifference(Point* points,Point* templ,float ang) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	232 // Point p[DOLLARNPOINTS];
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	233 float dist = 0;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	234 Point p;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	235 int i;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	236 for(i = 0; i < DOLLARNPOINTS; i++) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	237 p.x = points[i].x * cos(ang) - points[i].y * sin(ang);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	238 p.y = points[i].x * sin(ang) + points[i].y * cos(ang);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	239 dist += sqrt((p.x-templ[i].x)*(p.x-templ[i].x)+
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	240 (p.y-templ[i].y)*(p.y-templ[i].y));
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	241 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	242 return dist/DOLLARNPOINTS;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	243
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	244 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	245
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	246 float bestDollarDifference(Point* points,Point* templ) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	247 //------------BEGIN DOLLAR BLACKBOX----------------//
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	248 //-TRANSLATED DIRECTLY FROM PSUDEO-CODE AVAILABLE AT-//
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	249 //-"http://depts.washington.edu/aimgroup/proj/dollar/"-//
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	250 float ta = -M_PI/4;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	251 float tb = M_PI/4;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	252 float dt = M_PI/90;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	253 float x1 = PHIta + (1-PHI)tb;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	254 float f1 = dollarDifference(points,templ,x1);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	255 float x2 = (1-PHI)ta + PHItb;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	256 float f2 = dollarDifference(points,templ,x2);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	257 while(abs(ta-tb) > dt) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	258 if(f1 < f2) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	259 tb = x2;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	260 x2 = x1;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	261 f2 = f1;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	262 x1 = PHIta + (1-PHI)tb;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	263 f1 = dollarDifference(points,templ,x1);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	264 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	265 else {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	266 ta = x1;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	267 x1 = x2;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	268 f1 = f2;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	269 x2 = (1-PHI)ta + PHItb;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	270 f2 = dollarDifference(points,templ,x2);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	271 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	272 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	273 /*
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	274 if(f1 <= f2)
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	275 printf("Min angle (x1): %f\n",x1);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	276 else if(f1 > f2)
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	277 printf("Min angle (x2): %f\n",x2);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	278 */
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	279 return SDL_min(f1,f2);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	280 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	281
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	282 //DollarPath contains raw points, plus (possibly) the calculated length
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	283 int dollarNormalize(DollarPath path,Point *points) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	284 int i;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	285 //Calculate length if it hasn't already been done
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	286 if(path.length <= 0) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	287 for(i=1;i<path.numPoints;i++) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	288 float dx = path.p[i ].x -
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	289 path.p[i-1].x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	290 float dy = path.p[i ].y -
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	291 path.p[i-1].y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	292 path.length += sqrt(dxdx+dydy);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	293 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	294 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	295
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	296
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	297 //Resample
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	298 float interval = path.length/(DOLLARNPOINTS - 1);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	299 float dist = 0;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	300
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	301 int numPoints = 0;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	302 Point centroid; centroid.x = 0;centroid.y = 0;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	303 //printf("(%f,%f)\n",path.p[path.numPoints-1].x,path.p[path.numPoints-1].y);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	304 for(i = 1;i < path.numPoints;i++) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	305 float d = sqrt((path.p[i-1].x-path.p[i].x)*(path.p[i-1].x-path.p[i].x)+
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	306 (path.p[i-1].y-path.p[i].y)*(path.p[i-1].y-path.p[i].y));
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	307 //printf("d = %f dist = %f/%f\n",d,dist,interval);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	308 while(dist + d > interval) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	309 points[numPoints].x = path.p[i-1].x +
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	310 ((interval-dist)/d)*(path.p[i].x-path.p[i-1].x);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	311 points[numPoints].y = path.p[i-1].y +
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	312 ((interval-dist)/d)*(path.p[i].y-path.p[i-1].y);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	313 centroid.x += points[numPoints].x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	314 centroid.y += points[numPoints].y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	315 numPoints++;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	316
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	317 dist -= interval;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	318 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	319 dist += d;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	320 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	321 if(numPoints < 1) return 0;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	322 centroid.x /= numPoints;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	323 centroid.y /= numPoints;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	324
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	325 //printf("Centroid (%f,%f)",centroid.x,centroid.y);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	326 //Rotate Points so point 0 is left of centroid and solve for the bounding box
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	327 float xmin,xmax,ymin,ymax;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	328 xmin = centroid.x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	329 xmax = centroid.x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	330 ymin = centroid.y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	331 ymax = centroid.y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	332
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	333 float ang = atan2(centroid.y - points[0].y,
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	334 centroid.x - points[0].x);
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	335
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	336 for(i = 0;i<numPoints;i++) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	337 float px = points[i].x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	338 float py = points[i].y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	339 points[i].x = (px - centroid.x)*cos(ang) -
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	340 (py - centroid.y)*sin(ang) + centroid.x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	341 points[i].y = (px - centroid.x)*sin(ang) +
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	342 (py - centroid.y)*cos(ang) + centroid.y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	343
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	344
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	345 if(points[i].x < xmin) xmin = points[i].x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	346 if(points[i].x > xmax) xmax = points[i].x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	347 if(points[i].y < ymin) ymin = points[i].y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	348 if(points[i].y > ymax) ymax = points[i].y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	349 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	350
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	351 //Scale points to DOLLARSIZE, and translate to the origin
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	352 float w = xmax-xmin;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	353 float h = ymax-ymin;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	354
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	355 for(i=0;i<numPoints;i++) {
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	356 points[i].x = (points[i].x - centroid.x)*DOLLARSIZE/w;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	357 points[i].y = (points[i].y - centroid.y)*DOLLARSIZE/h;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	358 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	359 return numPoints;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	360 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	361
4663 56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	362 float dollarRecognize(DollarPath path,int bestTempl,GestureTouch touch) {
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	363
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	364 Point points[DOLLARNPOINTS];
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	365 int numPoints = dollarNormalize(path,points);
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	366 int i;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	367
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	368 int bestDiff = 10000;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	369 *bestTempl = -1;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	370 for(i = 0;i < touch->numDollarTemplates;i++) {
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	371 int diff = bestDollarDifference(points,touch->dollarTemplate[i].path);
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	372 if(diff < bestDiff) {bestDiff = diff; *bestTempl = i;}
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	373 }
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	374 return bestDiff;
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	375 }
56a2d70de945 Started trying to build gesture code for iPhone Sam Lantinga <slouken@libsdl.org> parents: 4659 diff changeset	376
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	377 int SDL_GestureAddTouch(SDL_Touch* touch) {
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	378 if(numGestureTouches >= MAXTOUCHES) return -1;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	379
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	380 gestureTouch[numGestureTouches].res.x = touch->xres;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	381 gestureTouch[numGestureTouches].res.y = touch->yres;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	382 gestureTouch[numGestureTouches].numDownFingers = 0;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	383
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	384 gestureTouch[numGestureTouches].res.x = touch->xres;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	385 gestureTouch[numGestureTouches].id = touch->id;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	386
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	387 gestureTouch[numGestureTouches].numDollarTemplates = 0;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	388
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	389 gestureTouch[numGestureTouches].recording = SDL_FALSE;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	390
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	391 numGestureTouches++;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	392 return 0;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	393 }
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	394
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	395 GestureTouch * SDL_GetGestureTouch(SDL_TouchID id) {
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	396 int i;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	397 for(i = 0;i < numGestureTouches; i++) {
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	398 //printf("%i ?= %i\n",gestureTouch[i].id,id);
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	399 if(gestureTouch[i].id == id) return &gestureTouch[i];
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	400 }
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	401 return NULL;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	402 }
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	403
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	404 int SDL_SendGestureMulti(GestureTouch* touch,float dTheta,float dDist) {
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	405 SDL_Event event;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	406 event.mgesture.type = SDL_MULTIGESTURE;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	407 event.mgesture.touchId = touch->id;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	408 event.mgesture.x = touch->centroid.x;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	409 event.mgesture.y = touch->centroid.y;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	410 event.mgesture.dTheta = dTheta;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	411 event.mgesture.dDist = dDist;
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	412 event.mgesture.numFingers = touch->numDownFingers;
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	413 return SDL_PushEvent(&event) > 0;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	414 }
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	415
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	416 int SDL_SendGestureDollar(GestureTouch* touch,
f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	417 SDL_GestureID gestureId,float error) {
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	418 SDL_Event event;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	419 event.dgesture.type = SDL_DOLLARGESTURE;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	420 event.dgesture.touchId = touch->id;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	421 /*
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	422 //TODO: Add this to give location of gesture?
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	423 event.mgesture.x = touch->centroid.x;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	424 event.mgesture.y = touch->centroid.y;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	425 */
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	426 event.dgesture.gestureId = gestureId;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	427 event.dgesture.error = error;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	428 return SDL_PushEvent(&event) > 0;
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	429 }
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	430
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	431
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4665 diff changeset	432 int SDL_SendDollarRecord(GestureTouch* touch,SDL_GestureID gestureId) {
4659 063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	433 SDL_Event event;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	434 event.dgesture.type = SDL_DOLLARRECORD;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	435 event.dgesture.touchId = touch->id;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	436 event.dgesture.gestureId = gestureId;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	437
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	438 return SDL_PushEvent(&event) > 0;
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	439 }
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	440
063b9455bd1a Added some files I had previosuly missed Jim Grandpre <jim.tla@gmail.com> parents: 4658 diff changeset	441
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	442 void SDL_GestureProcessEvent(SDL_Event* event)
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	443 {
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	444 if(event->type == SDL_FINGERMOTION \|\|
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	445 event->type == SDL_FINGERDOWN \|\|
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	446 event->type == SDL_FINGERUP) {
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	447 GestureTouch* inTouch = SDL_GetGestureTouch(event->tfinger.touchId);
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	448
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	449 //Shouldn't be possible
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	450 if(inTouch == NULL) return;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	451
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	452 //printf("@ (%i,%i) with res: (%i,%i)\n",(int)event->tfinger.x,
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	453 // (int)event->tfinger.y,
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	454 // (int)inTouch->res.x,(int)inTouch->res.y);
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	455
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	456
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	457 float x = ((float)event->tfinger.x)/(float)inTouch->res.x;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	458 float y = ((float)event->tfinger.y)/(float)inTouch->res.y;
4658 454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	459
454385d76845 Moved $1 Gestures into the SDL Library Jim Grandpre <jim.tla@gmail.com> parents: 4657 diff changeset	460
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	461 //Finger Up
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	462 if(event->type == SDL_FINGERUP) {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	463 inTouch->numDownFingers--;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	464
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	465 #ifdef ENABLE_DOLLAR
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	466 if(inTouch->recording) {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	467 inTouch->recording = SDL_FALSE;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	468 Point path[DOLLARNPOINTS];
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	469 dollarNormalize(inTouch->dollarPath,path);
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	470 int index;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	471 if(recordAll) {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	472 index = SDL_AddDollarGesture(NULL,path);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	473 int i;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	474 for(i = 0;i < numGestureTouches; i++)
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	475 gestureTouch[i].recording = SDL_FALSE;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	476 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	477 else {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	478 index = SDL_AddDollarGesture(inTouch,path);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	479 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	480
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	481 if(index >= 0) {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	482 SDL_SendDollarRecord(inTouch,inTouch->dollarTemplate[index].hash);
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	483 }
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	484 else {
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	485 SDL_SendDollarRecord(inTouch,-1);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	486 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	487 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	488 else {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	489 int bestTempl;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	490 float error;
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	491 error = dollarRecognize(inTouch->dollarPath,
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	492 &bestTempl,inTouch);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	493 if(bestTempl >= 0){
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	494 //Send Event
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	495 unsigned long gestureId = inTouch->dollarTemplate[bestTempl].hash;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	496 SDL_SendGestureDollar(inTouch,gestureId,error);
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	497 //printf ("%s\n",);("Dollar error: %f\n",error);
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	498 }
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	499 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	500 #endif
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	501 //inTouch->gestureLast[j] = inTouch->gestureLast[inTouch->numDownFingers];
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	502 if(inTouch->numDownFingers > 0) {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	503 inTouch->centroid.x = (inTouch->centroid.x*(inTouch->numDownFingers+1)-
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	504 x)/inTouch->numDownFingers;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	505 inTouch->centroid.y = (inTouch->centroid.y*(inTouch->numDownFingers+1)-
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	506 y)/inTouch->numDownFingers;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	507 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	508 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	509 else if(event->type == SDL_FINGERMOTION) {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	510 float dx = ((float)event->tfinger.dx)/(float)inTouch->res.x;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	511 float dy = ((float)event->tfinger.dy)/(float)inTouch->res.y;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	512 //printf("dx,dy: (%f,%f)\n",dx,dy);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	513 #ifdef ENABLE_DOLLAR
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	514 DollarPath* path = &inTouch->dollarPath;
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	515 if(path->numPoints < MAXPATHSIZE) {
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	516 path->p[path->numPoints].x = inTouch->centroid.x;
f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	517 path->p[path->numPoints].y = inTouch->centroid.y;
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	518 path->length += sqrt(dxdx + dydy);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	519 path->numPoints++;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	520 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	521 #endif
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	522 Point lastP;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	523 lastP.x = x - dx;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	524 lastP.y = y - dy;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	525 Point lastCentroid;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	526 lastCentroid = inTouch->centroid;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	527
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	528 inTouch->centroid.x += dx/inTouch->numDownFingers;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	529 inTouch->centroid.y += dy/inTouch->numDownFingers;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	530 if(inTouch->numDownFingers > 1) {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	531 Point lv; //Vector from centroid to last x,y position
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	532 Point v; //Vector from centroid to current x,y position
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	533 //lv = inTouch->gestureLast[j].cv;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	534 lv.x = lastP.x - lastCentroid.x;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	535 lv.y = lastP.y - lastCentroid.y;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	536 float lDist = sqrt(lv.xlv.x + lv.ylv.y);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	537 //printf("lDist = %f\n",lDist);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	538 v.x = x - inTouch->centroid.x;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	539 v.y = y - inTouch->centroid.y;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	540 //inTouch->gestureLast[j].cv = v;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	541 float Dist = sqrt(v.xv.x+v.yv.y);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	542 // cos(dTheta) = (v . lv)/(\|v\| * \|lv\|)
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	543
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	544 //Normalize Vectors to simplify angle calculation
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	545 lv.x/=lDist;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	546 lv.y/=lDist;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	547 v.x/=Dist;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	548 v.y/=Dist;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	549 float dtheta = atan2(lv.xv.y - lv.yv.x,lv.xv.x + lv.yv.y);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	550
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	551 float dDist = (Dist - lDist);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	552 if(lDist == 0) {dDist = 0;dtheta = 0;} //To avoid impossible values
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	553
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	554 //inTouch->gestureLast[j].dDist = dDist;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	555 //inTouch->gestureLast[j].dtheta = dtheta;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	556
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	557 //printf("dDist = %f, dTheta = %f\n",dDist,dtheta);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	558 //gdtheta = gdtheta.9 + dtheta.1;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	559 //gdDist = gdDist.9 + dDist.1
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	560 //knob.r += dDist/numDownFingers;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	561 //knob.ang += dtheta;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	562 //printf("thetaSum = %f, distSum = %f\n",gdtheta,gdDist);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	563 //printf("id: %i dTheta = %f, dDist = %f\n",j,dtheta,dDist);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	564 SDL_SendGestureMulti(inTouch,dtheta,dDist);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	565 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	566 else {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	567 //inTouch->gestureLast[j].dDist = 0;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	568 //inTouch->gestureLast[j].dtheta = 0;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	569 //inTouch->gestureLast[j].cv.x = 0;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	570 //inTouch->gestureLast[j].cv.y = 0;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	571 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	572 //inTouch->gestureLast[j].f.p.x = x;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	573 //inTouch->gestureLast[j].f.p.y = y;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	574 //break;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	575 //pressure?
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	576 }
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	577
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	578 if(event->type == SDL_FINGERDOWN) {
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	579
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	580 inTouch->numDownFingers++;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	581 inTouch->centroid.x = (inTouch->centroid.x*(inTouch->numDownFingers - 1)+
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	582 x)/inTouch->numDownFingers;
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	583 inTouch->centroid.y = (inTouch->centroid.y*(inTouch->numDownFingers - 1)+
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	584 y)/inTouch->numDownFingers;
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	585 printf("Finger Down: (%f,%f). Centroid: (%f,%f\n",x,y,
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	586 inTouch->centroid.x,inTouch->centroid.y);
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	587 /*
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	588 inTouch->gestureLast[j].f.id = event->tfinger.fingerId;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	589 inTouch->gestureLast[j].f.p.x = x;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	590 inTouch->gestureLast[j].f.p.y = y;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	591 inTouch->gestureLast[j].cv.x = 0;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	592 inTouch->gestureLast[j].cv.y = 0;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	593 */
4684 f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	594 #ifdef ENABLE_DOLLAR
f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	595 inTouch->dollarPath.length = 0;
f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	596 inTouch->dollarPath.p[0].x = x;
f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	597 inTouch->dollarPath.p[0].y = y;
f47c2640c667 Re-enabled dollar gesture Jim Grandpre <jim.tla@gmail.com> parents: 4683 diff changeset	598 inTouch->dollarPath.numPoints = 1;
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	599 #endif
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	600 }
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	601 }
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	602 }
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4682 diff changeset	603
4657 eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	604 /* vi: set ts=4 sw=4 expandtab: */
eed063a0bf5b Moved Multi finger gesture recognition into the library. Jim Grandpre <jim.tla@gmail.com> parents: diff changeset	605

Mercurial > sdl-ios-xcode

annotate src/events/SDL_gesture.c @ 4684:f47c2640c667