From 4e61b629fd3368d6d0dbe622fbe517eb828ce9dd Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Sun, 13 Mar 2022 13:06:48 +0000 Subject: [PATCH] rebased --- Ryujinx.Ava/Assets/Locales/en_US.json | 25 ++++++++++--------- Ryujinx.Ava/Ryujinx.Ava.csproj | 14 +++++------ Ryujinx.Ava/Ui/Models/InputConfiguration.cs | 6 +++++ .../Ui/Windows/ControllerSettingsWindow.axaml | 6 +++++ 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/Ryujinx.Ava/Assets/Locales/en_US.json b/Ryujinx.Ava/Assets/Locales/en_US.json index 4267e025cf8c..710449b8baa2 100644 --- a/Ryujinx.Ava/Assets/Locales/en_US.json +++ b/Ryujinx.Ava/Assets/Locales/en_US.json @@ -494,21 +494,22 @@ "AudioVolumeTooltip": "Change Audio Volume", "SettingsTabSystemEnableInternetAccess": "Enable Guest Internet Access", "EnableInternetAccessTooltip": "Enables guest Internet access. If enabled, the application will behave as if the emulated Switch console was connected to the Internet. Note that in some cases, applications may still access the Internet even with this option disabled", - "GameListContextMenuManageCheatToolTip" : "Manage Cheats", - "GameListContextMenuManageCheat" : "Manage Cheats", - "ControllerSettingsStickRange" : "Range", - "DialogStopEmulationTitle" : "Ryujinx - Stop Emulation", + "GameListContextMenuManageCheatToolTip": "Manage Cheats", + "GameListContextMenuManageCheat": "Manage Cheats", + "ControllerSettingsStickRange": "Range", + "DialogStopEmulationTitle": "Ryujinx - Stop Emulation", "DialogStopEmulationMessage": "Are you sure you want to stop emulation?", "SettingsTabCpu": "CPU", "SettingsTabAudio": "Audio", "SettingsTabNetwork": "Network", - "SettingsTabNetworkConnection" : "Network Connection", - "SettingsTabGraphicsFrameRate" : "Host Refresh Rate:", - "SettingsTabGraphicsFrameRateTooltip" : "Sets host refresh rate. Set to 0 to remove limit.", - "SettingsTabCpuCache" : "CPU Cache", - "SettingsTabCpuMemory" : "CPU Memory", - "DialogUpdaterFlatpakNotSupportedMessage" : "Please update Ryujinx via FlatHub.", - "UpdaterDisabledWarningTitle" : "Updater Disabled!", + "SettingsTabNetworkConnection": "Network Connection", + "SettingsTabGraphicsFrameRate": "Host Refresh Rate:", + "SettingsTabGraphicsFrameRateTooltip": "Sets host refresh rate. Set to 0 to remove limit.", + "SettingsTabCpuCache": "CPU Cache", + "SettingsTabCpuMemory": "CPU Memory", + "DialogUpdaterFlatpakNotSupportedMessage": "Please update Ryujinx via FlatHub.", + "UpdaterDisabledWarningTitle": "Updater Disabled!", "GameListContextMenuOpenSdModsDirectory": "Open Atmosphere Mods Directory", - "GameListContextMenuOpenSdModsDirectoryToolTip": "Opens the alternative SD card atmosphere directory which contains Application's Mods" + "GameListContextMenuOpenSdModsDirectoryToolTip": "Opens the alternative SD card atmosphere directory which contains Application's Mods", + "ControllerSettingsRotate90": "Rotate 90° Clockwise" } diff --git a/Ryujinx.Ava/Ryujinx.Ava.csproj b/Ryujinx.Ava/Ryujinx.Ava.csproj index 2834c2d6be35..173786201d3b 100644 --- a/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/Ryujinx.Ava/Ryujinx.Ava.csproj @@ -50,13 +50,13 @@ - - + + - - + + @@ -64,9 +64,9 @@ - - - + + + diff --git a/Ryujinx.Ava/Ui/Models/InputConfiguration.cs b/Ryujinx.Ava/Ui/Models/InputConfiguration.cs index 68a8ff611892..3de6096cb2a0 100644 --- a/Ryujinx.Ava/Ui/Models/InputConfiguration.cs +++ b/Ryujinx.Ava/Ui/Models/InputConfiguration.cs @@ -40,11 +40,13 @@ public class InputConfiguration : BaseModel public Stick LeftJoystick { get; set; } public bool LeftInvertStickX { get; set; } public bool LeftInvertStickY { get; set; } + public bool RightRotate90 { get; set; } public Key LeftControllerStickButton { get; set; } public Stick RightJoystick { get; set; } public bool RightInvertStickX { get; set; } public bool RightInvertStickY { get; set; } + public bool LeftRotate90 { get; set; } public Key RightControllerStickButton { get; set; } public float DeadzoneLeft @@ -244,11 +246,13 @@ public InputConfiguration(InputConfig config) LeftJoystick = (Stick)(object)controllerConfig.LeftJoyconStick.Joystick; LeftInvertStickX = controllerConfig.LeftJoyconStick.InvertStickX; LeftInvertStickY = controllerConfig.LeftJoyconStick.InvertStickY; + LeftRotate90 = controllerConfig.LeftJoyconStick.Rotate90CW; LeftControllerStickButton = (Key)(object)controllerConfig.LeftJoyconStick.StickButton; RightJoystick = (Stick)(object)controllerConfig.RightJoyconStick.Joystick; RightInvertStickX = controllerConfig.RightJoyconStick.InvertStickX; RightInvertStickY = controllerConfig.RightJoyconStick.InvertStickY; + RightRotate90 = controllerConfig.RightJoyconStick.Rotate90CW; RightControllerStickButton = (Key)(object)controllerConfig.RightJoyconStick.StickButton; ButtonA = (Key)(object)controllerConfig.RightJoycon.ButtonA; @@ -400,6 +404,7 @@ public InputConfig GetConfig() Joystick = (StickInputId)(object)LeftJoystick, InvertStickX = LeftInvertStickX, InvertStickY = LeftInvertStickY, + Rotate90CW = LeftRotate90, StickButton = (GamepadInputId)(object)LeftControllerStickButton, }, RightJoyconStick = new JoyconConfigControllerStick() @@ -407,6 +412,7 @@ public InputConfig GetConfig() Joystick = (StickInputId)(object)RightJoystick, InvertStickX = RightInvertStickX, InvertStickY = RightInvertStickY, + Rotate90CW = RightRotate90, StickButton = (GamepadInputId)(object)RightControllerStickButton, }, Rumble = new RumbleConfigController() diff --git a/Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml b/Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml index 8e7d9989f073..8236461e0790 100644 --- a/Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml +++ b/Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml @@ -425,6 +425,9 @@ + + + @@ -1337,6 +1340,9 @@ + + +