MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

update

Browse Source
This commit is contained in:
madwind 2025-01-16 21:35:46 +08:00
parent cfbe22e9b8
commit 6e7c787cb4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ryujinx.Input.SDL3/SDL3JoyCon.cs
View File

@ -49,7 +49,7 @@ namespace Ryujinx.Input.SDL3
{ GamepadButtonInputId.SingleLeftTrigger1, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_SHOULDER } { GamepadButtonInputId.SingleLeftTrigger1, SDL_GamepadButton.SDL_GAMEPAD_BUTTON_LEFT_SHOULDER }
}; };
private static SDL_GamepadButton[] _buttonsDriverMapping; private readonly SDL_GamepadButton[] _buttonsDriverMapping;
private readonly Lock _userMappingLock = new(); private readonly Lock _userMappingLock = new();
private readonly List<ButtonMappingEntry> _buttonsUserMapping; private readonly List<ButtonMappingEntry> _buttonsUserMapping;
@ -91,6 +91,7 @@ namespace Ryujinx.Input.SDL3
} }
_gamepadType = SDL_GetGamepadType(_gamepadHandle); _gamepadType = SDL_GetGamepadType(_gamepadHandle);
_buttonsDriverMapping = _gamepadType switch _buttonsDriverMapping = _gamepadType switch
{ {
SDL_GamepadType.SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_LEFT => ToSDLButtonMapping( SDL_GamepadType.SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_LEFT => ToSDLButtonMapping(
@ -102,11 +103,11 @@ namespace Ryujinx.Input.SDL3
} }
private static SDL_GamepadButton[] ToSDLButtonMapping( private static SDL_GamepadButton[] ToSDLButtonMapping(
Dictionary<GamepadButtonInputId, SDL_GamepadButton> buttonsDriverMapping) Dictionary<GamepadButtonInputId, SDL_GamepadButton> buttonsDriverDict)
{ {
return Enumerable.Range(0, (int)GamepadButtonInputId.Count) return Enumerable.Range(0, (int)GamepadButtonInputId.Count)
.Select(i => .Select(i =>
buttonsDriverMapping.GetValueOrDefault((GamepadButtonInputId)i, buttonsDriverDict.GetValueOrDefault((GamepadButtonInputId)i,
SDL_GamepadButton.SDL_GAMEPAD_BUTTON_INVALID)) SDL_GamepadButton.SDL_GAMEPAD_BUTTON_INVALID))
.ToArray(); .ToArray();
} }
@ -403,6 +404,11 @@ namespace Ryujinx.Input.SDL3
{ {
return false; return false;
} }
if (SDL_GetGamepadButton(_gamepadHandle, button))
{
Console.WriteLine(_gamepadType+": " + button+" => "+inputId);
}
return SDL_GetGamepadButton(_gamepadHandle, button); return SDL_GetGamepadButton(_gamepadHandle, button);
} }