From e4ecc5b64a6d8bf746b6223624291e1e665c3493 Mon Sep 17 00:00:00 2001 From: kaczy Date: Thu, 21 Mar 2024 12:27:44 +0100 Subject: [PATCH] Configure grahpics driver from settings.json --- CentrED/Application.cs | 1 + CentrED/Config.cs | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CentrED/Application.cs b/CentrED/Application.cs index 90dca99..110b784 100644 --- a/CentrED/Application.cs +++ b/CentrED/Application.cs @@ -101,6 +101,7 @@ public static void Main(string[] args) _loadContext = AssemblyLoadContext.Default; _loadContext.ResolvingUnmanagedDll += ResolveUnmanagedDll; _loadContext.Resolving += ResolveAssembly; + Config.Initialize(); using (CEDGame = new CentrEDGame()) { diff --git a/CentrED/Config.cs b/CentrED/Config.cs index 26fbd4b..c8de046 100644 --- a/CentrED/Config.cs +++ b/CentrED/Config.cs @@ -9,6 +9,7 @@ public class ConfigRoot public string ServerConfigPath = "cedserver.xml"; public bool PreferTexMaps; public bool LegacyMouseScroll; + public string GraphicsDriver = "D3D11"; public Dictionary Layout = new(); } @@ -18,13 +19,14 @@ public static class Config private static DateTime LastConfigSave = DateTime.Now; private static readonly JsonSerializerOptions SerializerOptions = new() { - IncludeFields = true + IncludeFields = true, + WriteIndented = true, }; public static ConfigRoot Instance; private static string _configFilePath = "settings.json"; - - static Config() + + public static void Initialize() { if (!File.Exists(_configFilePath)) { @@ -34,6 +36,7 @@ static Config() var jsonText = File.ReadAllText(_configFilePath); Instance = JsonSerializer.Deserialize(jsonText, SerializerOptions); + Environment.SetEnvironmentVariable("FNA3D_FORCE_DRIVER", Instance.GraphicsDriver); } public static void AutoSave()