mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-30 01:29:42 -06:00
Merge pull request #3311 from Phatcat/analog_input_android
[Android] More analog input configurations + misc
This commit is contained in:
Markus Wick
@ -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));
|
||||
|
||||
@ -22,12 +22,12 @@ namespace ButtonManager
|
||||
BUTTON_DOWN = 7,
|
||||
BUTTON_LEFT = 8,
|
||||
BUTTON_RIGHT = 9,
|
||||
STICK_MAIN = 10, /* Used on Java Side */
|
||||
STICK_MAIN = 10, // Used on Java Side
|
||||
STICK_MAIN_UP = 11,
|
||||
STICK_MAIN_DOWN = 12,
|
||||
STICK_MAIN_LEFT = 13,
|
||||
STICK_MAIN_RIGHT = 14,
|
||||
STICK_C = 15, /* Used on Java Side */
|
||||
STICK_C = 15, // Used on Java Side
|
||||
STICK_C_UP = 16,
|
||||
STICK_C_DOWN = 17,
|
||||
STICK_C_LEFT = 18,
|
||||
@ -35,137 +35,147 @@ namespace ButtonManager
|
||||
TRIGGER_L = 20,
|
||||
TRIGGER_R = 21,
|
||||
// Wiimote
|
||||
WIIMOTE_BUTTON_A = 22,
|
||||
WIIMOTE_BUTTON_B = 23,
|
||||
WIIMOTE_BUTTON_MINUS = 24,
|
||||
WIIMOTE_BUTTON_PLUS = 25,
|
||||
WIIMOTE_BUTTON_HOME = 26,
|
||||
WIIMOTE_BUTTON_1 = 27,
|
||||
WIIMOTE_BUTTON_2 = 28,
|
||||
WIIMOTE_UP = 29,
|
||||
WIIMOTE_DOWN = 30,
|
||||
WIIMOTE_LEFT = 31,
|
||||
WIIMOTE_RIGHT = 32,
|
||||
WIIMOTE_IR_UP = 33,
|
||||
WIIMOTE_IR_DOWN = 34,
|
||||
WIIMOTE_IR_LEFT = 35,
|
||||
WIIMOTE_IR_RIGHT = 36,
|
||||
WIIMOTE_IR_FORWARD = 37,
|
||||
WIIMOTE_IR_BACKWARD = 38,
|
||||
WIIMOTE_IR_HIDE = 39,
|
||||
WIIMOTE_SWING_UP = 40,
|
||||
WIIMOTE_SWING_DOWN = 41,
|
||||
WIIMOTE_SWING_LEFT = 42,
|
||||
WIIMOTE_SWING_RIGHT = 43,
|
||||
WIIMOTE_SWING_FORWARD = 44,
|
||||
WIIMOTE_SWING_BACKWARD = 45,
|
||||
WIIMOTE_TILT_FORWARD = 46,
|
||||
WIIMOTE_TILT_BACKWARD = 47,
|
||||
WIIMOTE_TILT_LEFT = 48,
|
||||
WIIMOTE_TILT_RIGHT = 49,
|
||||
WIIMOTE_SHAKE_X = 51,
|
||||
WIIMOTE_SHAKE_Y = 52,
|
||||
WIIMOTE_SHAKE_Z = 53,
|
||||
WIIMOTE_BUTTON_A = 100,
|
||||
WIIMOTE_BUTTON_B = 101,
|
||||
WIIMOTE_BUTTON_MINUS = 102,
|
||||
WIIMOTE_BUTTON_PLUS = 103,
|
||||
WIIMOTE_BUTTON_HOME = 104,
|
||||
WIIMOTE_BUTTON_1 = 105,
|
||||
WIIMOTE_BUTTON_2 = 106,
|
||||
WIIMOTE_UP = 107,
|
||||
WIIMOTE_DOWN = 108,
|
||||
WIIMOTE_LEFT = 109,
|
||||
WIIMOTE_RIGHT = 110,
|
||||
WIIMOTE_IR = 111, // To Be Used on Java Side
|
||||
WIIMOTE_IR_UP = 112,
|
||||
WIIMOTE_IR_DOWN = 113,
|
||||
WIIMOTE_IR_LEFT = 114,
|
||||
WIIMOTE_IR_RIGHT = 115,
|
||||
WIIMOTE_IR_FORWARD = 116,
|
||||
WIIMOTE_IR_BACKWARD = 117,
|
||||
WIIMOTE_IR_HIDE = 118,
|
||||
WIIMOTE_SWING = 119, // To Be Used on Java Side
|
||||
WIIMOTE_SWING_UP = 120,
|
||||
WIIMOTE_SWING_DOWN = 121,
|
||||
WIIMOTE_SWING_LEFT = 122,
|
||||
WIIMOTE_SWING_RIGHT = 123,
|
||||
WIIMOTE_SWING_FORWARD = 124,
|
||||
WIIMOTE_SWING_BACKWARD = 125,
|
||||
WIIMOTE_TILT = 126, // To Be Used on Java Side
|
||||
WIIMOTE_TILT_FORWARD = 127,
|
||||
WIIMOTE_TILT_BACKWARD = 128,
|
||||
WIIMOTE_TILT_LEFT = 129,
|
||||
WIIMOTE_TILT_RIGHT = 130,
|
||||
WIIMOTE_TILT_MODIFIER = 131,
|
||||
WIIMOTE_SHAKE_X = 132,
|
||||
WIIMOTE_SHAKE_Y = 133,
|
||||
WIIMOTE_SHAKE_Z = 134,
|
||||
//Nunchuk
|
||||
NUNCHUK_BUTTON_C = 54,
|
||||
NUNCHUK_BUTTON_Z = 55,
|
||||
NUNCHUK_STICK = 56,
|
||||
NUNCHUK_STICK_UP = 57,
|
||||
NUNCHUK_STICK_DOWN = 58,
|
||||
NUNCHUK_STICK_LEFT = 59,
|
||||
NUNCHUK_STICK_RIGHT = 60,
|
||||
NUNCHUK_SWING_UP = 61,
|
||||
NUNCHUK_SWING_DOWN = 62,
|
||||
NUNCHUK_SWING_LEFT = 63,
|
||||
NUNCHUK_SWING_RIGHT = 64,
|
||||
NUNCHUK_SWING_FORWARD = 65,
|
||||
NUNCHUK_SWING_BACKWARD = 66,
|
||||
NUNCHUK_TILT_FORWARD = 67,
|
||||
NUNCHUK_TILT_BACKWARD = 68,
|
||||
NUNCHUK_TILT_LEFT = 69,
|
||||
NUNCHUK_TILT_RIGHT = 70,
|
||||
NUNCHUK_SHAKE_X = 72,
|
||||
NUNCHUK_SHAKE_Y = 73,
|
||||
NUNCHUK_SHAKE_Z = 74,
|
||||
NUNCHUK_BUTTON_C = 200,
|
||||
NUNCHUK_BUTTON_Z = 201,
|
||||
NUNCHUK_STICK = 202, // To Be Used on Java Side
|
||||
NUNCHUK_STICK_UP = 203,
|
||||
NUNCHUK_STICK_DOWN = 204,
|
||||
NUNCHUK_STICK_LEFT = 205,
|
||||
NUNCHUK_STICK_RIGHT = 206,
|
||||
NUNCHUK_SWING = 207, // To Be Used on Java Side
|
||||
NUNCHUK_SWING_UP = 208,
|
||||
NUNCHUK_SWING_DOWN = 209,
|
||||
NUNCHUK_SWING_LEFT = 210,
|
||||
NUNCHUK_SWING_RIGHT = 211,
|
||||
NUNCHUK_SWING_FORWARD = 212,
|
||||
NUNCHUK_SWING_BACKWARD = 213,
|
||||
NUNCHUK_TILT = 214, // To Be Used on Java Side
|
||||
NUNCHUK_TILT_FORWARD = 215,
|
||||
NUNCHUK_TILT_BACKWARD = 216,
|
||||
NUNCHUK_TILT_LEFT = 217,
|
||||
NUNCHUK_TILT_RIGHT = 218,
|
||||
NUNCHUK_TILT_MODIFIER = 219,
|
||||
NUNCHUK_SHAKE_X = 220,
|
||||
NUNCHUK_SHAKE_Y = 221,
|
||||
NUNCHUK_SHAKE_Z = 222,
|
||||
//Classic
|
||||
CLASSIC_BUTTON_A = 75,
|
||||
CLASSIC_BUTTON_B = 76,
|
||||
CLASSIC_BUTTON_X = 77,
|
||||
CLASSIC_BUTTON_Y = 78,
|
||||
CLASSIC_BUTTON_MINUS = 79,
|
||||
CLASSIC_BUTTON_PLUS = 80,
|
||||
CLASSIC_BUTTON_HOME = 81,
|
||||
CLASSIC_BUTTON_ZL = 82,
|
||||
CLASSIC_BUTTON_ZR = 83,
|
||||
CLASSIC_DPAD_UP = 84,
|
||||
CLASSIC_DPAD_DOWN = 85,
|
||||
CLASSIC_DPAD_LEFT = 86,
|
||||
CLASSIC_DPAD_RIGHT = 87,
|
||||
CLASSIC_STICK_LEFT = 88,
|
||||
CLASSIC_STICK_LEFT_UP = 89,
|
||||
CLASSIC_STICK_LEFT_DOWN = 90,
|
||||
CLASSIC_STICK_LEFT_LEFT = 91,
|
||||
CLASSIC_STICK_LEFT_RIGHT = 92,
|
||||
CLASSIC_STICK_RIGHT = 93,
|
||||
CLASSIC_STICK_RIGHT_UP = 94,
|
||||
CLASSIC_STICK_RIGHT_DOWN = 95,
|
||||
CLASSIC_STICK_RIGHT_LEFT = 96,
|
||||
CLASSIC_STICK_RIGHT_RIGHT = 97,
|
||||
CLASSIC_TRIGGER_L = 98,
|
||||
CLASSIC_TRIGGER_R = 99,
|
||||
CLASSIC_BUTTON_A = 300,
|
||||
CLASSIC_BUTTON_B = 301,
|
||||
CLASSIC_BUTTON_X = 302,
|
||||
CLASSIC_BUTTON_Y = 303,
|
||||
CLASSIC_BUTTON_MINUS = 304,
|
||||
CLASSIC_BUTTON_PLUS = 305,
|
||||
CLASSIC_BUTTON_HOME = 306,
|
||||
CLASSIC_BUTTON_ZL = 307,
|
||||
CLASSIC_BUTTON_ZR = 308,
|
||||
CLASSIC_DPAD_UP = 309,
|
||||
CLASSIC_DPAD_DOWN = 310,
|
||||
CLASSIC_DPAD_LEFT = 311,
|
||||
CLASSIC_DPAD_RIGHT = 312,
|
||||
CLASSIC_STICK_LEFT = 313, // To Be Used on Java Side
|
||||
CLASSIC_STICK_LEFT_UP = 314,
|
||||
CLASSIC_STICK_LEFT_DOWN = 315,
|
||||
CLASSIC_STICK_LEFT_LEFT = 316,
|
||||
CLASSIC_STICK_LEFT_RIGHT = 317,
|
||||
CLASSIC_STICK_RIGHT = 318, // To Be Used on Java Side
|
||||
CLASSIC_STICK_RIGHT_UP = 319,
|
||||
CLASSIC_STICK_RIGHT_DOWN = 320,
|
||||
CLASSIC_STICK_RIGHT_LEFT = 321,
|
||||
CLASSIC_STICK_RIGHT_RIGHT = 322,
|
||||
CLASSIC_TRIGGER_L = 323,
|
||||
CLASSIC_TRIGGER_R = 324,
|
||||
//Guitar
|
||||
GUITAR_BUTTON_MINUS = 100,
|
||||
GUITAR_BUTTON_PLUS = 101,
|
||||
GUITAR_FRET_GREEN = 102,
|
||||
GUITAR_FRET_RED = 103,
|
||||
GUITAR_FRET_YELLOW = 104,
|
||||
GUITAR_FRET_BLUE = 105,
|
||||
GUITAR_FRET_ORANGE = 106,
|
||||
GUITAR_STRUM_UP = 107,
|
||||
GUITAR_STRUM_DOWN = 108,
|
||||
GUITAR_STICK = 109,
|
||||
GUITAR_STICK_UP = 110,
|
||||
GUITAR_STICK_DOWN = 111,
|
||||
GUITAR_STICK_LEFT = 112,
|
||||
GUITAR_STICK_RIGHT = 113,
|
||||
GUITAR_WHAMMY_BAR = 114,
|
||||
GUITAR_BUTTON_MINUS = 400,
|
||||
GUITAR_BUTTON_PLUS = 401,
|
||||
GUITAR_FRET_GREEN = 402,
|
||||
GUITAR_FRET_RED = 403,
|
||||
GUITAR_FRET_YELLOW = 404,
|
||||
GUITAR_FRET_BLUE = 405,
|
||||
GUITAR_FRET_ORANGE = 406,
|
||||
GUITAR_STRUM_UP = 407,
|
||||
GUITAR_STRUM_DOWN = 408,
|
||||
GUITAR_STICK = 409, // To Be Used on Java Side
|
||||
GUITAR_STICK_UP = 410,
|
||||
GUITAR_STICK_DOWN = 411,
|
||||
GUITAR_STICK_LEFT = 412,
|
||||
GUITAR_STICK_RIGHT = 413,
|
||||
GUITAR_WHAMMY_BAR = 414,
|
||||
//Drums
|
||||
DRUMS_BUTTON_MINUS = 115,
|
||||
DRUMS_BUTTON_PLUS = 116,
|
||||
DRUMS_PAD_RED = 117,
|
||||
DRUMS_PAD_YELLOW = 118,
|
||||
DRUMS_PAD_BLUE = 119,
|
||||
DRUMS_PAD_GREEN = 120,
|
||||
DRUMS_PAD_ORANGE = 121,
|
||||
DRUMS_PAD_BASS = 122,
|
||||
DRUMS_STICK = 123,
|
||||
DRUMS_STICK_UP = 124,
|
||||
DRUMS_STICK_DOWN = 125,
|
||||
DRUMS_STICK_LEFT = 126,
|
||||
DRUMS_STICK_RIGHT = 127,
|
||||
DRUMS_BUTTON_MINUS = 500,
|
||||
DRUMS_BUTTON_PLUS = 501,
|
||||
DRUMS_PAD_RED = 502,
|
||||
DRUMS_PAD_YELLOW = 503,
|
||||
DRUMS_PAD_BLUE = 504,
|
||||
DRUMS_PAD_GREEN = 505,
|
||||
DRUMS_PAD_ORANGE = 506,
|
||||
DRUMS_PAD_BASS = 507,
|
||||
DRUMS_STICK = 508, // To Be Used on Java Side
|
||||
DRUMS_STICK_UP = 509,
|
||||
DRUMS_STICK_DOWN = 510,
|
||||
DRUMS_STICK_LEFT = 511,
|
||||
DRUMS_STICK_RIGHT = 512,
|
||||
//Turntable
|
||||
TURNTABLE_BUTTON_GREEN_LEFT = 128,
|
||||
TURNTABLE_BUTTON_RED_LEFT = 129,
|
||||
TURNTABLE_BUTTON_BLUE_LEFT = 130,
|
||||
TURNTABLE_BUTTON_GREEN_RIGHT = 131,
|
||||
TURNTABLE_BUTTON_RED_RIGHT = 132,
|
||||
TURNTABLE_BUTTON_BLUE_RIGHT = 133,
|
||||
TURNTABLE_BUTTON_MINUS = 134,
|
||||
TURNTABLE_BUTTON_PLUS = 135,
|
||||
TURNTABLE_BUTTON_HOME = 136,
|
||||
TURNTABLE_BUTTON_EUPHORIA = 137,
|
||||
TURNTABLE_TABLE_LEFT_LEFT = 138,
|
||||
TURNTABLE_TABLE_LEFT_RIGHT = 139,
|
||||
TURNTABLE_TABLE_RIGHT_LEFT = 140,
|
||||
TURNTABLE_TABLE_RIGHT_RIGHT = 141,
|
||||
TURNTABLE_STICK = 142,
|
||||
TURNTABLE_STICK_UP = 143,
|
||||
TURNTABLE_STICK_DOWN = 144,
|
||||
TURNTABLE_STICK_LEFT = 145,
|
||||
TURNTABLE_STICK_RIGHT = 146,
|
||||
TURNTABLE_EFFECT_DIAL = 147,
|
||||
TURNTABLE_CROSSFADE_LEFT = 148,
|
||||
TURNTABLE_CROSSFADE_RIGHT = 149,
|
||||
TURNTABLE_BUTTON_GREEN_LEFT = 600,
|
||||
TURNTABLE_BUTTON_RED_LEFT = 601,
|
||||
TURNTABLE_BUTTON_BLUE_LEFT = 602,
|
||||
TURNTABLE_BUTTON_GREEN_RIGHT = 603,
|
||||
TURNTABLE_BUTTON_RED_RIGHT = 604,
|
||||
TURNTABLE_BUTTON_BLUE_RIGHT = 605,
|
||||
TURNTABLE_BUTTON_MINUS = 606,
|
||||
TURNTABLE_BUTTON_PLUS = 607,
|
||||
TURNTABLE_BUTTON_HOME = 608,
|
||||
TURNTABLE_BUTTON_EUPHORIA = 609,
|
||||
TURNTABLE_TABLE_LEFT = 610, // To Be Used on Java Side
|
||||
TURNTABLE_TABLE_LEFT_LEFT = 611,
|
||||
TURNTABLE_TABLE_LEFT_RIGHT = 612,
|
||||
TURNTABLE_TABLE_RIGHT = 613, // To Be Used on Java Side
|
||||
TURNTABLE_TABLE_RIGHT_LEFT = 614,
|
||||
TURNTABLE_TABLE_RIGHT_RIGHT = 615,
|
||||
TURNTABLE_STICK = 616, // To Be Used on Java Side
|
||||
TURNTABLE_STICK_UP = 617,
|
||||
TURNTABLE_STICK_DOWN = 618,
|
||||
TURNTABLE_STICK_LEFT = 619,
|
||||
TURNTABLE_STICK_RIGHT = 620,
|
||||
TURNTABLE_EFFECT_DIAL = 621,
|
||||
TURNTABLE_CROSSFADE = 622, // To Be Used on Java Side
|
||||
TURNTABLE_CROSSFADE_LEFT = 623,
|
||||
TURNTABLE_CROSSFADE_RIGHT = 624,
|
||||
};
|
||||
enum ButtonState
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user