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 /core/os/input.cpp | |
| 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 'core/os/input.cpp')
| -rw-r--r-- | core/os/input.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp index 401ab7ffe2..88c17740b1 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -64,6 +64,10 @@ void Input::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_connected_joysticks"),&Input::get_connected_joysticks); ObjectTypeDB::bind_method(_MD("get_joy_vibration_strength", "device"), &Input::get_joy_vibration_strength); ObjectTypeDB::bind_method(_MD("get_joy_vibration_duration", "device"), &Input::get_joy_vibration_duration); + ObjectTypeDB::bind_method(_MD("get_joy_button_string", "button_index"), &Input::get_joy_button_string); + ObjectTypeDB::bind_method(_MD("get_joy_button_index_from_string", "button"), &Input::get_joy_button_index_from_string); + ObjectTypeDB::bind_method(_MD("get_joy_axis_string", "axis_index"), &Input::get_joy_axis_string); + ObjectTypeDB::bind_method(_MD("get_joy_axis_index_from_string", "axis"), &Input::get_joy_axis_index_from_string); ObjectTypeDB::bind_method(_MD("start_joy_vibration", "device", "weak_magnitude", "strong_magnitude", "duration"), &Input::start_joy_vibration, DEFVAL(0)); ObjectTypeDB::bind_method(_MD("stop_joy_vibration", "device"), &Input::stop_joy_vibration); ObjectTypeDB::bind_method(_MD("get_accelerometer"),&Input::get_accelerometer); |