diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-01-04 14:57:43 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2016-01-04 14:57:43 +0100 |
| commit | f3c1cc95fcd5fda36bca87b0083e53905550d4c8 (patch) | |
| tree | b07f5dc0246e57edba1af5c9c5cf35a7025668b4 /Source/Core/DolphinWX/Android/ButtonManager.cpp | |
| parent | d29b406292cdec9b7d0bf51224f76b0eb53bbcb2 (diff) | |
| parent | b2ad0d07938f2e002c4ad54b67907437728231d5 (diff) | |
Merge pull request #3311 from Phatcat/analog_input_android
[Android] More analog input configurations + misc
Diffstat (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Android/ButtonManager.cpp | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index 5a282dd81b..803eeb062f 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp @@ -47,26 +47,27 @@ namespace ButtonManager "WiimoteDown", "WiimoteLeft", "WiimoteRight", - "WiimoteIRUp", - "WiimoteIRDown", - "WiimoteIRLeft", - "WiimoteIRRight", - "WiimoteIRForward", - "WiimoteIRBackward", - "WiimoteIRHide", - "WiimoteSwingUp", - "WiimoteSwingDown", - "WiimoteSwingLeft", - "WiimoteSwingRight", - "WiimoteSwingForward", - "WiimoteSwingBackward", - "WiimoteTiltForward", - "WiimoteTiltBackward", - "WiimoteTiltLeft", - "WiimoteTiltRight", - "WiimoteShakeX", - "WiimoteShakeY", - "WiimoteShakeZ", + "IRUp", + "IRDown", + "IRLeft", + "IRRight", + "IRForward", + "IRBackward", + "IRHide", + "SwingUp", + "SwingDown", + "SwingLeft", + "SwingRight", + "SwingForward", + "SwingBackward", + "TiltForward", + "TiltBackward", + "TiltLeft", + "TiltRight", + "TiltModifier" + "ShakeX", + "ShakeY", + "ShakeZ", // Nunchuk "NunchukC", "NunchukZ", @@ -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)); |