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

Merge pull request #2168 from KillerJaguar/input-helper 

Added helper methods to InputEvent
This commit is contained in:
Juan Linietsky 2015-06-23 20:59:46 -03:00
parent 26a710b4b8 e6fb0cf970
commit 199ad16bbc
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/os/input_event.cpp
View File

@ -173,6 +173,16 @@ bool InputEvent::is_action(const String& p_action) const {
return InputMap::get_singleton()->event_is_action(*this,p_action); return InputMap::get_singleton()->event_is_action(*this,p_action);
} }
bool InputEvent::is_action_pressed(const String& p_action) const {
return is_action(p_action) && is_pressed() && !is_echo();
}
bool InputEvent::is_action_released(const String& p_action) const {
return is_action(p_action) && !is_pressed();
}
uint32_t InputEventKey::get_scancode_with_modifiers() const { uint32_t InputEventKey::get_scancode_with_modifiers() const {
uint32_t sc=scancode; uint32_t sc=scancode;

2
core/os/input_event.h
View File

@ -287,6 +287,8 @@ struct InputEvent {
bool is_pressed() const; bool is_pressed() const;
bool is_action(const String& p_action) const; bool is_action(const String& p_action) const;
bool is_action_pressed(const String& p_action) const;
bool is_action_released(const String& p_action) const;
bool is_echo() const; bool is_echo() const;
void set_as_action(const String& p_action, bool p_pressed); void set_as_action(const String& p_action, bool p_pressed);

4
core/variant_call.cpp
View File

@ -715,6 +715,8 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
VCALL_PTR0R( InputEvent, is_pressed ); VCALL_PTR0R( InputEvent, is_pressed );
VCALL_PTR1R( InputEvent, is_action ); VCALL_PTR1R( InputEvent, is_action );
VCALL_PTR1R( InputEvent, is_action_pressed );
VCALL_PTR1R( InputEvent, is_action_released );
VCALL_PTR0R( InputEvent, is_echo ); VCALL_PTR0R( InputEvent, is_echo );
VCALL_PTR2( InputEvent, set_as_action ); VCALL_PTR2( InputEvent, set_as_action );
@ -1540,6 +1542,8 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_pressed,varray()); ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_pressed,varray());
ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action,STRING,"action",varray()); ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action,STRING,"action",varray());
ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"is_action_pressed",varray());
ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"is_action_released",varray());
ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_echo,varray()); ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_echo,varray());
ADDFUNC2(INPUT_EVENT,NIL,InputEvent,set_as_action,STRING,"action",BOOL,"pressed",varray()); ADDFUNC2(INPUT_EVENT,NIL,InputEvent,set_as_action,STRING,"action",BOOL,"pressed",varray());