asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8936 from Hinsbart/fix_action

Browse source 
Fix InputEvent actions.
This commit is contained in:
Rémi Verschelde 2017-05-27 11:29:05 +02:00 committed by GitHub
commit 378ebffb23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/os/input_event.cpp
View file

@ -62,11 +62,11 @@ bool InputEvent::is_action(const StringName &p_action) const {
bool InputEvent::is_action_pressed(const StringName &p_action) const { bool InputEvent::is_action_pressed(const StringName &p_action) const {
return false; // InputMap::get_singleton()->event_is_action(Ref<InputEvent>(this),p_action); return (is_pressed() && !is_echo() && is_action(p_action));
} }
bool InputEvent::is_action_released(const StringName &p_action) const { bool InputEvent::is_action_released(const StringName &p_action) const {
return false; return (!is_pressed() && is_action(p_action));
} }
bool InputEvent::is_echo() const { bool InputEvent::is_echo() const {

2
main/input_default.cpp
View file

@ -369,7 +369,7 @@ void InputDefault::parse_input_event(const Ref<InputEvent> &p_event) {
set_joy_axis(jm->get_device(), jm->get_axis(), jm->get_axis_value()); set_joy_axis(jm->get_device(), jm->get_axis(), jm->get_axis_value());
} }
if (p_event->is_echo()) { if (!p_event->is_echo()) {
for (const Map<StringName, InputMap::Action>::Element *E = InputMap::get_singleton()->get_action_map().front(); E; E = E->next()) { for (const Map<StringName, InputMap::Action>::Element *E = InputMap::get_singleton()->get_action_map().front(); E; E = E->next()) {
if (InputMap::get_singleton()->event_is_action(p_event, E->key()) && is_action_pressed(E->key()) != p_event->is_pressed()) { if (InputMap::get_singleton()->event_is_action(p_event, E->key()) && is_action_pressed(E->key()) != p_event->is_pressed()) {