seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21954 from isaacremnant/fix_inputs

Browse Source 
Fix is_action_pressed for InputEventActions
This commit is contained in:
Rémi Verschelde
2018-09-14 18:06:11 +02:00
committed by GitHub
parent e099fea259 bf16f89a30
commit c9df3fbfdb
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/os/input_event.cpp
View File

@ -962,6 +962,22 @@ bool InputEventAction::is_action(const StringName &p_action) const {
return action == p_action;
}
bool InputEventAction::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const {
Ref<InputEventAction> act = p_event;
if (act.is_null())
return false;
bool match = action == act->action;
if (match) {
if (p_pressed != NULL)
*p_pressed = act->pressed;
if (p_strength != NULL)
*p_strength = (*p_pressed) ? 1.0f : 0.0f;
}
return match;
}
String InputEventAction::as_text() const {
return "InputEventAction : action=" + action + ", pressed=(" + (pressed ? "true" : "false");