godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Add joystick button index boundary check. Increase max. button number to 128 (max. buttons supported by DirectInput).

Browse Source
This commit is contained in:
bruvzg
2022-01-10 13:43:44 +02:00
parent 5f7bbf4d33
commit 61ea8f8337
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/input/input.cpp
View File

@@ -892,7 +892,8 @@ void Input::set_event_dispatch_function(EventDispatchFunc p_function) {
void Input::joy_button(int p_device, JoyButton p_button, bool p_pressed) { void Input::joy_button(int p_device, JoyButton p_button, bool p_pressed) {
_THREAD_SAFE_METHOD_; _THREAD_SAFE_METHOD_;
Joypad &joy = joy_names[p_device]; Joypad &joy = joy_names[p_device];
//printf("got button %i, mapping is %i\n", p_button, joy.mapping); ERR_FAIL_INDEX((int)p_button, (int)JoyButton::MAX);
if (joy.last_buttons[(size_t)p_button] == p_pressed) { if (joy.last_buttons[(size_t)p_button] == p_pressed) {
return; return;
} }

2
core/input/input_enums.h
View File

@@ -83,7 +83,7 @@ enum class JoyButton {
PADDLE4 = 19, PADDLE4 = 19,
TOUCHPAD = 20, TOUCHPAD = 20,
SDL_MAX = 21, SDL_MAX = 21,
MAX = 36, // Android supports up to 36 buttons. MAX = 128, // Android supports up to 36 buttons. DirectInput supports up to 128 buttons.
}; };
enum class MIDIMessage { enum class MIDIMessage {

7
doc/classes/@GlobalScope.xml
View File

@@ -2134,8 +2134,11 @@
<constant name="JOY_BUTTON_SDL_MAX" value="21" enum="JoyButton"> <constant name="JOY_BUTTON_SDL_MAX" value="21" enum="JoyButton">
The number of SDL game controller buttons. The number of SDL game controller buttons.
</constant> </constant>
<constant name="JOY_BUTTON_MAX" value="36" enum="JoyButton"> <constant name="JOY_BUTTON_MAX" value="128" enum="JoyButton">
The maximum number of game controller buttons: Android supports up to 36 buttons. The maximum number of game controller buttons supported by the engine. The actual limit may be lower on specific platforms:
- Android: Up to 36 buttons.
- Linux: Up to 80 buttons.
- Windows and macOS: Up to 128 buttons.
</constant> </constant>
<constant name="JOY_AXIS_INVALID" value="-1" enum="JoyAxis"> <constant name="JOY_AXIS_INVALID" value="-1" enum="JoyAxis">
An invalid game controller axis. An invalid game controller axis.