diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-13 12:56:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 12:56:42 +0200 |
| commit | aebe0364590a15a11a6bb753f058449d9697dd89 (patch) | |
| tree | 38033591f14c8fb9c5885de7c0dc4a55eab8b5b6 /platform/javascript/display_server_javascript.cpp | |
| parent | a92f5f306166251ccb72666c516805d364ea4cdc (diff) | |
| parent | e0d4e840b4e74d061add885b9ad2aa095b61058e (diff) | |
| download | redot-engine-aebe0364590a15a11a6bb753f058449d9697dd89.tar.gz | |
Merge pull request #38151 from madmiraal/fix-8368
Support SDL2 half axes and inverted axes mappings.
Diffstat (limited to 'platform/javascript/display_server_javascript.cpp')
| -rw-r--r-- | platform/javascript/display_server_javascript.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index 060e446fca..c302614eca 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -659,14 +659,7 @@ void DisplayServerJavaScript::process_joypads() { for (int button = 0; button < button_count; button++) { float value = state.analogButton[button]; - if (String::utf8(state.mapping) == "standard" && (button == JOY_ANALOG_L2 || button == JOY_ANALOG_R2)) { - Input::JoyAxis joy_axis; - joy_axis.min = 0; - joy_axis.value = value; - input->joy_axis(joypad, button, joy_axis); - } else { - input->joy_button(joypad, button, value); - } + input->joy_button(joypad, button, value); } for (int axis = 0; axis < axis_count; axis++) { |