diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-20 23:39:53 +0900 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-20 23:39:53 +0900 |
| commit | c5080e23b822766b99cebb18618ff3fa69f16beb (patch) | |
| tree | 5660ba782ad3ce2a44d086a28c99e0d5d88f1a81 | |
| parent | d878b3205aac60f1ff139a2189663638befb557a (diff) | |
| parent | 79af8057107214a385505d3b130c42d8e4a7a875 (diff) | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
| -rw-r--r-- | core/os/input.cpp | 2 | ||||
| -rw-r--r-- | core/variant_op.cpp | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp index a827e75896..5d4b3a834d 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -62,6 +62,8 @@ void Input::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_mouse_mode","mode"),&Input::set_mouse_mode); ObjectTypeDB::bind_method(_MD("get_mouse_mode"),&Input::get_mouse_mode); ObjectTypeDB::bind_method(_MD("warp_mouse_pos","to"),&Input::warp_mouse_pos); + ObjectTypeDB::bind_method(_MD("action_press"),&Input::action_press); + ObjectTypeDB::bind_method(_MD("action_release"),&Input::action_release); BIND_CONSTANT( MOUSE_MODE_VISIBLE ); BIND_CONSTANT( MOUSE_MODE_HIDDEN ); diff --git a/core/variant_op.cpp b/core/variant_op.cpp index ec43b1275c..fbb5e2631d 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -1687,6 +1687,19 @@ void Variant::set(const Variant& p_index, const Variant& p_value, bool *r_valid) return; } } + if (ie.type == InputEvent::ACTION) { + + if (str =="action") { + valid=true; + ie.action.action=p_value; + return; + } + else if (str == "pressed") { + valid=true; + ie.action.pressed=p_value; + return; + } + } } break; case DICTIONARY: { @@ -2365,6 +2378,17 @@ Variant Variant::get(const Variant& p_index, bool *r_valid) const { return Vector2(ie.screen_drag.speed_x,ie.screen_drag.speed_y); } } + if (ie.type == InputEvent::ACTION) { + + if (str =="action") { + valid=true; + return ie.action.action; + } + else if (str == "pressed") { + valid=true; + ie.action.pressed; + } + } } break; case DICTIONARY: { |