Share Unity docking document access

This commit is contained in:
Meta Vens 2026-06-29 09:33:22 +01:00
commit 2941847112
3 changed files with 76 additions and 75 deletions

View file

@ -8,7 +8,6 @@ using System.Linq;
using GameCult.Aetheria.EveRuntime;
using GameCult.Aetheria.State.Verse;
using GameCult.Eve.Surface;
using GameCult.Mesh;
using UnityEngine;
using UnityEngine.UIElements;
@ -32,12 +31,20 @@ public class MenuPanel : MonoBehaviour
private MenuTabBinding _current;
private UIDocument _tabSurfaceDocument;
private readonly AetheriaEveUnitySurfaceChrome _tabSurfaceChrome = new AetheriaEveUnitySurfaceChrome();
private CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking;
private AetheriaUnityObservedEntityIndex _observedEntityIndex;
private AetheriaUnityObservedDockingIndex _observedDockingIndex;
public MenuTab CurrentTab { get; private set; }
public void SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)
{
if (!ReferenceEquals(_observedEntityIndex, observedEntityIndex))
{
_observedDockingIndex?.Dispose();
_observedDockingIndex = null;
}
_observedEntityIndex = observedEntityIndex;
}
public void ShowTab(MenuTab tab)
@ -100,8 +107,8 @@ public class MenuPanel : MonoBehaviour
_tabSurfaceDocument = null;
}
_currentDocking?.Dispose();
_currentDocking = null;
_observedDockingIndex?.Dispose();
_observedDockingIndex = null;
}
private void RenderTabSurface()
@ -159,7 +166,9 @@ public class MenuPanel : MonoBehaviour
private MenuTabBinding[] ResolveVisibleTabs()
{
var isDocked = TryResolveCurrentDocking(out var docking) && docking.IsDocked;
var isDocked = TryResolveObservedDockingIndex(out var dockingIndex) &&
dockingIndex.TryResolveCurrentDocking(out var docking) &&
docking.IsDocked;
return _tabs.Values
.Where(tabBinding => !tabBinding.RequireDock || isDocked)
.Where(tabBinding => tabBinding.Tab != MenuTab.Local || isDocked)
@ -167,21 +176,14 @@ public class MenuPanel : MonoBehaviour
.ToArray();
}
private bool TryResolveCurrentDocking(out AetheriaRuntimeCurrentDockingDocument docking)
private bool TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex)
{
docking = null;
try
{
_currentDocking ??= AetheriaUnityRuntimeClientProvider
.ReactiveCurrentDocking("unity-runtime-menu-tabs");
docking = _currentDocking.Current;
return docking != null;
}
catch (Exception ex)
{
Debug.LogWarning($"Failed to read Aetheria current docking for runtime menu tabs: {ex.Message}");
dockingIndex = null;
if (_observedEntityIndex == null)
return false;
}
dockingIndex = _observedDockingIndex ??= new AetheriaUnityObservedDockingIndex(_observedEntityIndex);
return true;
}
private static string GetTabLabel(MenuTabBinding tabBinding)

View file

@ -39,8 +39,8 @@ public class TradeMenu : MonoBehaviour
private UIDocument _tradeItemSurfaceDocument;
private CultMeshReactiveDocument<AetheriaRuntimeCatalogSnapshot> _catalog;
private CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettings;
private CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking;
private CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> _stationRefit;
private AetheriaUnityObservedEntityIndex _observedEntityIndex;
private AetheriaUnityObservedDockingIndex _observedDockingIndex;
private readonly AetheriaEveUnitySurfaceChrome _cargoSelectorSurfaceChrome = PanelChrome(360f, 420f, Align.FlexEnd);
private readonly AetheriaEveUnitySurfaceChrome _filterSurfaceChrome = PanelChrome(420f, 520f, Align.FlexStart);
private readonly AetheriaEveUnitySurfaceChrome _rowActionSurfaceChrome = PanelChrome(320f, 360f, Align.FlexStart);
@ -56,7 +56,13 @@ public class TradeMenu : MonoBehaviour
public void SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)
{
InvalidateStationRefit();
if (!ReferenceEquals(_observedEntityIndex, observedEntityIndex))
{
_observedDockingIndex?.Dispose();
_observedDockingIndex = null;
}
_observedEntityIndex = observedEntityIndex;
}
private void OnEnable()
@ -512,43 +518,26 @@ public class TradeMenu : MonoBehaviour
private AetheriaRuntimeStationRefitDocument StationRefitSnapshot()
{
if (_stationRefit != null)
return _stationRefit.Current;
try
{
_stationRefit = AetheriaUnityRuntimeClientProvider
.ReactiveStationRefit("unity-trade");
}
catch (Exception ex)
{
Debug.LogWarning($"Failed to bind Aetheria station refit state for trade menu: {ex.Message}");
}
return _stationRefit?.Current;
return TryResolveObservedDockingIndex(out var dockingIndex)
? dockingIndex.StationRefitSnapshot()
: null;
}
private bool TryResolveCurrentDocking(out AetheriaRuntimeCurrentDockingDocument docking)
{
docking = null;
try
{
_currentDocking ??= AetheriaUnityRuntimeClientProvider
.ReactiveCurrentDocking("unity-trade");
docking = _currentDocking.Current;
return docking != null;
}
catch (Exception ex)
{
Debug.LogWarning($"Failed to read Aetheria docking state for trade menu: {ex.Message}");
return false;
}
return TryResolveObservedDockingIndex(out var dockingIndex) &&
dockingIndex.TryResolveCurrentDocking(out docking);
}
private void InvalidateStationRefit()
private bool TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex)
{
_stationRefit?.Dispose();
_stationRefit = null;
dockingIndex = null;
if (_observedEntityIndex == null)
return false;
dockingIndex = _observedDockingIndex ??= new AetheriaUnityObservedDockingIndex(_observedEntityIndex);
return true;
}
private bool TryResolveStationRefitCargoTarget(
@ -587,7 +576,6 @@ public class TradeMenu : MonoBehaviour
try
{
submit(AetheriaUnityRuntimeClientProvider.Control("unity-trade"));
InvalidateStationRefit();
return true;
}
catch (Exception ex)
@ -601,12 +589,10 @@ public class TradeMenu : MonoBehaviour
{
_catalog?.Dispose();
_playerSettings?.Dispose();
_currentDocking?.Dispose();
_stationRefit?.Dispose();
_observedDockingIndex?.Dispose();
_catalog = null;
_playerSettings = null;
_currentDocking = null;
_stationRefit = null;
_observedDockingIndex = null;
}
private AetheriaRuntimeCatalogSnapshot CatalogSnapshot()