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

[macOS/iOS] Ensure only one axis change event is produced during single process_joypads() call.

Browse Source 
(cherry picked from commit a797c7b8e2)
This commit is contained in:
Pāvels Nadtočajevs
2025-03-18 14:58:14 +02:00
committed by Rémi Verschelde
parent eb2cb96dee
commit aede60bdc7
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/apple/joypad_apple.h
View File

@@ -29,6 +29,7 @@
/**************************************************************************/ /**************************************************************************/
#include "core/input/input.h" #include "core/input/input.h"
#include "core/input/input_enums.h"
#define Key _QKey #define Key _QKey
#import <GameController/GameController.h> #import <GameController/GameController.h>
@@ -45,6 +46,9 @@ struct GameController {
bool force_feedback = false; bool force_feedback = false;
bool nintendo_button_layout = false; bool nintendo_button_layout = false;
bool axis_changed[(int)JoyAxis::MAX];
double axis_value[(int)JoyAxis::MAX];
GameController(int p_joy_id, GCController *p_controller); GameController(int p_joy_id, GCController *p_controller);
~GameController(); ~GameController();
}; };

42
drivers/apple/joypad_apple.mm
View File

@@ -134,6 +134,11 @@ public:
GameController::GameController(int p_joy_id, GCController *p_controller) : GameController::GameController(int p_joy_id, GCController *p_controller) :
joy_id(p_joy_id), controller(p_controller) { joy_id(p_joy_id), controller(p_controller) {
force_feedback = NO; force_feedback = NO;
for (int i = 0; i < (int)JoyAxis::MAX; i++) {
axis_changed[i] = false;
axis_value[i] = 0.0;
}
if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) { if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
if (controller.haptics != nil) { if (controller.haptics != nil) {
// Create a rumble context for the controller. // Create a rumble context for the controller.
@@ -181,19 +186,37 @@ GameController::GameController(int p_joy_id, GCController *p_controller) :
gamepad.dpad.right.pressedChangedHandler = BUTTON(JoyButton::DPAD_RIGHT); gamepad.dpad.right.pressedChangedHandler = BUTTON(JoyButton::DPAD_RIGHT);
gamepad.leftThumbstick.valueChangedHandler = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) { gamepad.leftThumbstick.valueChangedHandler = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) {
Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::LEFT_X, xValue); if (axis_value[(int)JoyAxis::LEFT_X] != xValue) {
Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::LEFT_Y, -yValue); axis_changed[(int)JoyAxis::LEFT_X] = true;
axis_value[(int)JoyAxis::LEFT_X] = xValue;
}
if (axis_value[(int)JoyAxis::LEFT_Y] != -yValue) {
axis_changed[(int)JoyAxis::LEFT_Y] = true;
axis_value[(int)JoyAxis::LEFT_Y] = -yValue;
}
}; };
gamepad.rightThumbstick.valueChangedHandler = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) { gamepad.rightThumbstick.valueChangedHandler = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) {
Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::RIGHT_X, xValue); if (axis_value[(int)JoyAxis::RIGHT_X] != xValue) {
Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::RIGHT_Y, -yValue); axis_changed[(int)JoyAxis::RIGHT_X] = true;
axis_value[(int)JoyAxis::RIGHT_X] = xValue;
}
if (axis_value[(int)JoyAxis::RIGHT_Y] != -yValue) {
axis_changed[(int)JoyAxis::RIGHT_Y] = true;
axis_value[(int)JoyAxis::RIGHT_Y] = -yValue;
}
}; };
gamepad.leftTrigger.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { gamepad.leftTrigger.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::TRIGGER_LEFT, value); if (axis_value[(int)JoyAxis::TRIGGER_LEFT] != value) {
axis_changed[(int)JoyAxis::TRIGGER_LEFT] = true;
axis_value[(int)JoyAxis::TRIGGER_LEFT] = value;
}
}; };
gamepad.rightTrigger.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) { gamepad.rightTrigger.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::TRIGGER_RIGHT, value); if (axis_value[(int)JoyAxis::TRIGGER_RIGHT] != value) {
axis_changed[(int)JoyAxis::TRIGGER_RIGHT] = true;
axis_value[(int)JoyAxis::TRIGGER_RIGHT] = value;
}
}; };
if (@available(macOS 10.14.1, iOS 12.1, tvOS 12.1, *)) { if (@available(macOS 10.14.1, iOS 12.1, tvOS 12.1, *)) {
@@ -418,6 +441,13 @@ void JoypadApple::process_joypads() {
int id = E.key; int id = E.key;
GameController &joypad = *E.value; GameController &joypad = *E.value;
for (int i = 0; i < (int)JoyAxis::MAX; i++) {
if (joypad.axis_changed[i]) {
joypad.axis_changed[i] = false;
Input::get_singleton()->joy_axis(id, (JoyAxis)i, joypad.axis_value[i]);
}
}
if (joypad.force_feedback) { if (joypad.force_feedback) {
Input *input = Input::get_singleton(); Input *input = Input::get_singleton();
uint64_t timestamp = input->get_joy_vibration_timestamp(id); uint64_t timestamp = input->get_joy_vibration_timestamp(id);