summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndreas Haas <liu.gam3@gmail.com>2016-07-05 14:07:46 +0200
committerAndreas Haas <liu.gam3@gmail.com>2016-07-05 14:08:02 +0200
commit45cfd199a46a6fdffb48cd367c69a336eb79590b (patch)
treea629154177841054cf8465180d5312e1a7461a37 /core
parent716dfa67a3c5a0a38205179c01676e05a718d244 (diff)
downloadredot-engine-45cfd199a46a6fdffb48cd367c69a336eb79590b.tar.gz
Input: add get_connected_joysticks() method.
fixes #5465
Diffstat (limited to 'core')
-rw-r--r--core/os/input.cpp1
-rw-r--r--core/os/input.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp
index dacddc0928..efbae57950 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -59,6 +59,7 @@ void Input::_bind_methods() {
ObjectTypeDB::bind_method(_MD("get_joy_axis","device","axis"),&Input::get_joy_axis);
ObjectTypeDB::bind_method(_MD("get_joy_name","device"),&Input::get_joy_name);
ObjectTypeDB::bind_method(_MD("get_joy_guid","device"),&Input::get_joy_guid);
+ ObjectTypeDB::bind_method(_MD("get_connected_joysticks"),&Input::get_connected_joysticks);
ObjectTypeDB::bind_method(_MD("get_joy_vibration_strength", "device"), &Input::get_joy_vibration_strength);
ObjectTypeDB::bind_method(_MD("get_joy_vibration_duration", "device"), &Input::get_joy_vibration_duration);
ObjectTypeDB::bind_method(_MD("start_joy_vibration", "device", "weak_magnitude", "strong_magnitude", "duration"), &Input::start_joy_vibration, DEFVAL(0));
diff --git a/core/os/input.h b/core/os/input.h
index fa2cef5467..d11703470b 100644
--- a/core/os/input.h
+++ b/core/os/input.h
@@ -62,6 +62,7 @@ public:
virtual float get_joy_axis(int p_device,int p_axis)=0;
virtual String get_joy_name(int p_idx)=0;
+ virtual Array get_connected_joysticks()=0;
virtual void joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid)=0;
virtual void add_joy_mapping(String p_mapping, bool p_update_existing=false)=0;
virtual void remove_joy_mapping(String p_guid)=0;