Use reactive player settings in map renderer
This commit is contained in:
parent
7535996498
commit
b18dcfb982
2 changed files with 14 additions and 10 deletions
|
|
@ -7523,18 +7523,14 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root)
|
|||
{
|
||||
"AetheriaRuntimeObjectsViewportSession _objectsViewport",
|
||||
"AetheriaRuntimeRenderSplatsViewportSession _renderSplatsViewport",
|
||||
"AetheriaRuntimePlayerSettingsSession _playerSettings",
|
||||
".ObserveObjects(viewport)",
|
||||
".ObserveRenderSplats(viewport)",
|
||||
".Settings",
|
||||
".ObservePlayer()",
|
||||
"ClearViewportCaches()",
|
||||
"_objectsViewport?.Dispose()",
|
||||
"_renderSplatsViewport?.Dispose()",
|
||||
"_objectsViewport?.Current",
|
||||
"_renderSplatsViewport?.Current",
|
||||
"_playerSettings?.Dispose()",
|
||||
"_playerSettings?.Current",
|
||||
"private void OnDestroy()"
|
||||
};
|
||||
var missingMapRendererSharedDocumentSymbols = requiredMapRendererSharedDocumentSymbols
|
||||
|
|
@ -7547,14 +7543,21 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root)
|
|||
string.Join(", ", missingMapRendererSharedDocumentSymbols));
|
||||
}
|
||||
|
||||
RequireReactiveTypedDocumentAccess(
|
||||
mapRenderer,
|
||||
"MapRenderer",
|
||||
"AetheriaRuntimePlayerSettingsDocument",
|
||||
"_playerSettings",
|
||||
".ReactivePlayer()",
|
||||
"AetheriaRuntimePlayerSettingsSession",
|
||||
".ObservePlayer()");
|
||||
|
||||
var forbiddenMapRendererSharedDocumentSymbols = new[]
|
||||
{
|
||||
"CultMeshReactiveDocument<AetheriaRuntimeObjectsViewportDocument> _objectsViewport",
|
||||
"CultMeshReactiveDocument<AetheriaRuntimeRenderSplatsViewportDocument> _renderSplatsViewport",
|
||||
"CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettings",
|
||||
".ReactiveObjects(viewport)",
|
||||
".ReactiveRenderSplats(viewport)",
|
||||
".ReactivePlayer()"
|
||||
".ReactiveRenderSplats(viewport)"
|
||||
};
|
||||
var mapRendererRawDocumentHits = forbiddenMapRendererSharedDocumentSymbols
|
||||
.Where(symbol => mapRenderer.Contains(symbol, StringComparison.Ordinal))
|
||||
|
|
@ -13855,7 +13858,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root)
|
|||
!mapRenderer.Contains(".ObserveObjects(viewport)", StringComparison.Ordinal) ||
|
||||
!mapRenderer.Contains(".ObserveRenderSplats(viewport)", StringComparison.Ordinal) ||
|
||||
!mapRenderer.Contains(".Settings", StringComparison.Ordinal) ||
|
||||
!mapRenderer.Contains(".ObservePlayer()", StringComparison.Ordinal) ||
|
||||
!mapRenderer.Contains(".ReactivePlayer()", StringComparison.Ordinal) ||
|
||||
!sectorRenderer.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) ||
|
||||
!sectorRenderer.Contains(".State", StringComparison.Ordinal) ||
|
||||
!sectorRenderer.Contains(".ObserveSectorMap()", StringComparison.Ordinal) ||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using GameCult.Aetheria.State.Verse;
|
||||
using GameCult.Mesh;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using Unity.Mathematics;
|
||||
|
|
@ -44,7 +45,7 @@ public class MapRenderer : MonoBehaviour
|
|||
private float _nextViewportRefreshTime;
|
||||
private readonly List<RawImage> _rtsIconPool = new List<RawImage>();
|
||||
private string _clientStatePath = "";
|
||||
private AetheriaRuntimePlayerSettingsSession _playerSettings;
|
||||
private CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettings;
|
||||
|
||||
void Start()
|
||||
{
|
||||
|
|
@ -320,7 +321,7 @@ public class MapRenderer : MonoBehaviour
|
|||
_playerSettings ??= ResolveClient()
|
||||
.State
|
||||
.Settings
|
||||
.ObservePlayer();
|
||||
.ReactivePlayer();
|
||||
return _playerSettings?.Current?.ShowAsteroidsInMinimap ?? false;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
|
|||
Loading…
Reference in a new issue