From 07c5ab9894e323d2fcddf54bf4526c197cf349fa Mon Sep 17 00:00:00 2001 From: Marco Carvalho Date: Sat, 4 Jan 2025 23:37:18 -0300 Subject: [PATCH] . --- .../LocalesValidationTask.cs | 2 +- src/Ryujinx/Headless/Options.cs | 74 +++++++++---------- .../Configuration/ConfigurationState.Model.cs | 24 +++--- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs index 1f2c39e95..b8e14cd30 100644 --- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs +++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs @@ -83,7 +83,7 @@ namespace Ryujinx.BuildValidationTasks if (isGitRunner && encounteredIssue) throw new JsonException("1 or more locales are invalid!"); - JsonSerializerOptions jsonOptions = new JsonSerializerOptions() + JsonSerializerOptions jsonOptions = new() { WriteIndented = true, NewLine = "\n", diff --git a/src/Ryujinx/Headless/Options.cs b/src/Ryujinx/Headless/Options.cs index 0d7e46285..08fa8ccdc 100644 --- a/src/Ryujinx/Headless/Options.cs +++ b/src/Ryujinx/Headless/Options.cs @@ -24,7 +24,7 @@ namespace Ryujinx.Headless if (NeedsOverride(nameof(EnableKeyboard))) EnableKeyboard = configurationState.Hid.EnableKeyboard; - + if (NeedsOverride(nameof(EnableMouse))) EnableMouse = configurationState.Hid.EnableMouse; @@ -39,40 +39,40 @@ namespace Ryujinx.Headless if (NeedsOverride(nameof(DisableFsIntegrityChecks))) DisableFsIntegrityChecks = configurationState.System.EnableFsIntegrityChecks; - + if (NeedsOverride(nameof(FsGlobalAccessLogMode))) FsGlobalAccessLogMode = configurationState.System.FsGlobalAccessLogMode; - + if (NeedsOverride(nameof(VSyncMode))) VSyncMode = configurationState.Graphics.VSyncMode; - + if (NeedsOverride(nameof(CustomVSyncInterval))) CustomVSyncInterval = configurationState.Graphics.CustomVSyncInterval; - + if (NeedsOverride(nameof(DisableShaderCache))) DisableShaderCache = !configurationState.Graphics.EnableShaderCache; if (NeedsOverride(nameof(EnableTextureRecompression))) EnableTextureRecompression = configurationState.Graphics.EnableTextureRecompression; - + if (NeedsOverride(nameof(DisableDockedMode))) DisableDockedMode = !configurationState.System.EnableDockedMode; if (NeedsOverride(nameof(SystemLanguage))) SystemLanguage = (SystemLanguage)(int)configurationState.System.Language.Value; - + if (NeedsOverride(nameof(SystemRegion))) SystemRegion = (RegionCode)(int)configurationState.System.Region.Value; - + if (NeedsOverride(nameof(SystemTimeZone))) SystemTimeZone = configurationState.System.TimeZone; - + if (NeedsOverride(nameof(SystemTimeOffset))) SystemTimeOffset = configurationState.System.SystemTimeOffset; - + if (NeedsOverride(nameof(MemoryManagerMode))) MemoryManagerMode = configurationState.System.MemoryManagerMode; - + if (NeedsOverride(nameof(AudioVolume))) AudioVolume = configurationState.System.AudioVolume; @@ -81,28 +81,28 @@ namespace Ryujinx.Headless if (NeedsOverride(nameof(MultiplayerLanInterfaceId))) MultiplayerLanInterfaceId = configurationState.Multiplayer.LanInterfaceId; - + if (NeedsOverride(nameof(DisableFileLog))) DisableFileLog = !configurationState.Logger.EnableFileLog; - + if (NeedsOverride(nameof(LoggingEnableDebug))) LoggingEnableDebug = configurationState.Logger.EnableDebug; - + if (NeedsOverride(nameof(LoggingDisableStub))) LoggingDisableStub = !configurationState.Logger.EnableStub; - + if (NeedsOverride(nameof(LoggingDisableInfo))) LoggingDisableInfo = !configurationState.Logger.EnableInfo; - + if (NeedsOverride(nameof(LoggingDisableWarning))) LoggingDisableWarning = !configurationState.Logger.EnableWarn; - + if (NeedsOverride(nameof(LoggingDisableError))) LoggingDisableError = !configurationState.Logger.EnableError; - + if (NeedsOverride(nameof(LoggingEnableTrace))) LoggingEnableTrace = configurationState.Logger.EnableTrace; - + if (NeedsOverride(nameof(LoggingDisableGuest))) LoggingDisableGuest = !configurationState.Logger.EnableGuest; @@ -114,45 +114,45 @@ namespace Ryujinx.Headless if (NeedsOverride(nameof(ResScale))) ResScale = configurationState.Graphics.ResScale; - + if (NeedsOverride(nameof(MaxAnisotropy))) MaxAnisotropy = configurationState.Graphics.MaxAnisotropy; - + if (NeedsOverride(nameof(AspectRatio))) AspectRatio = configurationState.Graphics.AspectRatio; - + if (NeedsOverride(nameof(BackendThreading))) BackendThreading = configurationState.Graphics.BackendThreading; - + if (NeedsOverride(nameof(DisableMacroHLE))) DisableMacroHLE = !configurationState.Graphics.EnableMacroHLE; - + if (NeedsOverride(nameof(GraphicsShadersDumpPath))) GraphicsShadersDumpPath = configurationState.Graphics.ShadersDumpPath; - + if (NeedsOverride(nameof(GraphicsBackend))) GraphicsBackend = configurationState.Graphics.GraphicsBackend; - + if (NeedsOverride(nameof(AntiAliasing))) AntiAliasing = configurationState.Graphics.AntiAliasing; - + if (NeedsOverride(nameof(ScalingFilter))) ScalingFilter = configurationState.Graphics.ScalingFilter; - + if (NeedsOverride(nameof(ScalingFilterLevel))) ScalingFilterLevel = configurationState.Graphics.ScalingFilterLevel; if (NeedsOverride(nameof(DramSize))) DramSize = configurationState.System.DramSize; - + if (NeedsOverride(nameof(IgnoreMissingServices))) IgnoreMissingServices = configurationState.System.IgnoreMissingServices; - + if (NeedsOverride(nameof(IgnoreControllerApplet))) IgnoreControllerApplet = configurationState.IgnoreApplet; - + return; - + bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey))); } @@ -179,15 +179,15 @@ namespace Ryujinx.Headless } return; - + bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey))); } private static string OptionName(string propertyName) => typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute()!.LongName; - + // General - + [Option("use-main-config", Required = false, Default = false, HelpText = "Use the settings from what was configured via the UI.")] public bool InheritConfig { get; set; } @@ -410,7 +410,7 @@ namespace Ryujinx.Headless [Option("ignore-missing-services", Required = false, Default = false, HelpText = "Enable ignoring missing services.")] public bool IgnoreMissingServices { get; set; } - + [Option("ignore-controller-applet", Required = false, Default = false, HelpText = "Enable ignoring the controller applet when your game loses connection to your controller.")] public bool IgnoreControllerApplet { get; set; } @@ -419,6 +419,6 @@ namespace Ryujinx.Headless [Value(0, MetaName = "input", HelpText = "Input to load.", Required = true)] public string InputPath { get; set; } - public SafeDictionary InheritedInputConfigs = new(); + public SafeDictionary InheritedInputConfigs = []; } } diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs index fe5f2c3ad..8de3bcb3e 100644 --- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs +++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs @@ -382,7 +382,7 @@ namespace Ryujinx.Ava.Utilities.Configuration EnablePtc.LogChangesToValue(nameof(EnablePtc)); EnableLowPowerPtc = new ReactiveObject(); EnableLowPowerPtc.LogChangesToValue(nameof(EnableLowPowerPtc)); - EnableLowPowerPtc.Event += (_, evnt) + EnableLowPowerPtc.Event += (_, evnt) => Optimizations.LowPower = evnt.NewValue; EnableInternetAccess = new ReactiveObject(); EnableInternetAccess.LogChangesToValue(nameof(EnableInternetAccess)); @@ -626,11 +626,11 @@ namespace Ryujinx.Ava.Utilities.Configuration /// Show toggles for dirty hacks in the UI. /// public ReactiveObject ShowDirtyHacks { get; private set; } - + public ReactiveObject Xc2MenuSoftlockFix { get; private set; } - + public ReactiveObject EnableShaderTranslationDelay { get; private set; } - + public ReactiveObject ShaderTranslationDelay { get; private set; } public HacksSection() @@ -645,15 +645,15 @@ namespace Ryujinx.Ava.Utilities.Configuration private void HackChanged(object sender, ReactiveEventArgs rxe) { - if (!ShowDirtyHacks) + if (!ShowDirtyHacks) return; - + var newHacks = EnabledHacks.Select(x => x.Hack) .JoinToString(", "); if (newHacks != _lastHackCollection) { - RyuLogger.Info?.Print(LogClass.Configuration, + RyuLogger.Info?.Print(LogClass.Configuration, $"EnabledDirtyHacks set to: [{newHacks}]", "LogValueChange"); _lastHackCollection = newHacks; @@ -667,14 +667,14 @@ namespace Ryujinx.Ava.Utilities.Configuration get { List enabledHacks = []; - + if (Xc2MenuSoftlockFix) Apply(DirtyHack.Xc2MenuSoftlockFix); - + if (EnableShaderTranslationDelay) Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay); - - return enabledHacks.ToArray(); + + return [.. enabledHacks]; void Apply(DirtyHack hack, int value = 0) { @@ -718,7 +718,7 @@ namespace Ryujinx.Ava.Utilities.Configuration /// The Multiplayer section /// public MultiplayerSection Multiplayer { get; private set; } - + /// /// The Dirty Hacks section ///