diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index bcb12dffc..c73bbac7b 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -10970,9 +10970,7 @@ static void RequireMainMenuContinueRunState(string root) { "public sealed class AetheriaUnityObservedFrameApplier", "public bool ApplyLatestZoneRender()", - ".Aetheria()", - ".ZoneRender", - ".LatestAsync()", + "observer.LastObservedState?.ZoneRender", "private bool TryRestoreEntityGraphFromZoneRender(", "if (string.IsNullOrWhiteSpace(render.RunId))", "Aetheria zone-render feed does not identify a run id.", @@ -11826,9 +11824,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) { "public sealed class AetheriaUnityObservedFrameApplier", "public bool ApplyLatestZoneRender()", - ".Aetheria()", - ".ZoneRender", - ".LatestAsync()", + "observer.LastObservedState?.ZoneRender", "private bool TryRestoreEntityGraphFromZoneRender(", "AetheriaUnityDaemonEntitySnapshotProjector.CreateSnapshots(runId, render.ZoneIndex, render.EntitySnapshots)", "AetheriaUnityDaemonEntitySnapshotProjector.EntityIndexFromRecordKey(entity.RecordKey)", @@ -13770,9 +13766,9 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) if (!observedFrameApplier.Contains("private AetheriaRuntimeZoneRenderDocument _lastZoneRender;", StringComparison.Ordinal) || !observedFrameApplier.Contains("ApplyLatestZoneRender()", StringComparison.Ordinal) || - !observedFrameApplier.Contains(".Aetheria()", StringComparison.Ordinal) || - !observedFrameApplier.Contains(".ZoneRender", StringComparison.Ordinal) || - !observedFrameApplier.Contains(".LatestAsync()", StringComparison.Ordinal)) + !observedFrameApplier.Contains("observer.LastObservedState?.ZoneRender", StringComparison.Ordinal) || + !observedDaemonState.Contains("public AetheriaRuntimeZoneRenderDocument ZoneRender { get; }", StringComparison.Ordinal) || + !observedDaemonState.Contains("ZoneRender = zoneRender ?? AetheriaRuntimeRtsProjection.ProjectZoneRender(Frame);", StringComparison.Ordinal)) { throw new InvalidOperationException( "Observed zone-render state acquisition must live behind AetheriaUnityObservedFrameApplier."); diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 97275401a..0ff6c6611 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -65,13 +65,7 @@ public class ActionGameManager : MonoBehaviour SetCurrentEntity = entity => CurrentEntity = entity, GetViewDirection = () => _viewDirection, SetViewDirection = direction => _viewDirection = direction, - ResolveZoneRender = () => ResolveDaemonObserver() - ?.Client - ?.Aetheria() - .ZoneRender - .LatestAsync() - .GetAwaiter() - .GetResult(), + ResolveZoneRender = () => ResolveDaemonObserver()?.LastObservedState?.ZoneRender, ApplyActionBarBindings = ActionBarBindings.ApplyBindings, EnablePlayerInput = EnablePlayerInput, DisablePlayerInput = DisablePlayerInput, diff --git a/Assets/Scripts/Gameplay/AetheriaUnityObservedFrameApplier.cs b/Assets/Scripts/Gameplay/AetheriaUnityObservedFrameApplier.cs index 0a28f41f9..412158ca1 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityObservedFrameApplier.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityObservedFrameApplier.cs @@ -60,7 +60,7 @@ public sealed class AetheriaUnityObservedFrameApplier return false; } - var render = ReadLatestZoneRender(observer); + var render = observer.LastObservedState?.ZoneRender; if (render == null) { return false; @@ -69,24 +69,6 @@ public sealed class AetheriaUnityObservedFrameApplier return TryRestoreEntityGraphFromZoneRender(render); } - private AetheriaRuntimeZoneRenderDocument ReadLatestZoneRender(AetheriaDaemonObserver observer) - { - try - { - return observer.Client - .Aetheria() - .ZoneRender - .LatestAsync() - .GetAwaiter() - .GetResult(); - } - catch (Exception ex) - { - _logWarning($"Failed to read Aetheria zone-render feed from local Verse state: {ex.Message}"); - return null; - } - } - private bool TryRestoreEntityGraphFromZoneRender(AetheriaRuntimeZoneRenderDocument render) { if (render == null || render.ZoneIndex < 0) @@ -148,6 +130,8 @@ public sealed class AetheriaUnityObservedFrameApplier zoneRenderer?.ApplyZoneRender(render); zoneRenderer?.RestoreDroppedPickupsFromZoneRender(render); _lastAppliedZoneRenderFrameId = render.FrameId; + _lastAppliedZoneRenderRunId = runId; + _lastAppliedZoneRenderZoneIndex = render.ZoneIndex; _lastZoneRender = render; return true; } diff --git a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs index 3fc1026fe..7b0c54abf 100644 --- a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs +++ b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs @@ -2179,6 +2179,10 @@ public class DaemonRuntimeDocumentTests Assert.AreEqual("daemon-run", observed.Run.RunId); Assert.AreEqual("entity:observer-target", observed.Run.CurrentEntityKey); Assert.AreEqual(300, observed.Frame.FrameId); + Assert.AreEqual(AetheriaRuntimeDaemonSchemas.ZoneRender, observed.ZoneRender.Schema); + Assert.AreEqual(300, observed.ZoneRender.FrameId); + Assert.AreEqual("daemon-run", observed.ZoneRender.RunId); + Assert.AreEqual("entity:observer-target", observed.ZoneRender.CurrentEntityKey); Assert.AreEqual(301, observed.SoaView.Generation); Assert.IsFalse(observed.SoaView.Buffers[0].ObserverWritable); } @@ -2222,6 +2226,10 @@ public class DaemonRuntimeDocumentTests Assert.AreEqual("daemon-frame-only-run", observed.Run.RunId); Assert.AreEqual("entity:frame-only-target", observed.Run.CurrentEntityKey); Assert.AreEqual(301, observed.Frame.FrameId); + Assert.AreEqual(AetheriaRuntimeDaemonSchemas.ZoneRender, observed.ZoneRender.Schema); + Assert.AreEqual(301, observed.ZoneRender.FrameId); + Assert.AreEqual("daemon-frame-only-run", observed.ZoneRender.RunId); + Assert.AreEqual("entity:frame-only-target", observed.ZoneRender.CurrentEntityKey); } [Test] diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDaemonState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDaemonState.cs index 476081657..7d990db89 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDaemonState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDaemonState.cs @@ -10,16 +10,19 @@ namespace GameCult.Aetheria.State.Verse { public AetheriaRuntimeObservedDaemonState( AetheriaRuntimeDaemonFrameDocument frame, - AetheriaRuntimeDaemonSoaViewDocument? soaView) + AetheriaRuntimeDaemonSoaViewDocument? soaView, + AetheriaRuntimeZoneRenderDocument? zoneRender = null) { Frame = frame ?? throw new ArgumentNullException(nameof(frame)); SoaView = soaView; SoaIndex = AetheriaRuntimeDaemonSoaViewIndex.Build(soaView); + ZoneRender = zoneRender ?? AetheriaRuntimeRtsProjection.ProjectZoneRender(Frame); } public AetheriaRuntimeDaemonFrameDocument Frame { get; } public AetheriaRuntimeDaemonSoaViewDocument? SoaView { get; } public AetheriaRuntimeDaemonSoaViewIndex SoaIndex { get; } + public AetheriaRuntimeZoneRenderDocument ZoneRender { get; } public bool HasSoaView => SoaView != null && SoaIndex.IsValid; public bool IsAuthoritative => Frame.IsAuthoritative; public AetheriaRuntimeRunCheckpointCommit Run => Frame.Run;