Hide ZoneRenderer body view cache

This commit is contained in:
Meta Vens 2026-06-21 17:19:22 +01:00
commit 16002d83a0
3 changed files with 25 additions and 13 deletions

View file

@ -1724,6 +1724,7 @@ static void RequireTypedZoneRuntimeCollections(string root)
"_beltMeshes[runtimeBelt.ID] =",
"_beltObjects[runtimeBelt.ID] =",
"Planets[planetInstance.ID] = planet;",
"public Dictionary<string, PlanetObject> Planets",
"private readonly List<AetheriaGravityInfluenceBrush> _visibleGravityBrushes",
"public IReadOnlyList<AetheriaGravityInfluenceBrush> VisibleGravityBrushes",
"Zone.QueryGravityInfluenceBrushes(viewportMin, viewportMax, _visibleGravityBrushes);"
@ -1755,13 +1756,14 @@ static void RequireTypedZoneRuntimeCollections(string root)
var requiredRendererSymbols = new[]
{
"public Dictionary<string, PlanetObject> Planets = new Dictionary<string, PlanetObject>(StringComparer.Ordinal);",
"private readonly Dictionary<string, PlanetObject> _bodyViewsByBodyKey = new Dictionary<string, PlanetObject>(StringComparer.Ordinal);",
"public bool TryGetBodyView(string bodyKey, out PlanetObject bodyView)",
"private Dictionary<string, AsteroidBeltUI> _beltObjects = new Dictionary<string, AsteroidBeltUI>(StringComparer.Ordinal);",
"private Dictionary<string, InstancedMesh[]> _beltMeshes = new Dictionary<string, InstancedMesh[]>(StringComparer.Ordinal);",
"private Dictionary<string, Matrix4x4[][]> _beltMatrices = new Dictionary<string, Matrix4x4[][]>(StringComparer.Ordinal);",
"_beltMeshes[bodyKey] = meshes.ToArray();",
"_beltObjects[bodyKey] = belt;",
"Planets[bodyKey] = planet;"
"_bodyViewsByBodyKey[bodyKey] = planet;"
};
var missingRendererSymbols = requiredRendererSymbols
.Where(symbol => !zoneRenderer.Contains(symbol, StringComparison.Ordinal))
@ -1908,7 +1910,8 @@ static void RequireDaemonRenderQueryAuthority(string root)
}
if (zoneRenderer.Contains("public Zone Zone", StringComparison.Ordinal) ||
zoneRenderer.Contains("public void LoadZone(", StringComparison.Ordinal))
zoneRenderer.Contains("public void LoadZone(", StringComparison.Ordinal) ||
zoneRenderer.Contains("public Dictionary<string, PlanetObject> Planets", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"ZoneRenderer must expose daemon-view rendering concepts instead of public mirrored Zone ownership.");
@ -1993,6 +1996,8 @@ static void RequireDaemonRenderQueryAuthority(string root)
"private AetheriaRuntimeZoneSnapshotCommit _daemonZoneSnapshot;",
"private readonly List<AetheriaRuntimeDaemonBodyPose> _daemonBodyPoses",
"private readonly Dictionary<string, AetheriaRuntimeDaemonBodyPose> _daemonBodyPosesByBodyKey",
"private readonly Dictionary<string, PlanetObject> _bodyViewsByBodyKey",
"public bool TryGetBodyView(string bodyKey, out PlanetObject bodyView)",
"private readonly List<AetheriaRuntimeDaemonAsteroidBeltPose> _daemonAsteroidBeltPoses",
"private readonly List<AetheriaRuntimeDaemonCompassMarker> _daemonCompassMarkers",
"private readonly Dictionary<int, AetheriaRuntimeDaemonCompassMarker> _daemonCompassMarkersByEntityIndex",
@ -7904,6 +7909,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root)
"PopulateLevel(TowingStation.Zone.GalaxyZone)",
"Zone.PlanetInstances.Values.FirstOrDefault",
"Zone.TryGetOrbit(orbital.OrbitKey",
"ZoneRenderer.Planets",
"RestoreDaemonAsteroidRuntimeState",
"belt.Damage.Clear()",
"belt.RespawnTimers.Clear()",
@ -7943,6 +7949,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root)
"CreateDaemonEntitySnapshots(runId, daemonZone)",
"FindCurrentDaemonZoneSnapshot()",
"daemonZone?.Orbits ?? Array.Empty<AetheriaRuntimeOrbitSnapshotCommit>()",
"ZoneRenderer.TryGetBodyView(parentOrbitPlanetBodyKey, out var parentBodyView)",
"ResolveDaemonObserver()?.LastObservedState?.Run",
"ReplaceZoneEntitiesFromTypedSnapshots",
"EntityConstructionBlueprintProjector.ProjectObservedFromBlueprint",

View file

@ -3122,8 +3122,8 @@ public class ActionGameManager : MonoBehaviour
var parentOrbitPlanetBodyKey = (daemonZone?.Bodies ?? Array.Empty<AetheriaRuntimeBodySnapshotCommit>())
.FirstOrDefault(body => body != null && string.Equals(body.OrbitKey ?? "", parentOrbitKey, StringComparison.Ordinal))
?.BodyKey ?? "";
if (ZoneRenderer.Planets.ContainsKey(parentOrbitPlanetBodyKey))
DockCamera.LookAt = ZoneRenderer.Planets[parentOrbitPlanetBodyKey].Body.transform;
if (ZoneRenderer.TryGetBodyView(parentOrbitPlanetBodyKey, out var parentBodyView))
DockCamera.LookAt = parentBodyView.Body.transform;
else DockCamera.LookAt = ZoneRenderer.ZoneRoot;
if (entity is OrbitalEntity {CanTow: true})
TowingStation = entity;

View file

@ -65,9 +65,9 @@ public class ZoneRenderer : MonoBehaviour
public Sprite WormholeIcon;
[HideInInspector] public Dictionary<Entity, EntityInstance> EntityInstances = new Dictionary<Entity, EntityInstance>();
[HideInInspector] public Dictionary<string, PlanetObject> Planets = new Dictionary<string, PlanetObject>(StringComparer.Ordinal);
private readonly Dictionary<int, EntityInstance> _entityInstancesByDaemonIndex = new Dictionary<int, EntityInstance>();
private readonly Dictionary<string, PlanetObject> _bodyViewsByBodyKey = new Dictionary<string, PlanetObject>(StringComparer.Ordinal);
private Dictionary<string, AsteroidBeltUI> _beltObjects = new Dictionary<string, AsteroidBeltUI>(StringComparer.Ordinal);
private Dictionary<string, InstancedMesh[]> _beltMeshes = new Dictionary<string, InstancedMesh[]>(StringComparer.Ordinal);
private Dictionary<string, Matrix4x4[][]> _beltMatrices = new Dictionary<string, Matrix4x4[][]>(StringComparer.Ordinal);
@ -167,7 +167,12 @@ public class ZoneRenderer : MonoBehaviour
public void SetIconSize(float 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;
foreach(var planet in _bodyViewsByBodyKey.Values) planet.Icon.transform.localScale = Vector3.one * size;
}
public bool TryGetBodyView(string bodyKey, out PlanetObject bodyView)
{
return _bodyViewsByBodyKey.TryGetValue(bodyKey ?? "", out bodyView);
}
public bool TryGetEntityInstance(int daemonEntityIndex, out EntityInstance instance)
@ -223,7 +228,7 @@ public class ZoneRenderer : MonoBehaviour
}
}
_suns = Planets.Values.Where(p => p is SunObject).ToArray();
_suns = _bodyViewsByBodyKey.Values.Where(p => p is SunObject).ToArray();
var entitiesByDaemonIndex = new Dictionary<int, Entity>();
foreach (var entity in legacyEntityFacadeZone.Entities)
@ -295,14 +300,14 @@ public class ZoneRenderer : MonoBehaviour
}
_entityInstancesByDaemonIndex.Clear();
if (Planets.Count > 0)
if (_bodyViewsByBodyKey.Count > 0)
{
foreach (var planet in Planets.Values)
foreach (var planet in _bodyViewsByBodyKey.Values)
{
DestroyImmediate(planet.gameObject);
}
Planets.Clear();
_bodyViewsByBodyKey.Clear();
foreach (var beltObject in _beltObjects.Values)
{
Destroy(beltObject.Filter);
@ -470,7 +475,7 @@ public class ZoneRenderer : MonoBehaviour
planet.Icon.transform.localScale = Settings.IconSize.Evaluate(mass) * Vector3.one;
Planets[bodyKey] = planet;
_bodyViewsByBodyKey[bodyKey] = planet;
if (!_rootFound)
{
_rootFound = true;
@ -594,7 +599,7 @@ public class ZoneRenderer : MonoBehaviour
_beltObjects[key].Update(_visibleAsteroidInstancePoses, center, height, (float)beltPose.Radius);
}
foreach (var planet in Planets)
foreach (var planet in _bodyViewsByBodyKey)
{
if (!_daemonBodyPosesByBodyKey.TryGetValue(planet.Key, out var pose))
continue;