mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up some magic numbers between code and axaml.

Browse Source
This commit is contained in:
MutantAura
2024-05-30 14:29:05 +01:00
committed by Evan Husted
parent aa3f2824e0
commit ce13830063
2 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ using Ryujinx.Ava.Input;
using Ryujinx.Ava.UI.Models.Input;
using Ryujinx.Ava.UI.Views.Input;
using Ryujinx.Input;
using System;
using System.Threading;
using System.Threading.Tasks;
@@ -18,7 +17,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
[ObservableProperty] private GamepadInputConfig _config;
private const int StickUiPollMs = 50; // Milliseconds per poll.
private const float CanvasCenterOffset = 47.5f;
private const int StickCircumference = 5;
private const int CanvasSize = 100;
private const int StickBorderSize = CanvasSize + 5;
private const float CanvasCenterOffset = (CanvasSize - StickCircumference) / 2;
private const int StickScaleFactor = 45;
private IGamepad _selectedGamepad;
@@ -88,15 +91,17 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
}
}
public float canvasCenter => CanvasCenterOffset;
public int UiStickCircumference => StickCircumference;
public int UiCanvasSize => CanvasSize;
public int UiStickBorderSize => StickBorderSize;
public float UiStickLeftX => UiStickLeft.Item1 + CanvasCenterOffset;
public float UiStickLeftY => UiStickLeft.Item2 + CanvasCenterOffset;
public float UiStickRightX => UiStickRight.Item1 + CanvasCenterOffset;
public float UiStickRightY => UiStickRight.Item2 + CanvasCenterOffset;
public float UiDeadzoneLeft => Config.DeadzoneLeft * 95;
public float UiDeadzoneRight => Config.DeadzoneRight * 95;
public float UiDeadzoneLeft => Config.DeadzoneLeft * (CanvasSize - StickCircumference);
public float UiDeadzoneRight => Config.DeadzoneRight * (CanvasSize - StickCircumference);
public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
{