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

Centralize viewport render state sessions

Browse source
This commit is contained in:
Meta Vens 2026-06-28 14:08:53 +01:00
commit a96fdc66bc
6 changed files with 104 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7381,13 +7381,13 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root)
"MapRenderer.cs"));
var requiredMapRendererSharedDocumentSymbols = new[]
{
"CultMeshReactiveDocument<AetheriaRuntimeObjectsViewportDocument> _objectsViewport",
"CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> _renderSplatsViewport",
"CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettings",
".ReactiveObjects(viewport)",
".ReactiveRenderSplats(viewport)",
"AetheriaRuntimeObjectsViewportSession _objectsViewport",
"AetheriaRuntimeRenderSplatsViewportSession _renderSplatsViewport",
"AetheriaRuntimePlayerSettingsSession _playerSettings",
".ObserveObjects(viewport)",
".ObserveRenderSplats(viewport)",
".Settings",
".ReactivePlayer()",
".ObservePlayer()",
"ClearViewportCaches()",
"_objectsViewport?.Dispose()",
"_renderSplatsViewport?.Dispose()",
@ -7407,6 +7407,25 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root)
string.Join(", ", missingMapRendererSharedDocumentSymbols));
}
var forbiddenMapRendererSharedDocumentSymbols = new[]
{
"CultMeshReactiveDocument<AetheriaRuntimeObjectsViewportDocument> _objectsViewport",
"CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> _renderSplatsViewport",
"CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettings",
".ReactiveObjects(viewport)",
".ReactiveRenderSplats(viewport)",
".ReactivePlayer()"
};
var mapRendererRawDocumentHits = forbiddenMapRendererSharedDocumentSymbols
.Where(symbol => mapRenderer.Contains(symbol, StringComparison.Ordinal))
.ToArray();
if (mapRendererRawDocumentHits.Length > 0)
{
throw new InvalidOperationException(
"MapRenderer still owns raw viewport/settings CultMesh documents instead of managed sessions: " +
string.Join(", ", mapRendererRawDocumentHits));
}
var mainMenu = File.ReadAllText(Path.Combine(
root,
"Assets",
@ -7647,8 +7666,10 @@ static void RequireUnityViewportAndMapReadsUseManagedAccessors(string root)
"public AetheriaRuntimeCurrentEntityDocument LatestEntity()",
"public AetheriaRuntimeObjectsViewportDocument LatestObjects(AetheriaRuntimeRtsViewportBounds viewport)",
"public CultMeshReactiveDocument<AetheriaRuntimeObjectsViewportDocument> ReactiveObjects(",
"public AetheriaRuntimeObjectsViewportSession ObserveObjects(",
"public AetheriaRuntimeRenderSplatsViewportDocument LatestRenderSplats(AetheriaRuntimeRtsViewportBounds viewport)",
"public CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> ReactiveRenderSplats(",
"public AetheriaRuntimeRenderSplatsViewportSession ObserveRenderSplats(",
"public AetheriaRuntimeZoneDetailsDocument LatestZone(int zoneIndex)"
};
var missingClientSymbols = requiredClientSymbols
@ -7717,8 +7738,8 @@ static void RequireUnityViewportAndMapReadsUseManagedAccessors(string root)
"AetheriaUnityRenderSplatViewportSource.cs"));
var requiredRenderSplatViewportSourceSymbols = new[]
{
"CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> _renderSplatsViewport",
".ReactiveRenderSplats(viewport)",
"AetheriaRuntimeRenderSplatsViewportSession _renderSplatsViewport",
".ObserveRenderSplats(viewport)",
"_renderSplatsViewport?.Current",
"ClearViewportDocument()"
};
@ -7733,6 +7754,13 @@ static void RequireUnityViewportAndMapReadsUseManagedAccessors(string root)
string.Join(", ", missingRenderSplatViewportSourceSymbols));
}
if (renderSplatViewportSource.Contains("CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> _renderSplatsViewport", StringComparison.Ordinal) ||
renderSplatViewportSource.Contains(".ReactiveRenderSplats(viewport)", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"AetheriaUnityRenderSplatViewportSource still owns a raw render-splats CultMesh document instead of AetheriaRuntimeRenderSplatsViewportSession.");
}
var zoneRenderer = File.ReadAllText(Path.Combine(
root,
"Assets",
@ -13550,10 +13578,10 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root)
if (!mapRenderer.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) ||
!mapRenderer.Contains(".Viewports", StringComparison.Ordinal) ||
!mapRenderer.Contains(".ReactiveObjects(viewport)", StringComparison.Ordinal) ||
!mapRenderer.Contains(".ReactiveRenderSplats(viewport)", StringComparison.Ordinal) ||
!mapRenderer.Contains(".ObserveObjects(viewport)", StringComparison.Ordinal) ||
!mapRenderer.Contains(".ObserveRenderSplats(viewport)", StringComparison.Ordinal) ||
!mapRenderer.Contains(".Settings", StringComparison.Ordinal) ||
!mapRenderer.Contains(".ReactivePlayer()", StringComparison.Ordinal) ||
!mapRenderer.Contains(".ObservePlayer()", StringComparison.Ordinal) ||
!sectorRenderer.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) ||
!sectorRenderer.Contains(".State", StringComparison.Ordinal) ||
!sectorRenderer.Contains(".ReactiveSectorMap()", StringComparison.Ordinal) ||
@ -15285,7 +15313,9 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
"public AetheriaRuntimeZoneContactsSession ObserveZoneContacts(",
"public AetheriaRuntimePlayerSettingsSession ObservePlayer(",
"public AetheriaRuntimeVerseHostSettingsSession ObserveVerseHost(",
"public AetheriaRuntimeSectorMapSession ObserveSectorMap("
"public AetheriaRuntimeSectorMapSession ObserveSectorMap(",
"public AetheriaRuntimeObjectsViewportSession ObserveObjects(",
"public AetheriaRuntimeRenderSplatsViewportSession ObserveRenderSplats("
};
var missingManagedStateAccessSymbols = requiredManagedStateAccessSymbols
.Where(symbol => !aetheriaClientState.Contains(symbol, StringComparison.Ordinal))

5
Assets/Scripts/Gameplay/AetheriaUnityRenderSplatViewportSource.cs
View file

@ -1,5 +1,4 @@
using System;
using GameCult.Mesh;
using GameCult.Aetheria.State.Verse;
using UnityEngine;
@ -28,7 +27,7 @@ public sealed class AetheriaUnityRenderSplatViewportSource : MonoBehaviour
private float _nextRefreshTime;
private AetheriaRuntimeRtsViewportBounds _viewport;
private CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> _renderSplatsViewport;
private AetheriaRuntimeRenderSplatsViewportSession _renderSplatsViewport;
public RenderTexture TargetTexture
{
@ -119,7 +118,7 @@ public sealed class AetheriaUnityRenderSplatViewportSource : MonoBehaviour
var nextRenderSplatsViewport = ResolveClient()
.State
.Viewports
.ReactiveRenderSplats(viewport);
.ObserveRenderSplats(viewport);
ClearViewportDocument();
_viewport = viewport;
_renderSplatsViewport = nextRenderSplatsViewport;

4
Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs
View file

@ -210,6 +210,8 @@ public class DaemonRuntimeDocumentTests
using var playerSettingsSession = client.State.Settings.ObservePlayer();
using var verseHostSettingsSession = client.State.Settings.ObserveVerseHost();
using var zoneContactsSession = client.State.ObserveZoneContacts();
using var objectsViewportSession = client.State.Viewports.ObserveObjects(viewport);
using var renderSplatsViewportSession = client.State.Viewports.ObserveRenderSplats(viewport);
using var playerHud = client.State.ObservePlayerHud();
var gameSurface = client.State.LatestGameSurface();
var gameTuiSurface = client.State.LatestGameTuiSurface();
@ -291,6 +293,8 @@ public class DaemonRuntimeDocumentTests
Assert.AreEqual(AetheriaRuntimeVerseHostSettingsDocument.SchemaId, verseHostSettings.Schema);
Assert.AreEqual(AetheriaRuntimeVerseHostSettingsDocument.SchemaId, verseHostSettingsSession.Current.Schema);
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.ObjectsViewport, objectsViewport.Schema);
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.ObjectsViewport, objectsViewportSession.Current.Schema);
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.RenderSplatsViewport, renderSplatsViewportSession.Current.Schema);
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.ZoneContacts, zoneContactsSession.Current.Schema);
Assert.AreEqual("Player", objectsViewport.Objects.FirstOrDefault()?.DisplayName);
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.ZoneDetails, zoneDetails.Schema);

13
Assets/Scripts/UI/Menu/MapRenderer.cs
View file

@ -6,7 +6,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using GameCult.Mesh;
using GameCult.Aetheria.State.Verse;
using TMPro;
using UnityEngine;
@ -40,12 +39,12 @@ public class MapRenderer : MonoBehaviour
private RenderTexture _mapTexture;
private int2 _size;
private bool _init;
private CultMeshReactiveDocument<AetheriaRuntimeObjectsViewportDocument> _objectsViewport;
private CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> _renderSplatsViewport;
private AetheriaRuntimeObjectsViewportSession _objectsViewport;
private AetheriaRuntimeRenderSplatsViewportSession _renderSplatsViewport;
private float _nextViewportRefreshTime;
private readonly List<RawImage> _rtsIconPool = new List<RawImage>();
private string _clientStatePath = "";
private CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettings;
private AetheriaRuntimePlayerSettingsSession _playerSettings;
void Start()
{
@ -132,11 +131,11 @@ public class MapRenderer : MonoBehaviour
_objectsViewport = client
.State
.Viewports
.ReactiveObjects(viewport);
.ObserveObjects(viewport);
_renderSplatsViewport = client
.State
.Viewports
.ReactiveRenderSplats(viewport);
.ObserveRenderSplats(viewport);
var objectsViewport = _objectsViewport?.Current;
var zoneName = string.IsNullOrWhiteSpace(objectsViewport?.ZoneName)
@ -321,7 +320,7 @@ public class MapRenderer : MonoBehaviour
_playerSettings ??= ResolveClient()
.State
.Settings
.ReactivePlayer();
.ObservePlayer();
return _playerSettings?.Current?.ShowAsteroidsInMinimap ?? false;
}
catch (Exception ex)

14
Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs
View file

@ -1075,6 +1075,13 @@ namespace GameCult.Aetheria.State.Verse
return Objects(viewport).Reactive(options);
}
public AetheriaRuntimeObjectsViewportSession ObserveObjects(
AetheriaRuntimeRtsViewportBounds viewport,
CultMeshReactiveDocumentOptions? options = null)
{
return new AetheriaRuntimeObjectsViewportSession(ReactiveObjects(viewport, options));
}
public CultMeshDocumentHandle<AetheriaRuntimeGravityViewportDocument> Gravity(AetheriaRuntimeRtsViewportBounds viewport)
{
return _gravity(viewport ?? new AetheriaRuntimeRtsViewportBounds());
@ -1132,6 +1139,13 @@ namespace GameCult.Aetheria.State.Verse
{
return RenderSplats(viewport).Reactive(options);
}
public AetheriaRuntimeRenderSplatsViewportSession ObserveRenderSplats(
AetheriaRuntimeRtsViewportBounds viewport,
CultMeshReactiveDocumentOptions? options = null)
{
return new AetheriaRuntimeRenderSplatsViewportSession(ReactiveRenderSplats(viewport, options));
}
}
public sealed class AetheriaClientDetailState

36
Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateSessions.cs
View file

@ -94,4 +94,40 @@ namespace GameCult.Aetheria.State.Verse
_zoneContacts.Dispose();
}
}
public sealed class AetheriaRuntimeObjectsViewportSession : IDisposable
{
private readonly CultMeshReactiveDocument<AetheriaRuntimeObjectsViewportDocument> _objectsViewport;
public AetheriaRuntimeObjectsViewportSession(
CultMeshReactiveDocument<AetheriaRuntimeObjectsViewportDocument> objectsViewport)
{
_objectsViewport = objectsViewport ?? throw new ArgumentNullException(nameof(objectsViewport));
}
public AetheriaRuntimeObjectsViewportDocument? Current => _objectsViewport.Current;
public void Dispose()
{
_objectsViewport.Dispose();
}
}
public sealed class AetheriaRuntimeRenderSplatsViewportSession : IDisposable
{
private readonly CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> _renderSplatsViewport;
public AetheriaRuntimeRenderSplatsViewportSession(
CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> renderSplatsViewport)
{
_renderSplatsViewport = renderSplatsViewport ?? throw new ArgumentNullException(nameof(renderSplatsViewport));
}
public AetheriaRuntimeRenderSplatsViewportDocument? Current => _renderSplatsViewport.Current;
public void Dispose()
{
_renderSplatsViewport.Dispose();
}
}
}