rebased

emmauss · Mar 13, 2022 · 4e61b62 · 4e61b62
1 parent 7c22bd3
commit 4e61b62
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 19 deletions.
diff --git 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
@@ -50,23 +50,23 @@
         <AvaloniaResource Include="Assets\Styles\Styles.xaml" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.12" />
-        <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.12" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.13" />
+        <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.13" />
         <PackageReference Include="Avalonia.Svg" Version="0.10.12" />
         <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.12" />
         <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
-        <PackageReference Include="DynamicData" Version="7.4.9" />
-        <PackageReference Include="FluentAvaloniaUI" Version="1.2.1" />
+        <PackageReference Include="DynamicData" Version="7.6.5" />
+        <PackageReference Include="FluentAvaloniaUI" Version="1.3.1" />
         <PackageReference Include="Crc32.NET" Version="1.2.0" />
         <PackageReference Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" />
         <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
         <PackageReference Include="OpenTK" Version="4.6.3" />
         <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="4.4.0-build9" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
         <PackageReference Include="SharpZipLib" Version="1.3.3" />
         <PackageReference Include="PInvoke.User32" Version="0.7.104" />
-        <PackageReference Include="Avalonia" Version="0.10.12" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
+        <PackageReference Include="Avalonia" Version="0.10.13" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.13" />
         <PackageReference Include="Silk.NET.Vulkan" Version="2.2.0" />
         <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.2.0" />
         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />

diff --git a/Ryujinx.Ava/Ui/Models/InputConfiguration.cs b/Ryujinx.Ava/Ui/Models/InputConfiguration.cs
@@ -40,11 +40,13 @@ public class InputConfiguration<Key, Stick> : 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,13 +404,15 @@ public InputConfig GetConfig()
                         Joystick = (StickInputId)(object)LeftJoystick,
                         InvertStickX = LeftInvertStickX,
                         InvertStickY = LeftInvertStickY,
+                        Rotate90CW = LeftRotate90,
                         StickButton = (GamepadInputId)(object)LeftControllerStickButton,
                     },
                     RightJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>()
                     {
                         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
@@ -425,6 +425,9 @@
                                     <TextBlock Margin="0" Text="{locale:Locale ControllerSettingsLStickInvertYAxis}" />
                                 </CheckBox>
                             </StackPanel>
+							<CheckBox IsChecked="{Binding Configuration.LeftRotate90}">
+								<TextBlock Margin="0" Text="{locale:Locale ControllerSettingsRotate90}" />
+							</CheckBox>
                             <Separator Height="1" Margin="0,5" />
                             <StackPanel Margin="0" Orientation="Vertical">
                                 <TextBlock Margin="2" Text="{locale:Locale ControllerSettingsLStickDeadzone}" />
@@ -1337,6 +1340,9 @@
                                     <TextBlock Margin="0" Text="{locale:Locale ControllerSettingsRStickInvertYAxis}" />
                                 </CheckBox>
                             </StackPanel>
+							<CheckBox IsChecked="{Binding Configuration.RightRotate90}">
+								<TextBlock Margin="0" Text="{locale:Locale ControllerSettingsRotate90}" />
+							</CheckBox>
                             <Separator Margin="-16,0" />
                             <StackPanel Margin="0" Orientation="Vertical">
                                 <TextBlock Margin="2" Text="{locale:Locale ControllerSettingsRStickDeadzone}" />