From 2b0b53f889c914920c2f5397f295ccf702cf6253 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 17:52:41 +0100 Subject: [PATCH] Resolve convergence distance from daemon target --- Aetheria.State.Verify/Program.cs | 29 +++++++++++++++++++++ Assets/Scripts/Gameplay/EntityInstance.cs | 7 +++-- Assets/Scripts/Zone Display/ZoneRenderer.cs | 15 +++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 3a1092dd9..9f10a2772 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -2038,6 +2038,8 @@ static void RequireDaemonRenderQueryAuthority(string root) "public IReadOnlyDictionary DaemonEntityInstances => _entityInstancesByDaemonIndex;", "public bool TryGetEntityInstance(int daemonEntityIndex, out EntityInstance instance)", "public bool TryGetEntityInstance(Entity entity, out EntityInstance instance)", + "public bool TryGetDaemonTargetDistance(int daemonEntityIndex, out float distance)", + "AetheriaRuntimeDaemonRenderQueries.TryQueryEntityTarget(", "foreach (var entity in EntityInstances.Keys.ToArray())", "AetheriaRuntimeDaemonRenderQueries.QueryBodyPoses(_daemonZoneSnapshot, _daemonBodyPoses);", "AetheriaRuntimeDaemonRenderQueries.QueryAsteroidBeltPoses(_daemonZoneSnapshot, _daemonAsteroidBeltPoses);", @@ -2062,6 +2064,33 @@ static void RequireDaemonRenderQueryAuthority(string root) "ZoneRenderer must lower daemon-authored gravity terrain snapshots instead of recomputing render height through Zone: " + string.Join(", ", missingZoneRendererSymbols)); } + + var entityInstancePath = Path.Combine(root, "Assets", "Scripts", "Gameplay", "EntityInstance.cs"); + var entityInstance = File.Exists(entityInstancePath) + ? File.ReadAllText(entityInstancePath) + : throw new InvalidOperationException("Cannot verify EntityInstance convergence authority; source file is missing."); + if (entityInstance.Contains("Entity.Target.Value != null ? Mathf.Max(Entity.TargetRange", StringComparison.Ordinal)) + { + throw new InvalidOperationException( + "EntityInstance convergence distance must read daemon target projection through ZoneRenderer instead of facade Entity.Target."); + } + + var requiredEntityInstanceSymbols = new[] + { + "ZoneRenderer.TryGetDaemonTargetDistance(DaemonEntityIndex, out var daemonTargetDistance)", + "Mathf.Max(daemonTargetDistance, Entity.ItemManager.GameplaySettings.ConvergenceMinimumDistance)", + "LookAtPoint.position = transform.position + entityLookDirection * lookAtDistance;" + }; + + var missingEntityInstanceSymbols = requiredEntityInstanceSymbols + .Where(symbol => !entityInstance.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (missingEntityInstanceSymbols.Length > 0) + { + throw new InvalidOperationException( + "EntityInstance no longer resolves convergence from daemon target projection: " + + string.Join(", ", missingEntityInstanceSymbols)); + } } static void RequireTypedZoneConstructionKeys(string root) diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index 2c17337b7..4dbf07c7e 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -274,9 +274,12 @@ public class EntityInstance : MonoBehaviour var entityPosition = (Vector3)AetheriaMath.ToUnity(Entity.CultPosition); var entityLookDirection = (Vector3)AetheriaMath.ToUnity(Entity.CultLookDirection); + var lookAtDistance = ZoneRenderer != null && + ZoneRenderer.TryGetDaemonTargetDistance(DaemonEntityIndex, out var daemonTargetDistance) + ? Mathf.Max(daemonTargetDistance, Entity.ItemManager.GameplaySettings.ConvergenceMinimumDistance) + : 10000; - LookAtPoint.position = transform.position + entityLookDirection * - (Entity.Target.Value != null ? Mathf.Max(Entity.TargetRange, Entity.ItemManager.GameplaySettings.ConvergenceMinimumDistance) : 10000); + LookAtPoint.position = transform.position + entityLookDirection * lookAtDistance; LocalSpace.localPosition = transform.position = entityPosition; if (_influenceInstance) _influenceInstance.position = new Vector3(entityPosition.x, 0, entityPosition.z); diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 7ff8bf8ce..d64ff6bf3 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -188,6 +188,21 @@ public class ZoneRenderer : MonoBehaviour _entityInstancesByDaemonIndex.TryGetValue(entity.DaemonEntityIndex, out instance); } + public bool TryGetDaemonTargetDistance(int daemonEntityIndex, out float distance) + { + distance = 0f; + if (!AetheriaRuntimeDaemonRenderQueries.TryQueryEntityTarget( + _daemonZoneSnapshot, + daemonEntityIndex, + out var target)) + { + return false; + } + + distance = (float)target.Distance; + return true; + } + void Start() { var bigBounds = new Bounds(Vector3.zero, Vector3.one * 1024);