mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For the JoyCon controller, wrap SDL2Gamepad as SDL2JoyCon to use a suitable layout and correct the motion sensing and joystick orientation.

Browse Source
This commit is contained in:
madwind
2024-12-29 00:55:26 +08:00
parent a837294b11
commit 68c03051ad
3 changed files with 166 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
View File

@@ -152,7 +152,8 @@ namespace Ryujinx.Input.SDL2
private void HandleJoyBatteryUpdated(int joystickDeviceId, SDL_JoystickPowerLevel powerLevel)
{
Logger.Info?.Print(LogClass.Hid, $"{SDL_GameControllerNameForIndex(joystickDeviceId) } power level: {powerLevel}");
Logger.Info?.Print(LogClass.Hid,
$"{SDL_GameControllerNameForIndex(joystickDeviceId)} power level: {powerLevel}");
}
protected virtual void Dispose(bool disposing)
@@ -201,8 +202,17 @@ namespace Ryujinx.Input.SDL2
}
nint gamepadHandle = SDL_GameControllerOpen(joystickIndex);
if (gamepadHandle == nint.Zero)
{
return null;
}
return gamepadHandle == nint.Zero ? null : new SDL2Gamepad(gamepadHandle, id);
if (SDL_GameControllerName(gamepadHandle).StartsWith(SDL2JoyCon.Prefix))
{
return new SDL2JoyCon(gamepadHandle, id);
}
return new SDL2Gamepad(gamepadHandle, id);
}
}
}