From 8e558b03d4b6cb96fe0eec400d33a5a009ecde9b Mon Sep 17 00:00:00 2001 From: Andreas Schiffler Date: Mon, 23 Aug 2010 23:44:28 -0700 Subject: [PATCH] Update VS2010 project to add new files; update new files so code builds on Win32/Win64 --- VisualC/SDL/SDL_VS2010.vcxproj | 10 ++- src/audio/SDL_audio.c | 7 +- src/events/SDL_gesture.c | 131 +++++++++++++++++++-------------- src/events/SDL_touch.c | 24 ++++-- 4 files changed, 104 insertions(+), 68 deletions(-) diff --git a/VisualC/SDL/SDL_VS2010.vcxproj b/VisualC/SDL/SDL_VS2010.vcxproj index c4a310372..406d6aae0 100644 --- a/VisualC/SDL/SDL_VS2010.vcxproj +++ b/VisualC/SDL/SDL_VS2010.vcxproj @@ -110,7 +110,7 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" 0x0409 - msvcrt.lib;msimg32.lib;winmm.lib;%(AdditionalDependencies) + msvcrt.lib;msimg32.lib;version.lib;winmm.lib;%(AdditionalDependencies) $(IntDir)SDL.dll true true @@ -274,6 +274,9 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" + + + @@ -326,6 +329,7 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" + @@ -340,6 +344,9 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" + + + @@ -431,6 +438,7 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" + diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index b774c54b8..1261926f4 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -29,7 +29,7 @@ #include "SDL_audiomem.h" #include "SDL_sysaudio.h" -#define _THIS SDL_AudioDevice *this +#define _THIS SDL_AudioDevice *_this static SDL_AudioDriver current_audio; static SDL_AudioDevice *open_devices[16]; @@ -321,8 +321,9 @@ SDL_StreamDeinit(SDL_AudioStreamer * stream) } } - +#if defined(ANDROID) #include +#endif /* The general mixing thread function */ int SDLCALL @@ -891,7 +892,7 @@ open_audio_device(const char *devname, int iscapture, device->opened = 1; /* Allocate a fake audio memory buffer */ - device->fake_stream = SDL_AllocAudioMem(device->spec.size); + device->fake_stream = (Uint8 *)SDL_AllocAudioMem(device->spec.size); if (device->fake_stream == NULL) { close_audio_device(device); SDL_OutOfMemory(); diff --git a/src/events/SDL_gesture.c b/src/events/SDL_gesture.c index 44aa1bd25..f500a9598 100644 --- a/src/events/SDL_gesture.c +++ b/src/events/SDL_gesture.c @@ -18,6 +18,7 @@ Sam Lantinga slouken@libsdl.org */ + #include "SDL_config.h" /* General mouse handling code for SDL */ @@ -26,6 +27,11 @@ #include "SDL_events_c.h" #include "SDL_gesture_c.h" +#include +#include +#include +#include + //TODO: Replace with malloc #define MAXPATHSIZE 1024 @@ -100,8 +106,8 @@ unsigned long SDL_HashDollar(SDL_FloatPoint* points) { unsigned long hash = 5381; int i; for(i = 0;i < DOLLARNPOINTS; i++) { - hash = ((hash<<5) + hash) + points[i].x; - hash = ((hash<<5) + hash) + points[i].y; + hash = ((hash<<5) + hash) + (unsigned long)points[i].x; + hash = ((hash<<5) + hash) + (unsigned long)points[i].y; } return hash; } @@ -110,7 +116,6 @@ unsigned long SDL_HashDollar(SDL_FloatPoint* points) { static int SaveTemplate(SDL_DollarTemplate *templ, SDL_RWops * src) { if(src == NULL) return 0; - int i; //No Longer storing the Hash, rehash on load //if(SDL_RWops.write(src,&(templ->hash),sizeof(templ->hash),1) != 1) return 0; @@ -151,14 +156,16 @@ int SDL_SaveDollarTemplate(SDL_GestureID gestureId, SDL_RWops *src) { //path is an already sampled set of points //Returns the index of the gesture on success, or -1 static int SDL_AddDollarGesture(SDL_GestureTouch* inTouch,SDL_FloatPoint* path) { + SDL_DollarTemplate* dollarTemplate; + SDL_DollarTemplate *templ; + int i = 0; if(inTouch == NULL) { if(SDL_numGestureTouches == 0) return -1; - int i = 0; for(i = 0;i < SDL_numGestureTouches; i++) { inTouch = &SDL_gestureTouch[i]; - SDL_DollarTemplate* dollarTemplate = - SDL_realloc(inTouch->dollarTemplate, + dollarTemplate = + (SDL_DollarTemplate *)SDL_realloc(inTouch->dollarTemplate, (inTouch->numDollarTemplates + 1) * sizeof(SDL_DollarTemplate)); if(!dollarTemplate) { @@ -168,7 +175,7 @@ static int SDL_AddDollarGesture(SDL_GestureTouch* inTouch,SDL_FloatPoint* path) inTouch->dollarTemplate = dollarTemplate; - SDL_DollarTemplate *templ = + templ = &inTouch->dollarTemplate[inTouch->numDollarTemplates]; memcpy(templ->path,path,DOLLARNPOINTS*sizeof(SDL_FloatPoint)); templ->hash = SDL_HashDollar(templ->path); @@ -177,7 +184,7 @@ static int SDL_AddDollarGesture(SDL_GestureTouch* inTouch,SDL_FloatPoint* path) return inTouch->numDollarTemplates - 1; } else { SDL_DollarTemplate* dollarTemplate = - SDL_realloc(inTouch->dollarTemplate, + ( SDL_DollarTemplate *)SDL_realloc(inTouch->dollarTemplate, (inTouch->numDollarTemplates + 1) * sizeof(SDL_DollarTemplate)); if(!dollarTemplate) { @@ -187,7 +194,7 @@ static int SDL_AddDollarGesture(SDL_GestureTouch* inTouch,SDL_FloatPoint* path) inTouch->dollarTemplate = dollarTemplate; - SDL_DollarTemplate *templ = + templ = &inTouch->dollarTemplate[inTouch->numDollarTemplates]; memcpy(templ->path,path,DOLLARNPOINTS*sizeof(SDL_FloatPoint)); templ->hash = SDL_HashDollar(templ->path); @@ -198,9 +205,9 @@ static int SDL_AddDollarGesture(SDL_GestureTouch* inTouch,SDL_FloatPoint* path) } int SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src) { - if(src == NULL) return 0; int i,loaded = 0; SDL_GestureTouch *touch = NULL; + if(src == NULL) return 0; if(touchId >= 0) { for(i = 0;i < SDL_numGestureTouches; i++) if(SDL_gestureTouch[i].id == touchId) @@ -240,10 +247,10 @@ float dollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ,float ang) { SDL_FloatPoint p; int i; for(i = 0; i < DOLLARNPOINTS; i++) { - p.x = points[i].x * cos(ang) - points[i].y * sin(ang); - p.y = points[i].x * sin(ang) + points[i].y * cos(ang); - dist += sqrt((p.x-templ[i].x)*(p.x-templ[i].x)+ - (p.y-templ[i].y)*(p.y-templ[i].y)); + p.x = (float)(points[i].x * cos(ang) - points[i].y * sin(ang)); + p.y = (float)(points[i].x * sin(ang) + points[i].y * cos(ang)); + dist += (float)(sqrt((p.x-templ[i].x)*(p.x-templ[i].x)+ + (p.y-templ[i].y)*(p.y-templ[i].y))); } return dist/DOLLARNPOINTS; @@ -253,26 +260,26 @@ float bestDollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ) { //------------BEGIN DOLLAR BLACKBOX----------------// //-TRANSLATED DIRECTLY FROM PSUDEO-CODE AVAILABLE AT-// //-"http://depts.washington.edu/aimgroup/proj/dollar/"-// - float ta = -M_PI/4; - float tb = M_PI/4; - float dt = M_PI/90; - float x1 = PHI*ta + (1-PHI)*tb; + double ta = -M_PI/4; + double tb = M_PI/4; + double dt = M_PI/90; + float x1 = (float)(PHI*ta + (1-PHI)*tb); float f1 = dollarDifference(points,templ,x1); - float x2 = (1-PHI)*ta + PHI*tb; + float x2 = (float)((1-PHI)*ta + PHI*tb); float f2 = dollarDifference(points,templ,x2); - while(abs(ta-tb) > dt) { + while(fabs(ta-tb) > dt) { if(f1 < f2) { tb = x2; x2 = x1; f2 = f1; - x1 = PHI*ta + (1-PHI)*tb; + x1 = (float)(PHI*ta + (1-PHI)*tb); f1 = dollarDifference(points,templ,x1); } else { ta = x1; x1 = x2; f1 = f2; - x2 = (1-PHI)*ta + PHI*tb; + x2 = (float)((1-PHI)*ta + PHI*tb); f2 = dollarDifference(points,templ,x2); } } @@ -288,6 +295,14 @@ float bestDollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ) { //DollarPath contains raw points, plus (possibly) the calculated length int dollarNormalize(SDL_DollarPath path,SDL_FloatPoint *points) { int i; + float interval; + float dist; + int numPoints = 0; + SDL_FloatPoint centroid; + float xmin,xmax,ymin,ymax; + float ang; + float w,h; + //Calculate length if it hasn't already been done if(path.length <= 0) { for(i=1;i interval) { points[numPoints].x = path.p[i-1].x + @@ -338,22 +351,21 @@ int dollarNormalize(SDL_DollarPath path,SDL_FloatPoint *points) { //printf("Centroid (%f,%f)",centroid.x,centroid.y); //Rotate Points so point 0 is left of centroid and solve for the bounding box - float xmin,xmax,ymin,ymax; xmin = centroid.x; xmax = centroid.x; ymin = centroid.y; ymax = centroid.y; - float ang = atan2(centroid.y - points[0].y, - centroid.x - points[0].x); + ang = (float)(atan2(centroid.y - points[0].y, + centroid.x - points[0].x)); for(i = 0;inumDollarTemplates;i++) { - int diff = bestDollarDifference(points,touch->dollarTemplate[i].path); + float diff = bestDollarDifference(points,touch->dollarTemplate[i].path); if(diff < bestDiff) {bestDiff = diff; *bestTempl = i;} } return bestDiff; } int SDL_GestureAddTouch(SDL_Touch* touch) { - SDL_GestureTouch *gestureTouch = SDL_realloc(SDL_gestureTouch, + SDL_GestureTouch *gestureTouch = (SDL_GestureTouch *)SDL_realloc(SDL_gestureTouch, (SDL_numGestureTouches + 1) * sizeof(SDL_GestureTouch)); @@ -479,6 +491,18 @@ int SDL_SendDollarRecord(SDL_GestureTouch* touch,SDL_GestureID gestureId) { void SDL_GestureProcessEvent(SDL_Event* event) { + float x,y; + SDL_FloatPoint path[DOLLARNPOINTS]; + int index; + int i; + float pathDx, pathDy; + SDL_FloatPoint lastP; + SDL_FloatPoint lastCentroid; + float lDist; + float Dist; + float dtheta; + float dDist; + if(event->type == SDL_FINGERMOTION || event->type == SDL_FINGERDOWN || event->type == SDL_FINGERUP) { @@ -492,8 +516,8 @@ void SDL_GestureProcessEvent(SDL_Event* event) // (int)inTouch->res.x,(int)inTouch->res.y); - float x = ((float)event->tfinger.x)/(float)inTouch->res.x; - float y = ((float)event->tfinger.y)/(float)inTouch->res.y; + x = ((float)event->tfinger.x)/(float)inTouch->res.x; + y = ((float)event->tfinger.y)/(float)inTouch->res.y; //Finger Up @@ -502,14 +526,11 @@ void SDL_GestureProcessEvent(SDL_Event* event) #ifdef ENABLE_DOLLAR if(inTouch->recording) { - inTouch->recording = SDL_FALSE; - SDL_FloatPoint path[DOLLARNPOINTS]; + inTouch->recording = SDL_FALSE; dollarNormalize(inTouch->dollarPath,path); //SDL_PrintPath(path); - int index; if(recordAll) { index = SDL_AddDollarGesture(NULL,path); - int i; for(i = 0;i < SDL_numGestureTouches; i++) SDL_gestureTouch[i].recording = SDL_FALSE; } @@ -554,18 +575,16 @@ void SDL_GestureProcessEvent(SDL_Event* event) if(path->numPoints < MAXPATHSIZE) { path->p[path->numPoints].x = inTouch->centroid.x; path->p[path->numPoints].y = inTouch->centroid.y; - float pathDx = + pathDx = (path->p[path->numPoints].x-path->p[path->numPoints-1].x); - float pathDy = + pathDy = (path->p[path->numPoints].y-path->p[path->numPoints-1].y); - path->length += sqrt(pathDx*pathDx + pathDy*pathDy); + path->length += (float)sqrt(pathDx*pathDx + pathDy*pathDy); path->numPoints++; } #endif - SDL_FloatPoint lastP; lastP.x = x - dx; lastP.y = y - dy; - SDL_FloatPoint lastCentroid; lastCentroid = inTouch->centroid; inTouch->centroid.x += dx/inTouch->numDownFingers; @@ -577,12 +596,12 @@ void SDL_GestureProcessEvent(SDL_Event* event) //lv = inTouch->gestureLast[j].cv; lv.x = lastP.x - lastCentroid.x; lv.y = lastP.y - lastCentroid.y; - float lDist = sqrt(lv.x*lv.x + lv.y*lv.y); + lDist = (float)sqrt(lv.x*lv.x + lv.y*lv.y); //printf("lDist = %f\n",lDist); v.x = x - inTouch->centroid.x; v.y = y - inTouch->centroid.y; //inTouch->gestureLast[j].cv = v; - float Dist = sqrt(v.x*v.x+v.y*v.y); + Dist = (float)sqrt(v.x*v.x+v.y*v.y); // cos(dTheta) = (v . lv)/(|v| * |lv|) //Normalize Vectors to simplify angle calculation @@ -590,9 +609,9 @@ void SDL_GestureProcessEvent(SDL_Event* event) lv.y/=lDist; v.x/=Dist; v.y/=Dist; - float dtheta = atan2(lv.x*v.y - lv.y*v.x,lv.x*v.x + lv.y*v.y); + dtheta = (float)atan2(lv.x*v.y - lv.y*v.x,lv.x*v.x + lv.y*v.y); - float dDist = (Dist - lDist); + dDist = (Dist - lDist); if(lDist == 0) {dDist = 0;dtheta = 0;} //To avoid impossible values //inTouch->gestureLast[j].dDist = dDist; diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c index 66c28412a..93513dec3 100644 --- a/src/events/SDL_touch.c +++ b/src/events/SDL_touch.c @@ -313,6 +313,11 @@ SDL_SendFingerDown(SDL_TouchID id, SDL_FingerID fingerid, SDL_bool down, float xin, float yin, float pressurein) { int posted; + Uint16 x; + Uint16 y; + Uint16 pressure; + SDL_Finger *finger; + SDL_Touch* touch = SDL_GetTouch(id); if(!touch) { @@ -321,11 +326,11 @@ SDL_SendFingerDown(SDL_TouchID id, SDL_FingerID fingerid, SDL_bool down, //scale to Integer coordinates - Uint16 x = (xin+touch->x_min)*(touch->xres)/(touch->native_xres); - Uint16 y = (yin+touch->y_min)*(touch->yres)/(touch->native_yres); - Uint16 pressure = (yin+touch->pressure_min)*(touch->pressureres)/(touch->native_pressureres); + x = (Uint16)((xin+touch->x_min)*(touch->xres)/(touch->native_xres)); + y = (Uint16)((yin+touch->y_min)*(touch->yres)/(touch->native_yres)); + pressure = (Uint16)((yin+touch->pressure_min)*(touch->pressureres)/(touch->native_pressureres)); - SDL_Finger *finger = SDL_GetFinger(touch,fingerid); + finger = SDL_GetFinger(touch,fingerid); if(down) { if(finger == NULL) { SDL_Finger nf; @@ -393,15 +398,18 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid, int relative, int posted; Sint16 xrel, yrel; float x_max = 0, y_max = 0; + Uint16 x; + Uint16 y; + Uint16 pressure; if (!touch) { return SDL_TouchNotFoundError(id); } //scale to Integer coordinates - Uint16 x = (xin+touch->x_min)*(touch->xres)/(touch->native_xres); - Uint16 y = (yin+touch->y_min)*(touch->yres)/(touch->native_yres); - Uint16 pressure = (yin+touch->pressure_min)*(touch->pressureres)/(touch->native_pressureres); + x = (Uint16)((xin+touch->x_min)*(touch->xres)/(touch->native_xres)); + y = (Uint16)((yin+touch->y_min)*(touch->yres)/(touch->native_yres)); + pressure = (Uint16)((yin+touch->pressure_min)*(touch->pressureres)/(touch->native_pressureres)); if(touch->flush_motion) { return 0; } @@ -544,9 +552,9 @@ SDL_GetTouchName(SDL_TouchID id) } int SDL_TouchNotFoundError(SDL_TouchID id) { + int i; printf("ERROR: Cannot send touch on non-existent device with id: %li make sure SDL_AddTouch has been called\n",id); printf("ERROR: There are %i touches installed with Id's:\n",SDL_num_touch); - int i; for(i=0;i < SDL_num_touch;i++) { printf("ERROR: %li\n",SDL_touchPads[i]->id); }