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

Swap Nintendo face buttons on macOS

Browse Source
This commit is contained in:
Grublady
2025-03-05 16:10:33 -05:00
parent 134da37497
commit cdcee78fcb
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/apple/joypad_apple.h
View File

@@ -43,6 +43,7 @@ struct GameController {
RumbleContext *rumble_context API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) = nil; RumbleContext *rumble_context API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) = nil;
NSInteger ff_effect_timestamp = 0; NSInteger ff_effect_timestamp = 0;
bool force_feedback = false; bool force_feedback = false;
bool nintendo_button_layout = false;
GameController(int p_joy_id, GCController *p_controller); GameController(int p_joy_id, GCController *p_controller);
~GameController(); ~GameController();

22
drivers/apple/joypad_apple.mm
View File

@@ -144,6 +144,12 @@ GameController::GameController(int p_joy_id, GCController *p_controller) :
} }
} }
if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
if ([controller.productCategory isEqualToString:@"Switch Pro Controller"] || [controller.productCategory isEqualToString:@"Nintendo Switch Joy-Con (L/R)"]) {
nintendo_button_layout = true;
}
}
int l_joy_id = joy_id; int l_joy_id = joy_id;
auto BUTTON = [l_joy_id](JoyButton p_button) { auto BUTTON = [l_joy_id](JoyButton p_button) {
@@ -155,10 +161,18 @@ GameController::GameController(int p_joy_id, GCController *p_controller) :
if (controller.extendedGamepad != nil) { if (controller.extendedGamepad != nil) {
GCExtendedGamepad *gamepad = controller.extendedGamepad; GCExtendedGamepad *gamepad = controller.extendedGamepad;
gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::A); if (nintendo_button_layout) {
gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::B); gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::B);
gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::X); gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::A);
gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::Y); gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::Y);
gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::X);
} else {
gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::B);
gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::X);
gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
}
gamepad.leftShoulder.pressedChangedHandler = BUTTON(JoyButton::LEFT_SHOULDER); gamepad.leftShoulder.pressedChangedHandler = BUTTON(JoyButton::LEFT_SHOULDER);
gamepad.rightShoulder.pressedChangedHandler = BUTTON(JoyButton::RIGHT_SHOULDER); gamepad.rightShoulder.pressedChangedHandler = BUTTON(JoyButton::RIGHT_SHOULDER);
gamepad.dpad.up.pressedChangedHandler = BUTTON(JoyButton::DPAD_UP); gamepad.dpad.up.pressedChangedHandler = BUTTON(JoyButton::DPAD_UP);