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/uwp/joypad_uwp.cpp | |
| parent | a92f5f306166251ccb72666c516805d364ea4cdc (diff) | |
| parent | e0d4e840b4e74d061add885b9ad2aa095b61058e (diff) | |
Merge pull request #38151 from madmiraal/fix-8368
Support SDL2 half axes and inverted axes mappings.
Diffstat (limited to 'platform/uwp/joypad_uwp.cpp')
| -rw-r--r-- | platform/uwp/joypad_uwp.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/uwp/joypad_uwp.cpp b/platform/uwp/joypad_uwp.cpp index 93a9992706..066787e9d6 100644 --- a/platform/uwp/joypad_uwp.cpp +++ b/platform/uwp/joypad_uwp.cpp @@ -64,12 +64,12 @@ void JoypadUWP::process_controllers() { button_mask *= 2; } - input->joy_axis(joy.id, JOY_AXIS_0, axis_correct(reading.LeftThumbstickX)); - input->joy_axis(joy.id, JOY_AXIS_1, axis_correct(reading.LeftThumbstickY, true)); - input->joy_axis(joy.id, JOY_AXIS_2, axis_correct(reading.RightThumbstickX)); - input->joy_axis(joy.id, JOY_AXIS_3, axis_correct(reading.RightThumbstickY, true)); - input->joy_axis(joy.id, JOY_AXIS_4, axis_correct(reading.LeftTrigger, false, true)); - input->joy_axis(joy.id, JOY_AXIS_5, axis_correct(reading.RightTrigger, false, true)); + input->joy_axis(joy.id, JOY_AXIS_LEFT_X, axis_correct(reading.LeftThumbstickX)); + input->joy_axis(joy.id, JOY_AXIS_LEFT_Y, axis_correct(reading.LeftThumbstickY, true)); + input->joy_axis(joy.id, JOY_AXIS_RIGHT_X, axis_correct(reading.RightThumbstickX)); + input->joy_axis(joy.id, JOY_AXIS_RIGHT_Y, axis_correct(reading.RightThumbstickY, true)); + input->joy_axis(joy.id, JOY_AXIS_TRIGGER_LEFT, axis_correct(reading.LeftTrigger, false, true)); + input->joy_axis(joy.id, JOY_AXIS_TRIGGER_RIGHT, axis_correct(reading.RightTrigger, false, true)); uint64_t timestamp = input->get_joy_vibration_timestamp(joy.id); if (timestamp > joy.ff_timestamp) { |