From 3453847f26b79ab8590e86aebe861ee07774a934 Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 18 Aug 2010 16:09:23 +0300 Subject: [PATCH] Better multitouch input --- project/sdl/sdl-1.3/src/video/android/SDL_androidinput.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/project/sdl/sdl-1.3/src/video/android/SDL_androidinput.c b/project/sdl/sdl-1.3/src/video/android/SDL_androidinput.c index 4a6fc8d16..904fff9b9 100644 --- a/project/sdl/sdl-1.3/src/video/android/SDL_androidinput.c +++ b/project/sdl/sdl-1.3/src/video/android/SDL_androidinput.c @@ -73,13 +73,16 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv* env, jobject thiz, j if( isMultitouchUsed ) { - pointerId++; if( CurrentJoysticks[pointerId] ) { SDL_PrivateJoystickAxis(CurrentJoysticks[pointerId+1], 0, x); SDL_PrivateJoystickAxis(CurrentJoysticks[pointerId+1], 1, y); SDL_PrivateJoystickAxis(CurrentJoysticks[pointerId+1], 2, force); SDL_PrivateJoystickAxis(CurrentJoysticks[pointerId+1], 3, radius); + if( action == MOUSE_DOWN ) + SDL_PrivateJoystickButton(CurrentJoysticks[pointerId+1], 0, SDL_PRESSED); + if( action == MOUSE_UP ) + SDL_PrivateJoystickButton(CurrentJoysticks[pointerId+1], 0, SDL_RELEASED); } } if( !isMouseUsed ) @@ -580,7 +583,10 @@ int SDL_SYS_JoystickOpen(SDL_Joystick *joystick) if( joystick->index == 0 ) joystick->naxes = 3; else + { joystick->naxes = 4; + joystick->nbuttons = 1; + } CurrentJoysticks[joystick->index] = joystick; return(0); }