diff options
author | Andreas Haas <liu.gam3@gmail.com> | 2017-08-12 20:45:56 +0200 |
---|---|---|
committer | Andreas Haas <liu.gam3@gmail.com> | 2017-08-12 20:46:36 +0200 |
commit | 3bea3256f5def126b2b6d639ed70c4ddc3990344 (patch) | |
tree | 1c18aa2d400c42202b12e4ddac83642c4f11594e | |
parent | 5052cb2b9104f57d0ff38d80da50bbeceb926e6f (diff) |
InputDefault: Fix joypad actions when axis quickly changes direction.
The fix (inserting a fake event so actions get released properly) was already there but disregarded the case when the hardware sends values in the [0;1] range.
-rw-r--r-- | main/input_default.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index 4e2fd6f9d4..e7dc9d4b70 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -899,8 +899,14 @@ void InputDefault::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) { return; } - if (ABS(joy.last_axis[p_axis]) > 0.5 && joy.last_axis[p_axis] * p_value.value < 0) { - //changed direction quickly, insert fake event to release pending inputmap actions + //when changing direction quickly, insert fake event to release pending inputmap actions + float last = joy.last_axis[p_axis]; + if (p_value.min == 0 && (last < 0.25 || last > 0.75) && (last - 0.5) * (p_value.value - 0.5) < 0) { + JoyAxis jx; + jx.min = p_value.min; + jx.value = p_value.value < 0.5 ? 0.6 : 0.4; + joy_axis(p_device, p_axis, jx); + } else if (ABS(last) > 0.5 && last * p_value.value < 0) { JoyAxis jx; jx.min = p_value.min; jx.value = p_value.value < 0 ? 0.1 : -0.1; |