From 7599c8141561191de6022ef00232b7ef25986c6b Mon Sep 17 00:00:00 2001 From: Matesic Darko Date: Mon, 7 Feb 2022 08:40:53 +0100 Subject: [PATCH] Rotate 90 degrees clockwise --- .../Controller/JoyconConfigControllerStick.cs | 2 +- Ryujinx.Headless.SDL2/Program.cs | 4 ++-- Ryujinx.Input.SDL2/SDL2Gamepad.cs | 6 +++--- Ryujinx/Ui/Windows/ControllerWindow.cs | 16 ++++++++-------- Ryujinx/Ui/Windows/ControllerWindow.glade | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs b/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs index af76abbd1..869cff4fe 100644 --- a/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs +++ b/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs @@ -5,7 +5,7 @@ public Stick Joystick { get; set; } public bool InvertStickX { get; set; } public bool InvertStickY { get; set; } - public bool SwapSticks { get; set; } + public bool Rotate90CW { get; set; } public Button StickButton { get; set; } } } diff --git a/Ryujinx.Headless.SDL2/Program.cs b/Ryujinx.Headless.SDL2/Program.cs index a865386fe..550daceec 100644 --- a/Ryujinx.Headless.SDL2/Program.cs +++ b/Ryujinx.Headless.SDL2/Program.cs @@ -220,7 +220,7 @@ namespace Ryujinx.Headless.SDL2 StickButton = ConfigGamepadInputId.LeftStick, InvertStickX = false, InvertStickY = false, - SwapSticks = false, + Rotate90CW = false, }, RightJoycon = new RightJoyconCommonConfig @@ -242,7 +242,7 @@ namespace Ryujinx.Headless.SDL2 StickButton = ConfigGamepadInputId.RightStick, InvertStickX = false, InvertStickY = false, - SwapSticks = false, + Rotate90CW = false, }, Motion = new StandardMotionConfigController diff --git a/Ryujinx.Input.SDL2/SDL2Gamepad.cs b/Ryujinx.Input.SDL2/SDL2Gamepad.cs index e9f7c9688..eec4e07e5 100644 --- a/Ryujinx.Input.SDL2/SDL2Gamepad.cs +++ b/Ryujinx.Input.SDL2/SDL2Gamepad.cs @@ -351,12 +351,12 @@ namespace Ryujinx.Input.SDL2 resultY = -resultY; } - if ((inputId == StickInputId.Left && _configuration.LeftJoyconStick.SwapSticks) || - (inputId == StickInputId.Right && _configuration.RightJoyconStick.SwapSticks)) + if ((inputId == StickInputId.Left && _configuration.LeftJoyconStick.Rotate90CW) || + (inputId == StickInputId.Right && _configuration.RightJoyconStick.Rotate90CW)) { float temp = resultX; resultX = resultY; - resultY = temp; + resultY = -temp; } } diff --git a/Ryujinx/Ui/Windows/ControllerWindow.cs b/Ryujinx/Ui/Windows/ControllerWindow.cs index beec0136d..c328fa5c7 100644 --- a/Ryujinx/Ui/Windows/ControllerWindow.cs +++ b/Ryujinx/Ui/Windows/ControllerWindow.cs @@ -73,7 +73,7 @@ namespace Ryujinx.Ui.Windows [GUI] ToggleButton _lStick; [GUI] CheckButton _invertLStickX; [GUI] CheckButton _invertLStickY; - [GUI] CheckButton _swapLSticks; + [GUI] CheckButton _rotateL90CW; [GUI] ToggleButton _lStickUp; [GUI] ToggleButton _lStickDown; [GUI] ToggleButton _lStickLeft; @@ -89,7 +89,7 @@ namespace Ryujinx.Ui.Windows [GUI] ToggleButton _rStick; [GUI] CheckButton _invertRStickX; [GUI] CheckButton _invertRStickY; - [GUI] CheckButton _swapRSticks; + [GUI] CheckButton _rotateR90CW; [GUI] ToggleButton _rStickUp; [GUI] ToggleButton _rStickDown; [GUI] ToggleButton _rStickLeft; @@ -492,7 +492,7 @@ namespace Ryujinx.Ui.Windows _lStick.Label = controllerConfig.LeftJoyconStick.Joystick.ToString(); _invertLStickX.Active = controllerConfig.LeftJoyconStick.InvertStickX; _invertLStickY.Active = controllerConfig.LeftJoyconStick.InvertStickY; - _swapLSticks.Active = controllerConfig.LeftJoyconStick.SwapSticks; + _rotateL90CW.Active = controllerConfig.LeftJoyconStick.Rotate90CW; _lStickButton.Label = controllerConfig.LeftJoyconStick.StickButton.ToString(); _dpadUp.Label = controllerConfig.LeftJoycon.DpadUp.ToString(); _dpadDown.Label = controllerConfig.LeftJoycon.DpadDown.ToString(); @@ -506,7 +506,7 @@ namespace Ryujinx.Ui.Windows _rStick.Label = controllerConfig.RightJoyconStick.Joystick.ToString(); _invertRStickX.Active = controllerConfig.RightJoyconStick.InvertStickX; _invertRStickY.Active = controllerConfig.RightJoyconStick.InvertStickY; - _swapRSticks.Active = controllerConfig.RightJoyconStick.SwapSticks; + _rotateR90CW.Active = controllerConfig.RightJoyconStick.Rotate90CW; _rStickButton.Label = controllerConfig.RightJoyconStick.StickButton.ToString(); _a.Label = controllerConfig.RightJoycon.ButtonA.ToString(); _b.Label = controllerConfig.RightJoycon.ButtonB.ToString(); @@ -722,7 +722,7 @@ namespace Ryujinx.Ui.Windows Joystick = lStick, InvertStickY = _invertLStickY.Active, StickButton = lStickButton, - SwapSticks = _swapLSticks.Active, + Rotate90CW = _rotateL90CW.Active, }, RightJoycon = new RightJoyconCommonConfig { @@ -742,7 +742,7 @@ namespace Ryujinx.Ui.Windows Joystick = rStick, InvertStickY = _invertRStickY.Active, StickButton = rStickButton, - SwapSticks = _swapRSticks.Active, + Rotate90CW = _rotateR90CW.Active, }, Motion = motionConfig, Rumble = new RumbleConfigController @@ -1062,7 +1062,7 @@ namespace Ryujinx.Ui.Windows StickButton = ConfigGamepadInputId.LeftStick, InvertStickX = false, InvertStickY = false, - SwapSticks = false, + Rotate90CW = false, }, RightJoycon = new RightJoyconCommonConfig @@ -1084,7 +1084,7 @@ namespace Ryujinx.Ui.Windows StickButton = ConfigGamepadInputId.RightStick, InvertStickX = false, InvertStickY = false, - SwapSticks = false, + Rotate90CW = false, }, Motion = new StandardMotionConfigController diff --git a/Ryujinx/Ui/Windows/ControllerWindow.glade b/Ryujinx/Ui/Windows/ControllerWindow.glade index 819fa4aa3..e433f5cc4 100644 --- a/Ryujinx/Ui/Windows/ControllerWindow.glade +++ b/Ryujinx/Ui/Windows/ControllerWindow.glade @@ -741,8 +741,8 @@ - - Swap Sticks + + Rotate 90° Clockwise True True False @@ -1711,8 +1711,8 @@ - - Swap Sticks + + Rotate 90° Clockwise True True False