GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove Unity zone facade from renderer pickups

Browse source
This commit is contained in:
Meta Vens 2026-06-21 18:10:37 +01:00
commit 3dee07ddcd
5 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Aetheria.State.Verify/Program.cs
View file

@ -1985,10 +1985,13 @@ static void RequireDaemonRenderQueryAuthority(string root)
}
if (zoneRenderer.Contains("_legacyEntityFacadeZone", StringComparison.Ordinal) ||
zoneRenderer.Contains("_legacyEntityFacadeZone?.Radius", StringComparison.Ordinal))
zoneRenderer.Contains("_legacyEntityFacadeZone?.Radius", StringComparison.Ordinal) ||
zoneRenderer.Contains("_legacyLootFacadeZone", StringComparison.Ordinal) ||
zoneRenderer.Contains("Zone legacyLootFacadeZone", StringComparison.Ordinal) ||
zoneRenderer.Contains("gridObject.Zone = ", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"ZoneRenderer must not keep a broad Unity Zone facade; only explicitly scoped compatibility handles may remain.");
"ZoneRenderer must not keep Unity Zone facade handles; daemon snapshots and observed facade projections own renderer input.");
}
if (zoneRenderer.Contains("PerspectiveEntity.EntityInfoGathered", StringComparison.Ordinal))
@ -2025,9 +2028,7 @@ static void RequireDaemonRenderQueryAuthority(string root)
"private readonly HashSet<int> _visibleDaemonEntityIndices",
"private readonly List<AetheriaRuntimeDaemonWormholeExit> _daemonWormholeExits",
"public Dictionary<int, (GameObject gravity, CompassIcon icon)> WormholeInstances",
"private Zone _legacyLootFacadeZone;",
"public void LoadDaemonZoneView(",
"Zone legacyLootFacadeZone,",
"IReadOnlyDictionary<int, Entity> observedEntityFacadesByDaemonIndex,",
"AetheriaRuntimeRunCheckpointCommit daemonRun = null",
"public void ApplyDaemonFrame(",
@ -2066,7 +2067,6 @@ static void RequireDaemonRenderQueryAuthority(string root)
"AddWormhole(exit)",
"public void AddWormhole(AetheriaRuntimeDaemonWormholeExit exit)",
"private double DaemonSimulationTimeSeconds => _daemonZoneSnapshot?.SimulationTimeSeconds ?? 0;",
"gridObject.Zone = _legacyLootFacadeZone;",
"_daemonCompassMarkersByEntityIndex.TryGetValue(entityInstance.DaemonEntityIndex, out var marker)",
"_daemonBodyPosesByBodyKey.TryGetValue(planet.Key, out var pose)",
"pose.GravityWaveSpeed"
@ -7773,7 +7773,7 @@ static void RequireMainMenuContinueRunState(string root)
"_observedEntityFacadesByRecordKey",
"_observedEntityFacadesByDaemonIndex",
"RebuildObservedEntityFacadeIndex();",
"ZoneRenderer.LoadDaemonZoneView(Zone, _observedEntityFacadesByDaemonIndex, daemonZone, daemonRun)",
"ZoneRenderer.LoadDaemonZoneView(_observedEntityFacadesByDaemonIndex, daemonZone, daemonRun)",
"entity.RestoreStatGrids(entitySnapshot.StatGrids)",
"RestoreThermalExposure((float)entitySnapshot.Heatstroke, (float)entitySnapshot.Hypothermia)",
"entity.HeatsinksEnabled = entitySnapshot.HeatsinksEnabled",
@ -8031,7 +8031,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root)
"observed.IsAuthoritative",
"TryRestoreEntityGraphFromDaemonRun(observed.Run)",
"CreateDaemonZoneConstructionBlueprint(daemonZone)",
"ZoneRenderer.LoadDaemonZoneView(Zone, _observedEntityFacadesByDaemonIndex, daemonZone, daemonRun)",
"ZoneRenderer.LoadDaemonZoneView(_observedEntityFacadesByDaemonIndex, daemonZone, daemonRun)",
"ZoneRenderer?.ApplyDaemonFrame(daemonZone, run)",
"CreateDaemonEntitySnapshots(runId, daemonZone)",
"FindCurrentDaemonZoneSnapshot()",

2
Assets/Scripts/Gameplay/ActionGameManager.cs
View file

@ -2098,7 +2098,7 @@ public class ActionGameManager : MonoBehaviour
Zone.Log = s => Debug.Log($"Zone: {s}");
ZoneRenderer.LoadDaemonZoneView(Zone, _observedEntityFacadesByDaemonIndex, daemonZone, daemonRun);
ZoneRenderer.LoadDaemonZoneView(_observedEntityFacadesByDaemonIndex, daemonZone, daemonRun);
if (CurrentEntity != null)
{

1
Assets/Scripts/Gameplay/GridObject.cs
View file

@ -13,7 +13,6 @@ public class GridObject : MonoBehaviour
private float _timeOffset;
public Zone Zone { get; set; }
public Vector3 Velocity { get; set; }
private void Start()

1
Assets/Scripts/Gameplay/Weapons/MineManager.cs
View file

@ -24,6 +24,5 @@ public class MineManager : InstantWeaponEffectManager
p.Damage = weapon.Damage;
p.Range = weapon.Range;
p.DamageType = weapon.DamageType;
p.GridObject.Zone = source.Entity.Zone;
}
}

4
Assets/Scripts/Zone Display/ZoneRenderer.cs
View file

@ -105,7 +105,6 @@ public class ZoneRenderer : MonoBehaviour
public Dictionary<int, (GameObject gravity, CompassIcon icon)> WormholeInstances = new Dictionary<int, (GameObject, CompassIcon)>();
private List<ItemPickup> _loot = new List<ItemPickup>();
private Zone _legacyLootFacadeZone;
public IReadOnlyDictionary<int, EntityInstance> DaemonEntityInstances => _entityInstancesByDaemonIndex;
public IReadOnlyList<ItemPickup> ActiveLoot => _loot;
public ItemManager ItemManager { get; set; }
@ -215,13 +214,11 @@ public class ZoneRenderer : MonoBehaviour
}
public void LoadDaemonZoneView(
Zone legacyLootFacadeZone,
IReadOnlyDictionary<int, Entity> observedEntityFacadesByDaemonIndex,
AetheriaRuntimeZoneSnapshotCommit daemonZone = null,
AetheriaRuntimeRunCheckpointCommit daemonRun = null)
{
ClearZone();
_legacyLootFacadeZone = legacyLootFacadeZone;
ApplyDaemonFrame(daemonZone, daemonRun);
RefreshDaemonBodyPoses();
RefreshDaemonAsteroidBeltPoses();
@ -763,7 +760,6 @@ public class ZoneRenderer : MonoBehaviour
};
var t = gridObject.transform;
t.parent = ZoneRoot;
gridObject.Zone = _legacyLootFacadeZone;
t.position = position;
gridObject.Velocity = velocity;
var itemPickup = gridObject.gameObject.GetComponent<ItemPickup>();