seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8133 from Hinsbart/joy_constants

Browse Source 
Input: Refactor JOY_* constants.
This commit is contained in:
Rémi Verschelde
2017-03-24 22:53:16 +01:00
committed by GitHub
parent 60a9debb99 0d8f5660f6
commit 5cad9147f9
3 changed files with 23 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/global_constants.cpp
View File

@ -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_LX),
BIND_GLOBAL_CONSTANT(JOY_ANALOG_LY),
BIND_GLOBAL_CONSTANT(JOY_ANALOG_1_X),
BIND_GLOBAL_CONSTANT(JOY_ANALOG_1_Y),
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),