summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorDavide Baldo <davide@baldo.me>2018-11-09 21:32:32 +0000
committerDavide Baldo <davide@baldo.me>2018-11-10 10:25:59 +0000
commit1b0c7515ffe2bbb0cb8cb08bf9d21f68d4648d89 (patch)
treec82f93bdf88d04c41b9e6465d2f6c2c56eb50414 /core
parenta16d9c6ab68cadb3cff07ef8b7b8c00717e98922 (diff)
Allow to specify a custom strength when calling Input.action_press(), this allows virtual axis, mainly for mobile.
Diffstat (limited to 'core')
-rw-r--r--core/os/input.cpp2
-rw-r--r--core/os/input.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp
index 4cd1f0b24a..1a24258a10 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -86,7 +86,7 @@ void Input::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_mouse_mode", "mode"), &Input::set_mouse_mode);
ClassDB::bind_method(D_METHOD("get_mouse_mode"), &Input::get_mouse_mode);
ClassDB::bind_method(D_METHOD("warp_mouse_position", "to"), &Input::warp_mouse_position);
- ClassDB::bind_method(D_METHOD("action_press", "action"), &Input::action_press);
+ ClassDB::bind_method(D_METHOD("action_press", "action", "strength"), &Input::action_press);
ClassDB::bind_method(D_METHOD("action_release", "action"), &Input::action_release);
ClassDB::bind_method(D_METHOD("set_default_cursor_shape", "shape"), &Input::set_default_cursor_shape, DEFVAL(CURSOR_ARROW));
ClassDB::bind_method(D_METHOD("set_custom_mouse_cursor", "image", "shape", "hotspot"), &Input::set_custom_mouse_cursor, DEFVAL(CURSOR_ARROW), DEFVAL(Vector2()));
diff --git a/core/os/input.h b/core/os/input.h
index db523d6789..dc2c213db2 100644
--- a/core/os/input.h
+++ b/core/os/input.h
@@ -113,7 +113,7 @@ public:
virtual Vector3 get_magnetometer() const = 0;
virtual Vector3 get_gyroscope() const = 0;
- virtual void action_press(const StringName &p_action) = 0;
+ virtual void action_press(const StringName &p_action, float p_strength = 1.f) = 0;
virtual void action_release(const StringName &p_action) = 0;
void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const;