asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #61671 from raulsntos/typed-joypads

Browse source 
Add array element type to `get_connected_joypads`
This commit is contained in:
Rémi Verschelde 2022-06-04 00:22:37 +02:00 committed by GitHub
commit b34677580c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/input/input.cpp
View file

@ -1401,8 +1401,8 @@ String Input::get_joy_guid(int p_device) const {
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();
while (elem) {
if (elem->value.connected) {

3
core/input/input.h
View file

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

2
doc/classes/Input.xml
View file

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