diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index cf430042d..e0c79f80f 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -2009,6 +2009,10 @@ static void RequireDaemonRenderQueryAuthority(string root) "void LoadAsteroidBelt(AetheriaRuntimeDaemonAsteroidBeltPose beltPose)", "foreach (var entitySnapshot in daemonZone?.Entities ?? Array.Empty())", "entitiesByDaemonIndex.TryGetValue(entitySnapshot.EntityIndex, out var entity)", + "private readonly Dictionary _entityInstancesByDaemonIndex", + "public IReadOnlyDictionary DaemonEntityInstances => _entityInstancesByDaemonIndex;", + "public bool TryGetEntityInstance(int daemonEntityIndex, out EntityInstance instance)", + "public bool TryGetEntityInstance(Entity entity, out EntityInstance instance)", "foreach (var entity in EntityInstances.Keys.ToArray())", "AetheriaRuntimeDaemonRenderQueries.QueryBodyPoses(_daemonZoneSnapshot, _daemonBodyPoses);", "AetheriaRuntimeDaemonRenderQueries.QueryAsteroidBeltPoses(_daemonZoneSnapshot, _daemonAsteroidBeltPoses);", @@ -2020,7 +2024,7 @@ static void RequireDaemonRenderQueryAuthority(string root) "AddWormhole(exit)", "public void AddWormhole(AetheriaRuntimeDaemonWormholeExit exit)", "private double DaemonSimulationTimeSeconds => _daemonZoneSnapshot?.SimulationTimeSeconds ?? 0;", - "_daemonCompassMarkersByEntityIndex.TryGetValue(entityInstance.Entity.DaemonEntityIndex, out var marker)", + "_daemonCompassMarkersByEntityIndex.TryGetValue(entityInstance.DaemonEntityIndex, out var marker)", "_daemonBodyPosesByBodyKey.TryGetValue(planet.Key, out var pose)", "pose.GravityWaveSpeed" }; diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index fd20c0247..cdfe17b5d 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -3093,7 +3093,13 @@ public class ActionGameManager : MonoBehaviour DockCamera.enabled = true; FollowCamera.enabled = false; var orbital = (OrbitalEntity) entity; - DockCamera.Follow = ZoneRenderer.EntityInstances[orbital].transform; + if (!ZoneRenderer.TryGetEntityInstance(orbital, out var orbitalInstance)) + { + Debug.LogError($"Attempted to dock at entity {entity.Name}, but ZoneRenderer has no daemon-indexed instance."); + return; + } + + DockCamera.Follow = orbitalInstance.transform; var parentOrbitKey = Zone.TryGetOrbit(orbital.OrbitKey, out var orbit) ? orbit.ParentOrbitKey : ""; var daemonZone = FindCurrentDaemonZoneSnapshot(); var parentOrbitPlanetBodyKey = (daemonZone?.Bodies ?? Array.Empty()) @@ -3178,9 +3184,9 @@ public class ActionGameManager : MonoBehaviour Entity entity, IReadOnlyList actionBarBindings = null) { - if (!ZoneRenderer.EntityInstances.ContainsKey(entity)) + if (!ZoneRenderer.TryGetEntityInstance(entity, out var entityInstance)) { - Debug.LogError($"Attempted to bind to entity {entity.Name}, but SectorRenderer has no such instance!"); + Debug.LogError($"Attempted to bind to entity {entity.Name}, but ZoneRenderer has no daemon-indexed instance."); return; } @@ -3204,17 +3210,17 @@ public class ActionGameManager : MonoBehaviour ShipPanel.Display(CurrentEntity, true); SchematicDisplay.ShowShip(CurrentEntity); - FollowCamera.LookAt = ZoneRenderer.EntityInstances[CurrentEntity].LookAtPoint; - FollowCamera.Follow = ZoneRenderer.EntityInstances[CurrentEntity].transform; + FollowCamera.LookAt = entityInstance.LookAtPoint; + FollowCamera.Follow = entityInstance.transform; _articulationGroups = CurrentEntity.Equipment .Where(HasArticulatedWeaponBehavior) - .GroupBy(item => ZoneRenderer.EntityInstances[CurrentEntity] + .GroupBy(item => entityInstance .GetBarrel(CurrentEntity.Hardpoints[item.Position.x, item.Position.y]) .GetComponentInParent()?.Group ?? -1) .Select((group, index) => { return ( group.Select(item => CurrentEntity.Hardpoints[item.Position.x, item.Position.y]).ToArray(), - group.Select(item => ZoneRenderer.EntityInstances[CurrentEntity].GetBarrel(CurrentEntity.Hardpoints[item.Position.x, item.Position.y])).ToArray(), + group.Select(item => entityInstance.GetBarrel(CurrentEntity.Hardpoints[item.Position.x, item.Position.y])).ToArray(), Crosshairs[index] ); }).ToArray(); @@ -3974,7 +3980,10 @@ public class ActionGameManager : MonoBehaviour { if (CurrentEntity == null || CurrentEntity.Parent != null) return; - ViewDot.Target = ZoneRenderer.EntityInstances[CurrentEntity].LookAtPoint.position; + if (!ZoneRenderer.TryGetEntityInstance(CurrentEntity, out var entityInstance)) + return; + + ViewDot.Target = entityInstance.LookAtPoint.position; if (CurrentEntity.Target.Value != null) TargetIndicator.Target = CurrentEntity.Target.Value.Position; var distance = CultMath.math.length(AetheriaMath.ToCult((float3)ViewDot.Target) - CurrentEntity.CultPosition); diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index 2772c5a32..2c17337b7 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -56,6 +56,7 @@ public class EntityInstance : MonoBehaviour public Dictionary BarrelIndices { get; private set; } public Dictionary RadiatorMeshes { get; private set; } public Transform LookAtPoint { get; private set; } + public int DaemonEntityIndex { get; private set; } = -1; public Entity Entity { get; private set; } public ZoneRenderer ZoneRenderer { get; private set; } public Transform LocalSpace { get; private set; } @@ -153,6 +154,7 @@ public class EntityInstance : MonoBehaviour LocalSpace.gameObject.name = $"{entity.Name} Sim Space"; LocalSpace.SetParent(transform.parent); Entity = entity; + DaemonEntityIndex = entity.DaemonEntityIndex; ZoneRenderer = zoneRenderer; var typedHull = FindTypedHull(entity.Hull); if (typedHull == null || typedHull.ShapeWidth <= 0 || typedHull.ShapeHeight <= 0 || typedHull.ShapeCells.Count == 0) diff --git a/Assets/Scripts/Gameplay/Physics/AetheriaYmirPhysicsBridge.cs b/Assets/Scripts/Gameplay/Physics/AetheriaYmirPhysicsBridge.cs index 419ccb168..e72176a4a 100644 --- a/Assets/Scripts/Gameplay/Physics/AetheriaYmirPhysicsBridge.cs +++ b/Assets/Scripts/Gameplay/Physics/AetheriaYmirPhysicsBridge.cs @@ -494,7 +494,7 @@ public sealed class AetheriaYmirPhysicsBridge : MonoBehaviour { _zoneBodies.Clear(); var entityIndex = 0; - foreach (var entityInstance in zoneRenderer.EntityInstances.Values) + foreach (var entityInstance in zoneRenderer.DaemonEntityInstances.Values) { if (entityInstance == null || entityInstance.Entity == sourceEntity) continue; diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 0baab5a9b..63e1585ed 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -67,6 +67,7 @@ public class ZoneRenderer : MonoBehaviour [HideInInspector] public Dictionary EntityInstances = new Dictionary(); [HideInInspector] public Dictionary Planets = new Dictionary(StringComparer.Ordinal); + private readonly Dictionary _entityInstancesByDaemonIndex = new Dictionary(); private Dictionary _beltObjects = new Dictionary(StringComparer.Ordinal); private Dictionary _beltMeshes = new Dictionary(StringComparer.Ordinal); private Dictionary _beltMatrices = new Dictionary(StringComparer.Ordinal); @@ -105,6 +106,7 @@ public class ZoneRenderer : MonoBehaviour private List _loot = new List(); public Zone Zone { get; private set; } + public IReadOnlyDictionary DaemonEntityInstances => _entityInstancesByDaemonIndex; public IReadOnlyList ActiveLoot => _loot; public ItemManager ItemManager { get; set; } @@ -115,7 +117,7 @@ public class ZoneRenderer : MonoBehaviour { _perspectiveEntity = value; _visibleDaemonEntityIndices.Clear(); - foreach (var entity in EntityInstances.Values) + foreach (var entity in _entityInstancesByDaemonIndex.Values) entity.FadeOut(EntityFadeTime); RefreshDaemonVisibleEntityInstances(); } @@ -164,10 +166,23 @@ public class ZoneRenderer : MonoBehaviour public void SetIconSize(float size) { - foreach(var entityInstance in EntityInstances.Values) entityInstance.MapIcon.transform.localScale = Vector3.one * size; + foreach(var entityInstance in _entityInstancesByDaemonIndex.Values) entityInstance.MapIcon.transform.localScale = Vector3.one * size; foreach(var planet in Planets.Values) planet.Icon.transform.localScale = Vector3.one * size; } + public bool TryGetEntityInstance(int daemonEntityIndex, out EntityInstance instance) + { + return _entityInstancesByDaemonIndex.TryGetValue(daemonEntityIndex, out instance); + } + + public bool TryGetEntityInstance(Entity entity, out EntityInstance instance) + { + instance = null; + return entity != null && + entity.DaemonEntityIndex >= 0 && + _entityInstancesByDaemonIndex.TryGetValue(entity.DaemonEntityIndex, out instance); + } + void Start() { var bigBounds = new Bounds(Vector3.zero, Vector3.one * 1024); @@ -271,6 +286,7 @@ public class ZoneRenderer : MonoBehaviour Debug.Log($"Unloading entity {entity.Name} from rendered entity instances during clear."); UnloadEntity(entity); } + _entityInstancesByDaemonIndex.Clear(); if (Planets.Count > 0) { @@ -329,6 +345,8 @@ public class ZoneRenderer : MonoBehaviour instance.SetEntity(this, entity); EntityInstances.Add(entity, instance); + if (entity.DaemonEntityIndex >= 0) + _entityInstancesByDaemonIndex[entity.DaemonEntityIndex] = instance; } public void UnloadEntity(Entity entity) @@ -347,6 +365,8 @@ public class ZoneRenderer : MonoBehaviour Destroy(instance.gameObject); EntityInstances.Remove(entity); + if (entity.DaemonEntityIndex >= 0) + _entityInstancesByDaemonIndex.Remove(entity.DaemonEntityIndex); } void LoadAsteroidBelt(AetheriaRuntimeDaemonAsteroidBeltPose beltPose) @@ -592,12 +612,12 @@ public class ZoneRenderer : MonoBehaviour else planet.Value.Body.transform.rotation *= Quaternion.AngleAxis(Settings.PlanetRotationSpeed, Vector3.up); } - foreach (var entityInstance in EntityInstances.Values) + foreach (var entityInstance in _entityInstancesByDaemonIndex.Values) { if(entityInstance.CompassIcon) { - var active = entityInstance.Entity != null && - _daemonCompassMarkersByEntityIndex.TryGetValue(entityInstance.Entity.DaemonEntityIndex, out var marker); + var active = entityInstance.DaemonEntityIndex >= 0 && + _daemonCompassMarkersByEntityIndex.TryGetValue(entityInstance.DaemonEntityIndex, out var marker); entityInstance.CompassIcon.gameObject.SetActive(active); if (active) { @@ -676,9 +696,9 @@ public class ZoneRenderer : MonoBehaviour foreach (var entityIndex in _daemonVisibleEntityIndices) _daemonVisibleEntityIndicesSet.Add(entityIndex); - foreach (var entityInstance in EntityInstances.Values) + foreach (var entityInstance in _entityInstancesByDaemonIndex.Values) { - var entityIndex = entityInstance.Entity?.DaemonEntityIndex ?? -1; + var entityIndex = entityInstance.DaemonEntityIndex; var shouldBeVisible = entityIndex >= 0 && _daemonVisibleEntityIndicesSet.Contains(entityIndex); var isVisible = entityIndex >= 0 && _visibleDaemonEntityIndices.Contains(entityIndex); if (shouldBeVisible && !isVisible)