From acbf6a999da7ec710c91359e9c23edb4d7d278af Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 28 Jun 2026 09:28:39 +0100 Subject: [PATCH] Use reactive viewport documents in map renderer --- Aetheria.State.Verify/Program.cs | 17 +++++- Assets/Scripts/UI/Menu/MapRenderer.cs | 33 +++++++---- .../Runtime/AetheriaClientState.cs | 56 +++++++++++++++++++ 3 files changed, 93 insertions(+), 13 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 0acaa5d04..9480f5661 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -7126,9 +7126,18 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "MapRenderer.cs")); var requiredMapRendererSharedDocumentSymbols = new[] { + "CultMeshReactiveDocument _objectsViewport", + "CultMeshReactiveDocument _renderSplatsViewport", "CultMeshReactiveDocument _playerSettings", + ".ReactiveObjects(viewport)", + ".ReactiveRenderSplats(viewport)", ".Settings", ".ReactivePlayer()", + "ClearViewportCaches()", + "_objectsViewport?.Dispose()", + "_renderSplatsViewport?.Dispose()", + "_objectsViewport?.Current", + "_renderSplatsViewport?.Current", "_playerSettings?.Dispose()", "_playerSettings?.Current", "private void OnDestroy()" @@ -7139,7 +7148,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) if (missingMapRendererSharedDocumentSymbols.Length > 0) { throw new InvalidOperationException( - "MapRenderer should bind player settings through the managed reactive Aetheria settings document: " + + "MapRenderer should bind viewport and player settings through managed reactive Aetheria documents: " + string.Join(", ", missingMapRendererSharedDocumentSymbols)); } @@ -7370,7 +7379,9 @@ static void RequireUnityViewportAndMapReadsUseManagedAccessors(string root) "public AetheriaRuntimeCurrentZoneDocument LatestZone()", "public AetheriaRuntimeCurrentEntityDocument LatestEntity()", "public AetheriaRuntimeObjectsViewportDocument LatestObjects(AetheriaRuntimeRtsViewportBounds viewport)", + "public CultMeshReactiveDocument ReactiveObjects(", "public AetheriaRuntimeRenderSplatsViewportDocument LatestRenderSplats(AetheriaRuntimeRtsViewportBounds viewport)", + "public CultMeshReactiveDocument ReactiveRenderSplats(", "public AetheriaRuntimeZoneDetailsDocument LatestZone(int zoneIndex)" }; var missingClientSymbols = requiredClientSymbols @@ -12919,8 +12930,8 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) if (!mapRenderer.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) || !mapRenderer.Contains(".Viewports", StringComparison.Ordinal) || - !mapRenderer.Contains(".LatestObjects(viewport)", StringComparison.Ordinal) || - !mapRenderer.Contains(".LatestRenderSplats(viewport)", StringComparison.Ordinal) || + !mapRenderer.Contains(".ReactiveObjects(viewport)", StringComparison.Ordinal) || + !mapRenderer.Contains(".ReactiveRenderSplats(viewport)", StringComparison.Ordinal) || !mapRenderer.Contains(".Settings", StringComparison.Ordinal) || !mapRenderer.Contains(".ReactivePlayer()", StringComparison.Ordinal) || !sectorRenderer.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) || diff --git a/Assets/Scripts/UI/Menu/MapRenderer.cs b/Assets/Scripts/UI/Menu/MapRenderer.cs index 674cef012..8112c5696 100644 --- a/Assets/Scripts/UI/Menu/MapRenderer.cs +++ b/Assets/Scripts/UI/Menu/MapRenderer.cs @@ -40,8 +40,8 @@ public class MapRenderer : MonoBehaviour private RenderTexture _mapTexture; private int2 _size; private bool _init; - private AetheriaRuntimeObjectsViewportDocument _objectsViewport; - private AetheriaRuntimeRenderSplatsViewportDocument _renderSplatsViewport; + private CultMeshReactiveDocument _objectsViewport; + private CultMeshReactiveDocument _renderSplatsViewport; private float _nextViewportRefreshTime; private readonly List _rtsIconPool = new List(); private string _clientStatePath = ""; @@ -74,6 +74,7 @@ public class MapRenderer : MonoBehaviour private void OnDisable() { + ClearViewportCaches(); if (_mapTexture != null) { ReleaseTextures(); @@ -127,18 +128,20 @@ public class MapRenderer : MonoBehaviour { var client = ResolveClient(); var viewport = ResolveViewportBounds(); + ClearViewportCaches(); _objectsViewport = client .Aetheria() .Viewports - .LatestObjects(viewport); + .ReactiveObjects(viewport); _renderSplatsViewport = client .Aetheria() .Viewports - .LatestRenderSplats(viewport); + .ReactiveRenderSplats(viewport); - var zoneName = string.IsNullOrWhiteSpace(_objectsViewport?.ZoneName) + var objectsViewport = _objectsViewport?.Current; + var zoneName = string.IsNullOrWhiteSpace(objectsViewport?.ZoneName) ? "Unknown" - : _objectsViewport.ZoneName; + : objectsViewport.ZoneName; Title.text = $"Zone: {zoneName}"; } catch (Exception ex) @@ -150,14 +153,15 @@ public class MapRenderer : MonoBehaviour private void RenderSplatLayers() { - if (_renderSplatsViewport == null) + var renderSplatsViewport = _renderSplatsViewport?.Current; + if (renderSplatsViewport == null) return; if (SplatLayerRenderer == null) SplatLayerRenderer = GetComponent() ?? gameObject.AddComponent(); - SplatLayerRenderer.Render(_renderSplatsViewport, _size.x, _size.y); + SplatLayerRenderer.Render(renderSplatsViewport, _size.x, _size.y); ApplyLayerTexture(AetheriaRuntimeRenderSplatLayerKeys.GravityHeight, GravityDisplay); ApplyLayerTexture(AetheriaRuntimeRenderSplatLayerKeys.FogTint, TintDisplay); ApplyLayerTexture(AetheriaRuntimeRenderSplatLayerKeys.Influence, InfluenceDisplay); @@ -188,7 +192,7 @@ public class MapRenderer : MonoBehaviour if (RtsIconRoot == null) return; - var objects = _objectsViewport?.Objects ?? Array.Empty(); + var objects = _objectsViewport?.Current?.Objects ?? Array.Empty(); for (var i = 0; i < objects.Count; i++) { var icon = ResolveRtsIcon(i); @@ -247,7 +251,7 @@ public class MapRenderer : MonoBehaviour private Vector2 WorldToMapPosition(double worldX, double worldY) { - var viewport = _objectsViewport?.Viewport ?? ResolveViewportBounds(); + var viewport = _objectsViewport?.Current?.Viewport ?? ResolveViewportBounds(); var minX = Math.Min(viewport.MinX, viewport.MaxX); var maxX = Math.Max(viewport.MinX, viewport.MaxX); var minY = Math.Min(viewport.MinY, viewport.MaxY); @@ -343,10 +347,19 @@ public class MapRenderer : MonoBehaviour private void ClearClientCaches() { + ClearViewportCaches(); _playerSettings?.Dispose(); _playerSettings = null; } + private void ClearViewportCaches() + { + _objectsViewport?.Dispose(); + _renderSplatsViewport?.Dispose(); + _objectsViewport = null; + _renderSplatsViewport = null; + } + private void OnDestroy() { ClearClientCaches(); diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs index 5f7b02c5b..899ed8c1a 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs @@ -750,6 +750,20 @@ namespace GameCult.Aetheria.State.Verse return LatestMapAsync(viewport).ConfigureAwait(false).GetAwaiter().GetResult(); } + public Task> ReactiveMapAsync( + AetheriaRuntimeRtsViewportBounds viewport, + CultMeshReactiveDocumentOptions? options = null) + { + return Map(viewport).ReactiveAsync(options); + } + + public CultMeshReactiveDocument ReactiveMap( + AetheriaRuntimeRtsViewportBounds viewport, + CultMeshReactiveDocumentOptions? options = null) + { + return Map(viewport).Reactive(options); + } + public CultMeshDocumentHandle Objects(AetheriaRuntimeRtsViewportBounds viewport) { return _objects(viewport ?? new AetheriaRuntimeRtsViewportBounds()); @@ -765,6 +779,20 @@ namespace GameCult.Aetheria.State.Verse return LatestObjectsAsync(viewport).ConfigureAwait(false).GetAwaiter().GetResult(); } + public Task> ReactiveObjectsAsync( + AetheriaRuntimeRtsViewportBounds viewport, + CultMeshReactiveDocumentOptions? options = null) + { + return Objects(viewport).ReactiveAsync(options); + } + + public CultMeshReactiveDocument ReactiveObjects( + AetheriaRuntimeRtsViewportBounds viewport, + CultMeshReactiveDocumentOptions? options = null) + { + return Objects(viewport).Reactive(options); + } + public CultMeshDocumentHandle Gravity(AetheriaRuntimeRtsViewportBounds viewport) { return _gravity(viewport ?? new AetheriaRuntimeRtsViewportBounds()); @@ -780,6 +808,20 @@ namespace GameCult.Aetheria.State.Verse return LatestGravityAsync(viewport).ConfigureAwait(false).GetAwaiter().GetResult(); } + public Task> ReactiveGravityAsync( + AetheriaRuntimeRtsViewportBounds viewport, + CultMeshReactiveDocumentOptions? options = null) + { + return Gravity(viewport).ReactiveAsync(options); + } + + public CultMeshReactiveDocument ReactiveGravity( + AetheriaRuntimeRtsViewportBounds viewport, + CultMeshReactiveDocumentOptions? options = null) + { + return Gravity(viewport).Reactive(options); + } + public CultMeshDocumentHandle RenderSplats(AetheriaRuntimeRtsViewportBounds viewport) { return _renderSplats(viewport ?? new AetheriaRuntimeRtsViewportBounds()); @@ -794,6 +836,20 @@ namespace GameCult.Aetheria.State.Verse { return LatestRenderSplatsAsync(viewport).ConfigureAwait(false).GetAwaiter().GetResult(); } + + public Task> ReactiveRenderSplatsAsync( + AetheriaRuntimeRtsViewportBounds viewport, + CultMeshReactiveDocumentOptions? options = null) + { + return RenderSplats(viewport).ReactiveAsync(options); + } + + public CultMeshReactiveDocument ReactiveRenderSplats( + AetheriaRuntimeRtsViewportBounds viewport, + CultMeshReactiveDocumentOptions? options = null) + { + return RenderSplats(viewport).Reactive(options); + } } public sealed class AetheriaClientDetailState