diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/global_constants.cpp | 21 | ||||
| -rw-r--r-- | core/os/input_event.h | 47 |
2 files changed, 20 insertions, 48 deletions
diff --git a/core/global_constants.cpp b/core/global_constants.cpp index 9d1ae3aed9..02655993a4 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -349,21 +349,11 @@ static _GlobalConstant _global_constants[] = { BIND_GLOBAL_CONSTANT(JOY_BUTTON_15), BIND_GLOBAL_CONSTANT(JOY_BUTTON_MAX), - BIND_GLOBAL_CONSTANT(JOY_SNES_A), - BIND_GLOBAL_CONSTANT(JOY_SNES_B), - BIND_GLOBAL_CONSTANT(JOY_SNES_X), - BIND_GLOBAL_CONSTANT(JOY_SNES_Y), - BIND_GLOBAL_CONSTANT(JOY_SONY_CIRCLE), BIND_GLOBAL_CONSTANT(JOY_SONY_X), BIND_GLOBAL_CONSTANT(JOY_SONY_SQUARE), BIND_GLOBAL_CONSTANT(JOY_SONY_TRIANGLE), - BIND_GLOBAL_CONSTANT(JOY_SEGA_B), - BIND_GLOBAL_CONSTANT(JOY_SEGA_A), - BIND_GLOBAL_CONSTANT(JOY_SEGA_X), - BIND_GLOBAL_CONSTANT(JOY_SEGA_Y), - BIND_GLOBAL_CONSTANT(JOY_XBOX_B), BIND_GLOBAL_CONSTANT(JOY_XBOX_A), BIND_GLOBAL_CONSTANT(JOY_XBOX_X), @@ -397,14 +387,11 @@ static _GlobalConstant _global_constants[] = { BIND_GLOBAL_CONSTANT(JOY_AXIS_7), BIND_GLOBAL_CONSTANT(JOY_AXIS_MAX), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_0_X), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_0_Y), - - BIND_GLOBAL_CONSTANT(JOY_ANALOG_1_X), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_1_Y), + BIND_GLOBAL_CONSTANT(JOY_ANALOG_LX), + BIND_GLOBAL_CONSTANT(JOY_ANALOG_LY), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_2_X), - BIND_GLOBAL_CONSTANT(JOY_ANALOG_2_Y), + BIND_GLOBAL_CONSTANT(JOY_ANALOG_RX), + BIND_GLOBAL_CONSTANT(JOY_ANALOG_RY), BIND_GLOBAL_CONSTANT(JOY_ANALOG_L2), BIND_GLOBAL_CONSTANT(JOY_ANALOG_R2), diff --git a/core/os/input_event.h b/core/os/input_event.h index fd3f8c4cec..17b9f8abc1 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -89,32 +89,20 @@ enum { JOY_DPAD_LEFT = JOY_BUTTON_14, JOY_DPAD_RIGHT = JOY_BUTTON_15, - // a little history about game controllers (who copied who) + JOY_SONY_CIRCLE = JOY_BUTTON_1, + JOY_SONY_X = JOY_BUTTON_0, + JOY_SONY_SQUARE = JOY_BUTTON_2, + JOY_SONY_TRIANGLE = JOY_BUTTON_3, - JOY_SNES_B = JOY_BUTTON_0, - JOY_SNES_A = JOY_BUTTON_1, - JOY_SNES_Y = JOY_BUTTON_2, - JOY_SNES_X = JOY_BUTTON_3, + JOY_XBOX_A = JOY_BUTTON_0, + JOY_XBOX_B = JOY_BUTTON_1, + JOY_XBOX_X = JOY_BUTTON_2, + JOY_XBOX_Y = JOY_BUTTON_3, - JOY_SONY_CIRCLE = JOY_SNES_A, - JOY_SONY_X = JOY_SNES_B, - JOY_SONY_SQUARE = JOY_SNES_Y, - JOY_SONY_TRIANGLE = JOY_SNES_X, - - JOY_SEGA_B = JOY_SNES_A, - JOY_SEGA_A = JOY_SNES_B, - JOY_SEGA_X = JOY_SNES_Y, - JOY_SEGA_Y = JOY_SNES_X, - - JOY_XBOX_B = JOY_SEGA_B, - JOY_XBOX_A = JOY_SEGA_A, - JOY_XBOX_X = JOY_SEGA_X, - JOY_XBOX_Y = JOY_SEGA_Y, - - JOY_DS_A = JOY_SNES_A, - JOY_DS_B = JOY_SNES_B, - JOY_DS_X = JOY_SNES_X, - JOY_DS_Y = JOY_SNES_Y, + JOY_DS_A = JOY_BUTTON_1, + JOY_DS_B = JOY_BUTTON_0, + JOY_DS_X = JOY_BUTTON_3, + JOY_DS_Y = JOY_BUTTON_2, JOY_WII_C = JOY_BUTTON_5, JOY_WII_Z = JOY_BUTTON_6, @@ -134,14 +122,11 @@ enum { JOY_AXIS_7 = 7, JOY_AXIS_MAX = 8, - JOY_ANALOG_0_X = JOY_AXIS_0, - JOY_ANALOG_0_Y = JOY_AXIS_1, - - JOY_ANALOG_1_X = JOY_AXIS_2, - JOY_ANALOG_1_Y = JOY_AXIS_3, + JOY_ANALOG_LX = JOY_AXIS_0, + JOY_ANALOG_LY = JOY_AXIS_1, - JOY_ANALOG_2_X = JOY_AXIS_4, - JOY_ANALOG_2_Y = JOY_AXIS_5, + JOY_ANALOG_RX = JOY_AXIS_2, + JOY_ANALOG_RY = JOY_AXIS_3, JOY_ANALOG_L2 = JOY_AXIS_6, JOY_ANALOG_R2 = JOY_AXIS_7, |