Move minimap presentation into render settings
This commit is contained in:
parent
d40ba1df14
commit
05c35ab44c
4 changed files with 39 additions and 8 deletions
|
|
@ -1830,10 +1830,13 @@ static void RequireDaemonRenderQueryAuthority(string root)
|
|||
"public IReadOnlyList<double> 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) ||
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,9 @@ namespace GameCult.Aetheria.State.Verse
|
|||
double targetSpottedBlinkOffset = -0.25,
|
||||
IReadOnlyList<double>? 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<double> 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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue