From f62054e467f07e0e5409f92b4d5b93c3f60bc8b3 Mon Sep 17 00:00:00 2001 From: Phatcat Date: Mon, 4 Jan 2016 13:35:04 +0100 Subject: Android: More analog input configurations Lets the user set the following in intervals of 10 between 10 and 100; - Stick/Radius (default 100,000000) - Triggers/Threshold (default 90,000000) - Tilt/Modifier/Range (default 50,000000) + mapped Tilt/Modifier button to the configurations for wiimotes & nunchuks --- Source/Core/DolphinWX/Android/ButtonManager.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp') diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index 244171b12c..803eeb062f 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp @@ -64,6 +64,7 @@ namespace ButtonManager "TiltBackward", "TiltLeft", "TiltRight", + "TiltModifier" "ShakeX", "ShakeY", "ShakeZ", @@ -84,6 +85,7 @@ namespace ButtonManager "NunchukTiltBackward", "NunchukTiltLeft", "NunchukTiltRight", + "NunchukTiltModifier", "NunchukShakeX", "NunchukShakeY", "NunchukShakeZ", @@ -213,6 +215,7 @@ namespace ButtonManager WIIMOTE_TILT_BACKWARD, WIIMOTE_TILT_LEFT, WIIMOTE_TILT_RIGHT, + WIIMOTE_TILT_MODIFIER, WIIMOTE_SHAKE_X, WIIMOTE_SHAKE_Y, WIIMOTE_SHAKE_Z, @@ -233,6 +236,7 @@ namespace ButtonManager NUNCHUK_TILT_BACKWARD, NUNCHUK_TILT_LEFT, NUNCHUK_TILT_RIGHT, + NUNCHUK_TILT_MODIFIER, NUNCHUK_SHAKE_X, NUNCHUK_SHAKE_Y, NUNCHUK_SHAKE_Z, @@ -365,6 +369,7 @@ namespace ButtonManager AddBind(touchScreenKey, new sBind(a, WIIMOTE_LEFT, BIND_BUTTON, WIIMOTE_LEFT, 1.0f)); AddBind(touchScreenKey, new sBind(a, WIIMOTE_RIGHT, BIND_BUTTON, WIIMOTE_RIGHT, 1.0f)); AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_HIDE, BIND_BUTTON, WIIMOTE_IR_HIDE, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_MODIFIER, BIND_BUTTON, WIIMOTE_TILT_MODIFIER, 1.0f)); AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_X, BIND_BUTTON, WIIMOTE_SHAKE_X, 1.0f)); AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_Y, BIND_BUTTON, WIIMOTE_SHAKE_Y, 1.0f)); AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_Z, BIND_BUTTON, WIIMOTE_SHAKE_Z, 1.0f)); @@ -389,6 +394,7 @@ namespace ButtonManager // Wii: Nunchuk AddBind(touchScreenKey, new sBind(a, NUNCHUK_BUTTON_C, BIND_BUTTON, NUNCHUK_BUTTON_C, 1.0f)); AddBind(touchScreenKey, new sBind(a, NUNCHUK_BUTTON_Z, BIND_BUTTON, NUNCHUK_BUTTON_Z, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_MODIFIER, BIND_BUTTON, NUNCHUK_TILT_MODIFIER, 1.0f)); AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_X, BIND_BUTTON, NUNCHUK_SHAKE_X, 1.0f)); AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_Y, BIND_BUTTON, NUNCHUK_SHAKE_Y, 1.0f)); AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_Z, BIND_BUTTON, NUNCHUK_SHAKE_Z, 1.0f)); -- cgit v1.2.3