From 109fe0e0dcb698f8b4660027d03e96ced12fcb6f Mon Sep 17 00:00:00 2001 From: dbrady Date: Tue, 28 Jan 2014 15:28:20 -0800 Subject: [PATCH] fixed hat code validation. --- .../src/org/libsdl/app/SDLActivity.java | 26 +++++++++++++++---- src/core/android/SDL_android.c | 8 ++++++ src/joystick/android/SDL_sysjoystick.c | 20 ++++++++++++++ src/joystick/android/SDL_sysjoystick_c.h | 1 + 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java index cf352503e7d24..3ce26ad3fe071 100644 --- a/android-project/src/org/libsdl/app/SDLActivity.java +++ b/android-project/src/org/libsdl/app/SDLActivity.java @@ -262,6 +262,8 @@ boolean sendCommand(int command, Object data) { public static native int onNativePadUp(int device_id, int keycode); public static native void onNativeJoy(int device_id, int axis, float value); + public static native void onNativeHat(int device_id, int hat_id, + int x, int y); public static native void onNativeKeyDown(int keycode); public static native void onNativeKeyUp(int keycode); public static native void onNativeKeyboardFocusLost(); @@ -923,6 +925,7 @@ class SDLJoystick { public int device_id; public String name; public ArrayList axes; + public ArrayList hats; } class RangeComparator implements Comparator { @@ -956,17 +959,25 @@ public void pollInputDevices() { joystick.device_id = deviceIds[i]; joystick.name = joystickDevice.getName(); joystick.axes = new ArrayList(); + joystick.hats = new ArrayList(); List ranges = joystickDevice.getMotionRanges(); Collections.sort(ranges, new RangeComparator()); for (InputDevice.MotionRange range : ranges ) { - if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) { - joystick.axes.add(range); - } + if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) { + if (range.getAxis() == MotionEvent.AXIS_HAT_X || + range.getAxis() == MotionEvent.AXIS_HAT_Y) { + joystick.hats.add(range); + } + else { + joystick.axes.add(range); + } + } } mJoysticks.add(joystick); - SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, joystick.axes.size(), 0, 0); + SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, + joystick.axes.size(), joystick.hats.size()/2, 0); } } } @@ -1019,7 +1030,12 @@ public boolean handleMotionEvent(MotionEvent event) { /* Normalize the value to -1...1 */ float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f; SDLActivity.onNativeJoy(joystick.device_id, i, value ); - } + } + for (int i = 0; i < joystick.hats.size(); i+=2) { + int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) ); + int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) ); + SDLActivity.onNativeHat(joystick.device_id, i/2, hatX, hatY ); + } } break; default: diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c index c3944f41adf88..73ece9f59f0c9 100644 --- a/src/core/android/SDL_android.c +++ b/src/core/android/SDL_android.c @@ -172,6 +172,14 @@ void Java_org_libsdl_app_SDLActivity_onNativeJoy( Android_OnJoy(device_id, axis, value); } +/* POV Hat */ +void Java_org_libsdl_app_SDLActivity_onNativeHat( + JNIEnv* env, jclass jcls, + jint device_id, jint hat_id, jint x, jint y) +{ + Android_OnHat(device_id, hat_id, x, y); +} + int Java_org_libsdl_app_SDLActivity_nativeAddJoystick( JNIEnv* env, jclass jcls, diff --git a/src/joystick/android/SDL_sysjoystick.c b/src/joystick/android/SDL_sysjoystick.c index 33aa5c35e8922..773bd9869710b 100644 --- a/src/joystick/android/SDL_sysjoystick.c +++ b/src/joystick/android/SDL_sysjoystick.c @@ -226,6 +226,26 @@ Android_OnJoy(int device_id, int axis, float value) return 0; } +int +Android_OnHat(int device_id, int hat_id, int x, int y) +{ + const Uint8 position_map[3][3] = { + {SDL_HAT_LEFTUP, SDL_HAT_UP, SDL_HAT_RIGHTUP}, + {SDL_HAT_LEFT, SDL_HAT_CENTERED, SDL_HAT_RIGHT}, + {SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN} + }; + + if (x >= -1 && x <=1 && y >= -1 && y <= 1) { + SDL_joylist_item *item = JoystickByDeviceId(device_id); + if (item && item->joystick) { + SDL_PrivateJoystickHat(item->joystick, hat_id, position_map[y+1][x+1] ); + } + return 0; + } + + return -1; +} + int Android_AddJoystick(int device_id, const char *name, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs) diff --git a/src/joystick/android/SDL_sysjoystick_c.h b/src/joystick/android/SDL_sysjoystick_c.h index 1c1d975c6b9be..c62395b9023a8 100644 --- a/src/joystick/android/SDL_sysjoystick_c.h +++ b/src/joystick/android/SDL_sysjoystick_c.h @@ -27,6 +27,7 @@ extern int Android_OnPadDown(int device_id, int keycode); extern int Android_OnPadUp(int device_id, int keycode); extern int Android_OnJoy(int device_id, int axisnum, float value); +extern int Android_OnHat(int device_id, int hat_id, int x, int y); extern int Android_AddJoystick(int device_id, const char *name, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs); extern int Android_RemoveJoystick(int device_id);