diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 2e965469a..0b63c9887 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -1813,6 +1813,10 @@ static void RequireDaemonRenderQueryAuthority(string root) var requiredQuerySymbols = new[] { + "public readonly struct AetheriaRuntimeDaemonRenderSettings", + "public readonly struct AetheriaRuntimeExponentialCurve", + "public double ConvergenceMinimumDistance { get; }", + "public AetheriaRuntimeExponentialCurve TemperatureEmissionCurve { get; }", "public static AetheriaRuntimeGravityInfluenceBrush[] QueryGravityInfluences(", "AetheriaRuntimeZoneSnapshotCommit? zone", "public static int QueryGravityInfluences(", @@ -2029,6 +2033,7 @@ static void RequireDaemonRenderQueryAuthority(string root) var requiredZoneRendererSymbols = new[] { + "public AetheriaRuntimeDaemonRenderSettings RenderSettings { get; set; }", "private AetheriaRuntimeRunCheckpointCommit _daemonRunSnapshot;", "private AetheriaRuntimeZoneSnapshotCommit _daemonZoneSnapshot;", "private readonly List _daemonBodyPoses", @@ -2106,10 +2111,17 @@ static void RequireDaemonRenderQueryAuthority(string root) "EntityInstance convergence distance must read daemon target projection through ZoneRenderer instead of facade Entity.Target."); } + if (entityInstance.Contains("Entity.ItemManager.GameplaySettings", StringComparison.Ordinal)) + { + throw new InvalidOperationException( + "EntityInstance render code must use daemon render settings instead of drilling through the observed Entity ItemManager facade."); + } + var requiredEntityInstanceSymbols = new[] { + "ZoneRenderer.RenderSettings.TemperatureEmissionCurve.Evaluate(", "ZoneRenderer.TryGetDaemonTargetDistance(DaemonEntityIndex, out var daemonTargetDistance)", - "Mathf.Max(daemonTargetDistance, Entity.ItemManager.GameplaySettings.ConvergenceMinimumDistance)", + "Mathf.Max(daemonTargetDistance, (float)ZoneRenderer.RenderSettings.ConvergenceMinimumDistance)", "LookAtPoint.position = transform.position + entityLookDirection * lookAtDistance;" }; diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index e8936f8e6..88528534a 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -560,6 +560,17 @@ public class ActionGameManager : MonoBehaviour .ToArray()); } + public AetheriaRuntimeDaemonRenderSettings ObservedDaemonRenderSettings() + { + var emissionCurve = Settings.GameplaySettings.TemperatureEmissionCurve; + return new AetheriaRuntimeDaemonRenderSettings( + new AetheriaRuntimeExponentialCurve( + emissionCurve.Exponent, + emissionCurve.Multiplier, + emissionCurve.Constant), + Settings.GameplaySettings.ConvergenceMinimumDistance); + } + private readonly (float2 direction, string name)[] _directions = { (new float2(0, 1), "Front"), (new float2(1, 0), "Right"), @@ -1915,6 +1926,7 @@ public class ActionGameManager : MonoBehaviour Settings.GameplaySettings, Debug.Log); LoadRuntimeLoadoutTemplates(stateBoot.StateFilePath); + ZoneRenderer.RenderSettings = ObservedDaemonRenderSettings(); // If hiding minimap asteroids, turn them off to start with if (!RuntimePlayerSettings.GraphicsSettings.ShowAsteroidsInMinimap) diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index 4dbf07c7e..49d0da02b 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -262,7 +262,7 @@ public class EntityInstance : MonoBehaviour foreach (var x in RadiatorMeshes) { - x.Value.material.SetFloat("_Emission", Entity.ItemManager.GameplaySettings.TemperatureEmissionCurve.Evaluate(x.Key.RadiatorTemperature)); + x.Value.material.SetFloat("_Emission", (float)ZoneRenderer.RenderSettings.TemperatureEmissionCurve.Evaluate(x.Key.RadiatorTemperature)); } foreach (var x in Barrels) @@ -276,7 +276,7 @@ public class EntityInstance : MonoBehaviour var entityLookDirection = (Vector3)AetheriaMath.ToUnity(Entity.CultLookDirection); var lookAtDistance = ZoneRenderer != null && ZoneRenderer.TryGetDaemonTargetDistance(DaemonEntityIndex, out var daemonTargetDistance) - ? Mathf.Max(daemonTargetDistance, Entity.ItemManager.GameplaySettings.ConvergenceMinimumDistance) + ? Mathf.Max(daemonTargetDistance, (float)ZoneRenderer.RenderSettings.ConvergenceMinimumDistance) : 10000; LookAtPoint.position = transform.position + entityLookDirection * lookAtDistance; diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 27994b84a..b5f88b724 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -107,6 +107,7 @@ public class ZoneRenderer : MonoBehaviour public IReadOnlyDictionary DaemonEntityInstances => _entityInstancesByDaemonIndex; public IReadOnlyList ActiveLoot => _loot; + public AetheriaRuntimeDaemonRenderSettings RenderSettings { get; set; } public Entity PerspectiveEntity { diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs index 1d4fea6a2..036599cec 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs @@ -28,6 +28,39 @@ namespace GameCult.Aetheria.State.Verse public double MaxZ { get; } } + public readonly struct AetheriaRuntimeExponentialCurve + { + public AetheriaRuntimeExponentialCurve(double exponent, double multiplier, double constant) + { + Exponent = exponent; + Multiplier = multiplier; + Constant = constant; + } + + public double Exponent { get; } + public double Multiplier { get; } + public double Constant { get; } + + public double Evaluate(double value) + { + return Multiplier * Math.Pow(value, Exponent) + Constant; + } + } + + public readonly struct AetheriaRuntimeDaemonRenderSettings + { + public AetheriaRuntimeDaemonRenderSettings( + AetheriaRuntimeExponentialCurve temperatureEmissionCurve, + double convergenceMinimumDistance) + { + TemperatureEmissionCurve = temperatureEmissionCurve; + ConvergenceMinimumDistance = convergenceMinimumDistance; + } + + public AetheriaRuntimeExponentialCurve TemperatureEmissionCurve { get; } + public double ConvergenceMinimumDistance { get; } + } + public readonly struct AetheriaRuntimeGravityInfluenceBrush { public AetheriaRuntimeGravityInfluenceBrush(