diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-18 00:52:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 00:52:15 +0200 |
| commit | 8de5aedb9ef7d4c17027b41b40677d1892f4158c (patch) | |
| tree | 88f3cf2753bc2f2033ed5e80eae43058dea63fa5 /core | |
| parent | 3183834c5d5dd27e1be4f581c0fe1a8bef3c4a6e (diff) | |
| parent | 370ae3512deda40b2659a1192f302298e269305f (diff) | |
Merge pull request #5718 from jay3d/master
Added gyroscope support to Godot and Android
Diffstat (limited to 'core')
| -rw-r--r-- | core/os/input.cpp | 1 | ||||
| -rw-r--r-- | core/os/input.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp index efbae57950..531db73838 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -66,6 +66,7 @@ void Input::_bind_methods() { ObjectTypeDB::bind_method(_MD("stop_joy_vibration", "device"), &Input::stop_joy_vibration); ObjectTypeDB::bind_method(_MD("get_accelerometer"),&Input::get_accelerometer); ObjectTypeDB::bind_method(_MD("get_magnetometer"),&Input::get_magnetometer); + ObjectTypeDB::bind_method(_MD("get_gyroscope"),&Input::get_gyroscope); //ObjectTypeDB::bind_method(_MD("get_mouse_pos"),&Input::get_mouse_pos); - this is not the function you want ObjectTypeDB::bind_method(_MD("get_mouse_speed"),&Input::get_mouse_speed); ObjectTypeDB::bind_method(_MD("get_mouse_button_mask"),&Input::get_mouse_button_mask); diff --git a/core/os/input.h b/core/os/input.h index d11703470b..16bcc0ff9a 100644 --- a/core/os/input.h +++ b/core/os/input.h @@ -82,6 +82,7 @@ public: virtual Vector3 get_accelerometer()=0; virtual Vector3 get_magnetometer()=0; + virtual Vector3 get_gyroscope()=0; virtual void action_press(const StringName& p_action)=0; virtual void action_release(const StringName& p_action)=0; |