From 05c35ab44c883e6a727dc71a6951b78e04fa620d Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 23:59:35 +0100 Subject: [PATCH] Move minimap presentation into render settings --- Aetheria.State.Verify/Program.cs | 26 ++++++++++++++++--- Assets/Scripts/Gameplay/ActionGameManager.cs | 4 ++- Assets/Scripts/Zone Display/ZoneRenderer.cs | 4 +-- .../AetheriaRuntimeDaemonRenderQueries.cs | 13 +++++++++- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 8ad799156..87549825f 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -1830,10 +1830,13 @@ static void RequireDaemonRenderQueryAuthority(string root) "public IReadOnlyList MinimapZoomLevels { get; }", "public int DefaultMinimapZoom { get; }", "public double WormholeDistanceRatio { get; }", + "public double DefaultViewDistance { get; }", + "public double MinimapIconScale { get; }", "public int ResolveDefaultMinimapZoomIndex()", "public int ResolveNextMinimapZoomIndex(int currentIndex)", "public double ResolveMinimapDistance(int zoomIndex)", "public double ResolveDefaultMinimapDistance()", + "public double ResolveMinimapIconSize(double minimapDistance)", "public double NormalizeThermalRisk(double temperature)", "public double NormalizeHeatstrokePost(double heatstroke)", "public double NormalizeSevereHeatstrokePost(double heatstroke)", @@ -1996,11 +1999,13 @@ static void RequireDaemonRenderQueryAuthority(string root) "ZoneRenderer must query daemon visibility through shared render settings instead of Unity GameplaySettings."); } - if (zoneRenderer.Contains("Settings.MinimapZoomLevels", StringComparison.Ordinal) || - zoneRenderer.Contains("Settings.DefaultMinimapZoom", StringComparison.Ordinal)) + if (ContainsUnitySettingsMember(zoneRenderer, "MinimapZoomLevels") || + ContainsUnitySettingsMember(zoneRenderer, "DefaultMinimapZoom") || + ContainsUnitySettingsMember(zoneRenderer, "MinimapIconSize") || + ContainsUnitySettingsMember(zoneRenderer, "DefaultViewDistance")) { throw new InvalidOperationException( - "ZoneRenderer must initialize minimap distance through shared daemon render settings instead of Unity GameSettings."); + "ZoneRenderer must initialize view/minimap presentation through shared daemon render settings instead of Unity GameSettings."); } if (zoneRenderer.Contains(" Settings.WormholeDistanceRatio", StringComparison.Ordinal) || @@ -2150,7 +2155,9 @@ static void RequireDaemonRenderQueryAuthority(string root) "AetheriaRuntimeDaemonRenderQueries.QueryCompassMarkers(", "AetheriaRuntimeDaemonRenderQueries.QueryVisibleEntityIndices(", "RenderSettings.TargetDetectionInfoThreshold", + "RenderSettings.DefaultViewDistance", "RenderSettings.ResolveDefaultMinimapDistance()", + "RenderSettings.ResolveMinimapIconSize(value)", "AetheriaRuntimeDaemonRenderQueries.QueryWormholeExits(", "RenderSettings.WormholeDistanceRatio", "AddWormhole(exit)", @@ -2248,7 +2255,9 @@ static void RequireDaemonRenderQueryAuthority(string root) "TargetSpottedBlinkOffset", "Settings.MinimapZoomLevels", "Settings.DefaultMinimapZoom", - "Settings.WormholeDistanceRatio" + "Settings.WormholeDistanceRatio", + "Settings.DefaultViewDistance", + "Settings.MinimapIconSize" }; var missingActionGameManagerRenderSymbols = requiredActionGameManagerRenderSymbols @@ -11405,6 +11414,15 @@ static IEnumerable<(string MethodName, int LineNumber, string Line)> FindMethodS } } +static bool ContainsUnitySettingsMember(string source, string memberName) +{ + return source.Contains($" Settings.{memberName}", StringComparison.Ordinal) || + source.Contains($"(Settings.{memberName}", StringComparison.Ordinal) || + source.Contains($", Settings.{memberName}", StringComparison.Ordinal) || + source.Contains($"\tSettings.{memberName}", StringComparison.Ordinal) || + source.Contains($"\nSettings.{memberName}", StringComparison.Ordinal); +} + static string TryReadMethodName(string trimmedLine) { if (!StartsWithMethodAccessModifier(trimmedLine) || diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 6c261a96e..54346b9c1 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -589,7 +589,9 @@ public class ActionGameManager : MonoBehaviour TargetSpottedBlinkOffset, Settings.MinimapZoomLevels?.Select(level => (double)level).ToArray(), Settings.DefaultMinimapZoom, - Settings.WormholeDistanceRatio); + Settings.WormholeDistanceRatio, + Settings.DefaultViewDistance, + Settings.MinimapIconSize); } private readonly (float2 direction, string name)[] _directions = { diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 8b2ecf3ca..d44c7703b 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -143,7 +143,7 @@ public class ZoneRenderer : MonoBehaviour _minimapDistance = value; foreach (var camera in MinimapCameras) camera.orthographicSize = value; - SetIconSize(value * Settings.MinimapIconSize); + SetIconSize((float)RenderSettings.ResolveMinimapIconSize(value)); // MinimapGravityQuad.transform.localScale = value * 2 * Vector3.one; } } @@ -207,7 +207,7 @@ public class ZoneRenderer : MonoBehaviour { var bigBounds = new Bounds(Vector3.zero, Vector3.one * 1024); foreach (var mesh in AsteroidMeshes) mesh.Mesh.bounds = bigBounds; - ViewDistance = Settings.DefaultViewDistance; + ViewDistance = (float)RenderSettings.DefaultViewDistance; MinimapDistance = (float)RenderSettings.ResolveDefaultMinimapDistance(); _tourTimer = TourSwitchTime; diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs index cafa2d356..27e44cc34 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs @@ -65,7 +65,9 @@ namespace GameCult.Aetheria.State.Verse double targetSpottedBlinkOffset = -0.25, IReadOnlyList? minimapZoomLevels = null, int defaultMinimapZoom = 0, - double wormholeDistanceRatio = 1.0) + double wormholeDistanceRatio = 1.0, + double defaultViewDistance = 0.0, + double minimapIconScale = 0.0) { TemperatureEmissionCurve = temperatureEmissionCurve; LockIndicatorFrequency = lockIndicatorFrequency; @@ -83,6 +85,8 @@ namespace GameCult.Aetheria.State.Verse MinimapZoomLevels = CopyPositiveMinimapZoomLevels(minimapZoomLevels); DefaultMinimapZoom = defaultMinimapZoom; WormholeDistanceRatio = Math.Max(0.0, wormholeDistanceRatio); + DefaultViewDistance = Math.Max(0.0, defaultViewDistance); + MinimapIconScale = Math.Max(0.0, minimapIconScale); } public AetheriaRuntimeExponentialCurve TemperatureEmissionCurve { get; } @@ -101,6 +105,8 @@ namespace GameCult.Aetheria.State.Verse public IReadOnlyList MinimapZoomLevels { get; } public int DefaultMinimapZoom { get; } public double WormholeDistanceRatio { get; } + public double DefaultViewDistance { get; } + public double MinimapIconScale { get; } public int ResolveDefaultMinimapZoomIndex() { @@ -130,6 +136,11 @@ namespace GameCult.Aetheria.State.Verse return ResolveMinimapDistance(ResolveDefaultMinimapZoomIndex()); } + public double ResolveMinimapIconSize(double minimapDistance) + { + return Math.Max(0.0, minimapDistance) * MinimapIconScale; + } + public double NormalizeThermalRisk(double temperature) { var range = HeatstrokeTemperature - HypothermiaTemperature;