Ver Fonte

Merge pull request #61671 from raulsntos/typed-joypads

Add array element type to `get_connected_joypads`
Rémi Verschelde há 3 anos atrás
pai
commit
b34677580c
3 ficheiros alterados com 5 adições e 4 exclusões
  1. 2 2
      core/input/input.cpp
  2. 2 1
      core/input/input.h
  3. 1 1
      doc/classes/Input.xml

+ 2 - 2
core/input/input.cpp

@@ -1401,8 +1401,8 @@ String Input::get_joy_guid(int p_device) const {
 	return joy_names[p_device].uid;
 	return joy_names[p_device].uid;
 }
 }
 
 
-Array Input::get_connected_joypads() {
-	Array ret;
+TypedArray<int> Input::get_connected_joypads() {
+	TypedArray<int> ret;
 	HashMap<int, Joypad>::Iterator elem = joy_names.begin();
 	HashMap<int, Joypad>::Iterator elem = joy_names.begin();
 	while (elem) {
 	while (elem) {
 		if (elem->value.connected) {
 		if (elem->value.connected) {

+ 2 - 1
core/input/input.h

@@ -36,6 +36,7 @@
 #include "core/os/keyboard.h"
 #include "core/os/keyboard.h"
 #include "core/os/thread_safe.h"
 #include "core/os/thread_safe.h"
 #include "core/templates/rb_set.h"
 #include "core/templates/rb_set.h"
+#include "core/variant/typed_array.h"
 
 
 class Input : public Object {
 class Input : public Object {
 	GDCLASS(Input, Object);
 	GDCLASS(Input, Object);
@@ -259,7 +260,7 @@ public:
 
 
 	float get_joy_axis(int p_device, JoyAxis p_axis) const;
 	float get_joy_axis(int p_device, JoyAxis p_axis) const;
 	String get_joy_name(int p_idx);
 	String get_joy_name(int p_idx);
-	Array get_connected_joypads();
+	TypedArray<int> get_connected_joypads();
 	Vector2 get_joy_vibration_strength(int p_device);
 	Vector2 get_joy_vibration_strength(int p_device);
 	float get_joy_vibration_duration(int p_device);
 	float get_joy_vibration_duration(int p_device);
 	uint64_t get_joy_vibration_timestamp(int p_device);
 	uint64_t get_joy_vibration_timestamp(int p_device);

+ 1 - 1
doc/classes/Input.xml

@@ -80,7 +80,7 @@
 			</description>
 			</description>
 		</method>
 		</method>
 		<method name="get_connected_joypads">
 		<method name="get_connected_joypads">
-			<return type="Array" />
+			<return type="int[]" />
 			<description>
 			<description>
 				Returns an [Array] containing the device IDs of all currently connected joypads.
 				Returns an [Array] containing the device IDs of all currently connected joypads.
 			</description>
 			</description>