maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3722 from Hinsbart/fix_action_pressed

Browse source 
fix joystick axis handling for Input.is_action_pressed()
This commit is contained in:
Rémi Verschelde 2016-02-16 07:48:17 +01:00
parent 747c1709aa 04f7c32847
commit a63ebda21f
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main/input_default.cpp
View file

@ -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;
}
}