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

misc: chore: Use collection expressions in Input projects

Browse Source
This commit is contained in:
Evan Husted
2025-01-26 15:43:58 -06:00
parent 9f3eac7f26
commit 45125c16cf
6 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Ryujinx.Input/HLE/NpadController.cs
View File

@@ -27,7 +27,8 @@ namespace Ryujinx.Input.HLE
}
}
private static readonly HLEButtonMappingEntry[] _hleButtonMapping = {
private static readonly HLEButtonMappingEntry[] _hleButtonMapping =
[
new(GamepadButtonInputId.A, ControllerKeys.A),
new(GamepadButtonInputId.B, ControllerKeys.B),
new(GamepadButtonInputId.X, ControllerKeys.X),
@@ -48,8 +49,8 @@ namespace Ryujinx.Input.HLE
new(GamepadButtonInputId.SingleLeftTrigger0, ControllerKeys.SlLeft),
new(GamepadButtonInputId.SingleRightTrigger0, ControllerKeys.SrLeft),
new(GamepadButtonInputId.SingleLeftTrigger1, ControllerKeys.SlRight),
new(GamepadButtonInputId.SingleRightTrigger1, ControllerKeys.SrRight),
};
new(GamepadButtonInputId.SingleRightTrigger1, ControllerKeys.SrRight)
];
private class HLEKeyboardMappingEntry
{
@@ -63,7 +64,8 @@ namespace Ryujinx.Input.HLE
}
}
private static readonly HLEKeyboardMappingEntry[] _keyMapping = {
private static readonly HLEKeyboardMappingEntry[] _keyMapping =
[
new(Key.A, 0x4),
new(Key.B, 0x5),
new(Key.C, 0x6),
@@ -186,10 +188,11 @@ namespace Ryujinx.Input.HLE
new(Key.ControlRight, 0xE4),
new(Key.ShiftRight, 0xE5),
new(Key.AltRight, 0xE6),
new(Key.WinRight, 0xE7),
};
new(Key.WinRight, 0xE7)
];
private static readonly HLEKeyboardMappingEntry[] _keyModifierMapping = {
private static readonly HLEKeyboardMappingEntry[] _keyModifierMapping =
[
new(Key.ControlLeft, 0),
new(Key.ShiftLeft, 1),
new(Key.AltLeft, 2),
@@ -200,8 +203,8 @@ namespace Ryujinx.Input.HLE
new(Key.WinRight, 7),
new(Key.CapsLock, 8),
new(Key.ScrollLock, 9),
new(Key.NumLock, 10),
};
new(Key.NumLock, 10)
];
private MotionInput _leftMotionInput;
private MotionInput _rightMotionInput;

8
src/Ryujinx.Input/HLE/NpadManager.cs
View File

@@ -46,7 +46,7 @@ namespace Ryujinx.Input.HLE
_keyboardDriver = keyboardDriver;
_gamepadDriver = gamepadDriver;
_mouseDriver = mouseDriver;
_inputConfig = new List<InputConfig>();
_inputConfig = [];
_gamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
_gamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
@@ -56,7 +56,7 @@ namespace Ryujinx.Input.HLE
{
lock (_lock)
{
List<InputConfig> validInputs = new();
List<InputConfig> validInputs = [];
foreach (InputConfig inputConfigEntry in _inputConfig)
{
if (_controllers[(int)inputConfigEntry.PlayerIndex] != null)
@@ -124,7 +124,7 @@ namespace Ryujinx.Input.HLE
{
NpadController[] oldControllers = _controllers.ToArray();
List<InputConfig> validInputs = new();
List<InputConfig> validInputs = [];
foreach (InputConfig inputConfigEntry in inputConfig)
{
@@ -205,7 +205,7 @@ namespace Ryujinx.Input.HLE
{
lock (_lock)
{
List<GamepadInput> hleInputStates = new();
List<GamepadInput> hleInputStates = [];
List<SixAxisInput> hleMotionStates = new(NpadDevices.MaxControllers);
KeyboardInput? hleKeyboardInput = null;