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

Merge pull request #6862 from Faless/fix_6388

Browse source 
Fix Keyboard Input Hangs when using modifiers
This commit is contained in:
Rémi Verschelde 2016-11-11 10:47:10 +01:00 committed by GitHub
commit f0f04d5082
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/input_map.cpp
View file

@ -106,7 +106,7 @@ List<StringName> InputMap::get_actions() const {
return actions; return actions;
} }
List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const InputEvent& p_event) const { List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const InputEvent& p_event, bool p_mod_ignore=false) const {
for (List<InputEvent>::Element *E=p_list.front();E;E=E->next()) { for (List<InputEvent>::Element *E=p_list.front();E;E=E->next()) {
@ -122,7 +122,7 @@ List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const
case InputEvent::KEY: { case InputEvent::KEY: {
same=(e.key.scancode==p_event.key.scancode && e.key.mod == p_event.key.mod); same=(e.key.scancode==p_event.key.scancode && (p_mod_ignore || e.key.mod == p_event.key.mod));
} break; } break;
case InputEvent::JOYSTICK_BUTTON: { case InputEvent::JOYSTICK_BUTTON: {
@ -229,7 +229,7 @@ bool InputMap::event_is_action(const InputEvent& p_event, const StringName& p_ac
return p_event.action.action==E->get().id; return p_event.action.action==E->get().id;
} }
return _find_event(E->get().inputs,p_event)!=NULL; return _find_event(E->get().inputs,p_event,!p_event.is_pressed())!=NULL;
} }
const Map<StringName, InputMap::Action>& InputMap::get_action_map() const { const Map<StringName, InputMap::Action>& InputMap::get_action_map() const {

2
core/input_map.h
View file

@ -46,7 +46,7 @@ private:
mutable Map<StringName, Action> input_map; mutable Map<StringName, Action> input_map;
mutable Map<int,StringName> input_id_map; mutable Map<int,StringName> input_id_map;
List<InputEvent>::Element *_find_event(List<InputEvent> &p_list,const InputEvent& p_event) const; List<InputEvent>::Element *_find_event(List<InputEvent> &p_list,const InputEvent& p_event, bool p_mod_ignore) const;
Array _get_action_list(const StringName& p_action); Array _get_action_list(const StringName& p_action);
Array _get_actions(); Array _get_actions();

2
doc/base/classes.xml
View file

@ -18023,7 +18023,7 @@
<argument index="1" name="action" type="String"> <argument index="1" name="action" type="String">
</argument> </argument>
<description> <description>
Return whether the given event is part of an existing action. Return whether the given event is part of an existing action. This method ignores keyboard modifiers if the given [InputEvent] is not pressed (for proper release detection). See [method action_has_event] if you don't want this behavior.
</description> </description>
</method> </method>
<method name="get_action_from_id" qualifiers="const"> <method name="get_action_from_id" qualifiers="const">

14
main/input_default.cpp
View file

@ -377,13 +377,13 @@ void InputDefault::parse_input_event(const InputEvent& p_event) {
if (InputMap::get_singleton()->event_is_action(p_event,E->key())) { if (InputMap::get_singleton()->event_is_action(p_event,E->key())) {
Action action; if(is_action_pressed(E->key()) != p_event.is_pressed()) {
action.fixed_frame=OS::get_singleton()->get_fixed_frames(); Action action;
action.idle_frame=OS::get_singleton()->get_idle_frames(); action.fixed_frame=OS::get_singleton()->get_fixed_frames();
action.pressed=p_event.is_pressed(); action.idle_frame=OS::get_singleton()->get_idle_frames();
action.pressed=p_event.is_pressed();
action_state[E->key()]=action; action_state[E->key()]=action;
}
} }
} }
} }