MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Polish the aesthetic and include deadzone visualization.

Browse Source
This commit is contained in:
MutantAura 2024-05-30 14:03:43 +01:00 committed by Evan Husted
parent d2bb580aea
commit aa3f2824e0
2 changed files with 71 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
View File

@ -7,6 +7,7 @@ using Ryujinx.Ava.Input;
using Ryujinx.Ava.UI.Models.Input; using Ryujinx.Ava.UI.Models.Input;
using Ryujinx.Ava.UI.Views.Input; using Ryujinx.Ava.UI.Views.Input;
using Ryujinx.Input; using Ryujinx.Input;
using System;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -17,8 +18,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
[ObservableProperty] private GamepadInputConfig _config; [ObservableProperty] private GamepadInputConfig _config;
private const int StickUiPollMs = 50; // Milliseconds per poll. private const int StickUiPollMs = 50; // Milliseconds per poll.
private const float CanvasCenterOffset = 75f/2f; private const float CanvasCenterOffset = 47.5f;
private const int StickScaleFactor = 30; private const int StickScaleFactor = 45;
private IGamepad _selectedGamepad; private IGamepad _selectedGamepad;
@ -69,6 +70,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
OnPropertyChanged(); OnPropertyChanged();
OnPropertyChanged(nameof(UiStickRightX)); OnPropertyChanged(nameof(UiStickRightX));
OnPropertyChanged(nameof(UiStickRightY)); OnPropertyChanged(nameof(UiStickRightY));
OnPropertyChanged(nameof(UiDeadzoneRight));
} }
} }
@ -82,6 +84,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
OnPropertyChanged(); OnPropertyChanged();
OnPropertyChanged(nameof(UiStickLeftX)); OnPropertyChanged(nameof(UiStickLeftX));
OnPropertyChanged(nameof(UiStickLeftY)); OnPropertyChanged(nameof(UiStickLeftY));
OnPropertyChanged(nameof(UiDeadzoneLeft));
} }
} }
@ -92,6 +95,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
public float UiStickRightX => UiStickRight.Item1 + CanvasCenterOffset; public float UiStickRightX => UiStickRight.Item1 + CanvasCenterOffset;
public float UiStickRightY => UiStickRight.Item2 + CanvasCenterOffset; public float UiStickRightY => UiStickRight.Item2 + CanvasCenterOffset;
public float UiDeadzoneLeft => Config.DeadzoneLeft * 95;
public float UiDeadzoneRight => Config.DeadzoneRight * 95;
public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config) public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
{ {
ParentModel = model; ParentModel = model;

96
src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
View File

@ -334,56 +334,84 @@
BorderBrush="{DynamicResource ThemeControlBorderColor}" BorderBrush="{DynamicResource ThemeControlBorderColor}"
BorderThickness="1" BorderThickness="1"
CornerRadius="5" CornerRadius="5"
Height="100" Height="105"
Width="100"> Width="105">
<Canvas <Canvas
Background="{DynamicResource ThemeBackgroundColor}" Background="{DynamicResource ThemeBackgroundColor}"
Height="100" Height="100"
Width="100"> Width="100">
<Grid
Height="100"
Width="100"
Background="{DynamicResource ThemeBackgroundColor}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Ellipse
Grid.Column="1"
HorizontalAlignment="Center"
Stroke="Black"
StrokeThickness="1"
Width="100"
Height="100"
Canvas.Bottom="2"
Canvas.Left="2" />
<Ellipse
Grid.Column="1"
HorizontalAlignment="Center"
Fill="Gray"
Opacity="100"
Height="{Binding UiDeadzoneLeft}"
Width="{Binding UiDeadzoneLeft}"/>
</Grid>
<Ellipse <Ellipse
Fill="Gray" Fill="Red"
Stroke="Blue" Width="5"
StrokeThickness="1" Height="5"
Width="25" Canvas.Bottom="{Binding UiStickLeftY}"
Height="25" Canvas.Left="{Binding UiStickLeftX}" />
Canvas.Bottom="{Binding UiStickLeftY}"
Canvas.Left="{Binding UiStickLeftX}" />
<Ellipse
Stroke="Black"
StrokeThickness="1"
StrokeDashOffset="2"
Width="96"
Height="96"
Canvas.Bottom="2"
Canvas.Left="2" />
</Canvas> </Canvas>
</Border> </Border>
<Border <Border
BorderBrush="{DynamicResource ThemeControlBorderColor}" BorderBrush="{DynamicResource ThemeControlBorderColor}"
BorderThickness="1" BorderThickness="1"
CornerRadius="5" CornerRadius="5"
Height="100" Height="105"
Width="100"> Width="105">
<Canvas <Canvas
Background="{DynamicResource ThemeBackgroundColor}" Background="{DynamicResource ThemeBackgroundColor}"
Height="100" Height="100"
Width="100"> Width="100">
<Grid
Height="100"
Width="100"
Background="{DynamicResource ThemeBackgroundColor}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Ellipse
Grid.Column="1"
HorizontalAlignment="Center"
Stroke="Black"
StrokeThickness="1"
Width="100"
Height="100"
Canvas.Bottom="2"
Canvas.Left="2" />
<Ellipse
Grid.Column="1"
HorizontalAlignment="Center"
Fill="Gray"
Opacity="100"
Height="{Binding UiDeadzoneRight}"
Width="{Binding UiDeadzoneRight}"/>
</Grid>
<Ellipse <Ellipse
Fill="Gray" Fill="Red"
Stroke="Blue" Width="5"
StrokeThickness="1" Height="5"
Width="25" Canvas.Bottom="{Binding UiStickRightY}"
Height="25" Canvas.Left="{Binding UiStickRightX}" />
Canvas.Bottom="{Binding UiStickRightY}"
Canvas.Left="{Binding UiStickRightX}"/>
<Ellipse
Stroke="Black"
StrokeThickness="1"
StrokeDashOffset="2"
Width="96"
Height="96"
Canvas.Bottom="2"
Canvas.Left="2" />
</Canvas> </Canvas>
</Border> </Border>
</StackPanel> </StackPanel>