diff options
author | hondres <liu.gam3@gmail.com> | 2016-02-15 22:26:20 +0100 |
---|---|---|
committer | hondres <liu.gam3@gmail.com> | 2016-02-15 22:26:20 +0100 |
commit | 04f7c3284770a1862c8e270e40f9d2416d055ce1 (patch) | |
tree | 546ea39cd98871bdee0779a7aa1e157d6bb7c8c2 | |
parent | 306518730078c0e4d8beb6d5d9afb90437de437f (diff) |
fix joystick axis handling for Input.is_action_pressed()
-rw-r--r-- | main/input_default.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index 3c81bcef4f..3af02b2b1f 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -102,6 +102,18 @@ bool InputDefault::is_action_pressed(const StringName& p_action) { if (joy_buttons_pressed.has(c)) return true; } break; + case InputEvent::JOYSTICK_MOTION: { + + const InputEventJoystickMotion &iejm=E->get().joy_motion; + int c = _combine_device(iejm.axis,device); + if (_joy_axis.has(c)) { + if (iejm.axis_value < 0) { + if (_joy_axis[c] < -0.5f) return true; + } + else + if (_joy_axis[c] > 0.5f) return true; + } + } break; } } |