manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-14 20:50:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rotate 90 degrees clockwise

Browse source
This commit is contained in:
Matesic Darko 2022-02-07 08:40:53 +01:00
parent 00c51c67f9
commit 7599c81415
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs
View file

@ -5,7 +5,7 @@
public Stick Joystick { get; set; } public Stick Joystick { get; set; }
public bool InvertStickX { get; set; } public bool InvertStickX { get; set; }
public bool InvertStickY { get; set; } public bool InvertStickY { get; set; }
public bool SwapSticks { get; set; } public bool Rotate90CW { get; set; }
public Button StickButton { get; set; } public Button StickButton { get; set; }
} }
} }

4
Ryujinx.Headless.SDL2/Program.cs
View file

@ -220,7 +220,7 @@ namespace Ryujinx.Headless.SDL2
StickButton = ConfigGamepadInputId.LeftStick, StickButton = ConfigGamepadInputId.LeftStick,
InvertStickX = false, InvertStickX = false,
InvertStickY = false, InvertStickY = false,
SwapSticks = false, Rotate90CW = false,
}, },
RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId> RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId>
@ -242,7 +242,7 @@ namespace Ryujinx.Headless.SDL2
StickButton = ConfigGamepadInputId.RightStick, StickButton = ConfigGamepadInputId.RightStick,
InvertStickX = false, InvertStickX = false,
InvertStickY = false, InvertStickY = false,
SwapSticks = false, Rotate90CW = false,
}, },
Motion = new StandardMotionConfigController Motion = new StandardMotionConfigController

6
Ryujinx.Input.SDL2/SDL2Gamepad.cs
View file

@ -351,12 +351,12 @@ namespace Ryujinx.Input.SDL2
resultY = -resultY; resultY = -resultY;
} }
if ((inputId == StickInputId.Left && _configuration.LeftJoyconStick.SwapSticks) || if ((inputId == StickInputId.Left && _configuration.LeftJoyconStick.Rotate90CW) ||
(inputId == StickInputId.Right && _configuration.RightJoyconStick.SwapSticks)) (inputId == StickInputId.Right && _configuration.RightJoyconStick.Rotate90CW))
{ {
float temp = resultX; float temp = resultX;
resultX = resultY; resultX = resultY;
resultY = temp; resultY = -temp;
} }
} }

16
Ryujinx/Ui/Windows/ControllerWindow.cs
View file

@ -73,7 +73,7 @@ namespace Ryujinx.Ui.Windows
[GUI] ToggleButton _lStick; [GUI] ToggleButton _lStick;
[GUI] CheckButton _invertLStickX; [GUI] CheckButton _invertLStickX;
[GUI] CheckButton _invertLStickY; [GUI] CheckButton _invertLStickY;
[GUI] CheckButton _swapLSticks; [GUI] CheckButton _rotateL90CW;
[GUI] ToggleButton _lStickUp; [GUI] ToggleButton _lStickUp;
[GUI] ToggleButton _lStickDown; [GUI] ToggleButton _lStickDown;
[GUI] ToggleButton _lStickLeft; [GUI] ToggleButton _lStickLeft;
@ -89,7 +89,7 @@ namespace Ryujinx.Ui.Windows
[GUI] ToggleButton _rStick; [GUI] ToggleButton _rStick;
[GUI] CheckButton _invertRStickX; [GUI] CheckButton _invertRStickX;
[GUI] CheckButton _invertRStickY; [GUI] CheckButton _invertRStickY;
[GUI] CheckButton _swapRSticks; [GUI] CheckButton _rotateR90CW;
[GUI] ToggleButton _rStickUp; [GUI] ToggleButton _rStickUp;
[GUI] ToggleButton _rStickDown; [GUI] ToggleButton _rStickDown;
[GUI] ToggleButton _rStickLeft; [GUI] ToggleButton _rStickLeft;
@ -492,7 +492,7 @@ namespace Ryujinx.Ui.Windows
_lStick.Label = controllerConfig.LeftJoyconStick.Joystick.ToString(); _lStick.Label = controllerConfig.LeftJoyconStick.Joystick.ToString();
_invertLStickX.Active = controllerConfig.LeftJoyconStick.InvertStickX; _invertLStickX.Active = controllerConfig.LeftJoyconStick.InvertStickX;
_invertLStickY.Active = controllerConfig.LeftJoyconStick.InvertStickY; _invertLStickY.Active = controllerConfig.LeftJoyconStick.InvertStickY;
_swapLSticks.Active = controllerConfig.LeftJoyconStick.SwapSticks; _rotateL90CW.Active = controllerConfig.LeftJoyconStick.Rotate90CW;
_lStickButton.Label = controllerConfig.LeftJoyconStick.StickButton.ToString(); _lStickButton.Label = controllerConfig.LeftJoyconStick.StickButton.ToString();
_dpadUp.Label = controllerConfig.LeftJoycon.DpadUp.ToString(); _dpadUp.Label = controllerConfig.LeftJoycon.DpadUp.ToString();
_dpadDown.Label = controllerConfig.LeftJoycon.DpadDown.ToString(); _dpadDown.Label = controllerConfig.LeftJoycon.DpadDown.ToString();
@ -506,7 +506,7 @@ namespace Ryujinx.Ui.Windows
_rStick.Label = controllerConfig.RightJoyconStick.Joystick.ToString(); _rStick.Label = controllerConfig.RightJoyconStick.Joystick.ToString();
_invertRStickX.Active = controllerConfig.RightJoyconStick.InvertStickX; _invertRStickX.Active = controllerConfig.RightJoyconStick.InvertStickX;
_invertRStickY.Active = controllerConfig.RightJoyconStick.InvertStickY; _invertRStickY.Active = controllerConfig.RightJoyconStick.InvertStickY;
_swapRSticks.Active = controllerConfig.RightJoyconStick.SwapSticks; _rotateR90CW.Active = controllerConfig.RightJoyconStick.Rotate90CW;
_rStickButton.Label = controllerConfig.RightJoyconStick.StickButton.ToString(); _rStickButton.Label = controllerConfig.RightJoyconStick.StickButton.ToString();
_a.Label = controllerConfig.RightJoycon.ButtonA.ToString(); _a.Label = controllerConfig.RightJoycon.ButtonA.ToString();
_b.Label = controllerConfig.RightJoycon.ButtonB.ToString(); _b.Label = controllerConfig.RightJoycon.ButtonB.ToString();
@ -722,7 +722,7 @@ namespace Ryujinx.Ui.Windows
Joystick = lStick, Joystick = lStick,
InvertStickY = _invertLStickY.Active, InvertStickY = _invertLStickY.Active,
StickButton = lStickButton, StickButton = lStickButton,
SwapSticks = _swapLSticks.Active, Rotate90CW = _rotateL90CW.Active,
}, },
RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId> RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId>
{ {
@ -742,7 +742,7 @@ namespace Ryujinx.Ui.Windows
Joystick = rStick, Joystick = rStick,
InvertStickY = _invertRStickY.Active, InvertStickY = _invertRStickY.Active,
StickButton = rStickButton, StickButton = rStickButton,
SwapSticks = _swapRSticks.Active, Rotate90CW = _rotateR90CW.Active,
}, },
Motion = motionConfig, Motion = motionConfig,
Rumble = new RumbleConfigController Rumble = new RumbleConfigController
@ -1062,7 +1062,7 @@ namespace Ryujinx.Ui.Windows
StickButton = ConfigGamepadInputId.LeftStick, StickButton = ConfigGamepadInputId.LeftStick,
InvertStickX = false, InvertStickX = false,
InvertStickY = false, InvertStickY = false,
SwapSticks = false, Rotate90CW = false,
}, },
RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId> RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId>
@ -1084,7 +1084,7 @@ namespace Ryujinx.Ui.Windows
StickButton = ConfigGamepadInputId.RightStick, StickButton = ConfigGamepadInputId.RightStick,
InvertStickX = false, InvertStickX = false,
InvertStickY = false, InvertStickY = false,
SwapSticks = false, Rotate90CW = false,
}, },
Motion = new StandardMotionConfigController Motion = new StandardMotionConfigController

8
Ryujinx/Ui/Windows/ControllerWindow.glade
View file

@ -741,8 +741,8 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="_swapLSticks"> <object class="GtkCheckButton" id="_rotateL90CW">
<property name="label" translatable="yes">Swap Sticks</property> <property name="label" translatable="yes">Rotate 90° Clockwise</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1711,8 +1711,8 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="_swapRSticks"> <object class="GtkCheckButton" id="_rotateR90CW">
<property name="label" translatable="yes">Swap Sticks</property> <property name="label" translatable="yes">Rotate 90° Clockwise</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>