encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use DPAD devices as joystick input on Android

This commit is contained in:
Sam Lantinga 2017-10-19 13:54:56 -07:00
parent e98920f5f3
commit 9d9be45682
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android-project/src/org/libsdl/app/SDLControllerManager.java
View File

@ -92,17 +92,16 @@ public class SDLControllerManager
if ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK) { if ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK) {
Log.v(TAG, "Input device " + device.getName() + " is a joystick."); Log.v(TAG, "Input device " + device.getName() + " is a joystick.");
} }
/* A lot of things are a DPAD that we don't want to use as a joystick (e.g. gpio input, etc.)
if ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) { if ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) {
Log.v(TAG, "Input device " + device.getName() + " is a dpad."); Log.v(TAG, "Input device " + device.getName() + " is a dpad.");
} }
*/
if ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) { if ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
Log.v(TAG, "Input device " + device.getName() + " is a gamepad."); Log.v(TAG, "Input device " + device.getName() + " is a gamepad.");
} }
return (((sources & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK) || return ((sources & (InputDevice.SOURCE_CLASS_JOYSTICK|InputDevice.SOURCE_GAMEPAD)) != 0);
((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) ||
((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD)
);
} }
} }