diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2016-09-26 12:45:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-26 12:45:31 +0200 |
commit | 73a7b91459fc18013e51e8c4dfbcc7a309d6b1e2 (patch) | |
tree | cd19d81aa75138b686a64da45234baa2cc083375 /main | |
parent | db1a9863d22799d5e23a26066a6547b1012754bc (diff) | |
parent | e0fcd9331a7ce0e3afd7240a65ecf3e8c59ef9a3 (diff) |
Merge pull request #6568 from Hinsbart/joy_names
Add functions to get readable names for joystick events
Diffstat (limited to 'main')
-rw-r--r-- | main/input_default.cpp | 58 | ||||
-rw-r--r-- | main/input_default.h | 5 |
2 files changed, 63 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index 2020f7a5ad..92f4a6fb72 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -1159,3 +1159,61 @@ Array InputDefault::get_connected_joysticks() { } return ret; } + +static const char* _buttons[] = { + "Face Button Bottom", + "Face Button Right", + "Face Button Left", + "Face Button Top", + "L", + "R", + "L2", + "R2", + "L3", + "R3", + "Select", + "Start", + "DPAD Up", + "DPAD Down", + "DPAD Left", + "DPAD Right" +}; + +static const char* _axes[] = { + "Left Stick X", + "Left Stick Y", + "Right Stick X", + "Right Stick Y", + "", + "", + "L2", + "R2" +}; + +String InputDefault::get_joy_button_string(int p_button) { + ERR_FAIL_INDEX_V(p_button, JOY_BUTTON_MAX, ""); + return _buttons[p_button]; +} + +int InputDefault::get_joy_button_index_from_string(String p_button) { + for (int i = 0; i < JOY_BUTTON_MAX; i++) { + if (p_button == _buttons[i]) { + return i; + } + } + ERR_FAIL_V(-1); +} + +String InputDefault::get_joy_axis_string(int p_axis) { + ERR_FAIL_INDEX_V(p_axis, JOY_AXIS_MAX, ""); + return _axes[p_axis]; +} + +int InputDefault::get_joy_axis_index_from_string(String p_axis) { + for (int i = 0; i < JOY_AXIS_MAX; i++) { + if (p_axis == _axes[i]) { + return i; + } + } + ERR_FAIL_V(-1); +} diff --git a/main/input_default.h b/main/input_default.h index fbf7837b3b..2db6d28abf 100644 --- a/main/input_default.h +++ b/main/input_default.h @@ -235,6 +235,11 @@ public: virtual bool is_joy_known(int p_device); virtual String get_joy_guid(int p_device) const; + virtual String get_joy_button_string(int p_button); + virtual String get_joy_axis_string(int p_axis); + virtual int get_joy_axis_index_from_string(String p_axis); + virtual int get_joy_button_index_from_string(String p_button); + bool is_joy_mapped(int p_device); String get_joy_guid_remapped(int p_device) const; void set_fallback_mapping(String p_guid); |