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

Use reactive player settings in input screen

Browse source
This commit is contained in:
Meta Vens 2026-06-28 08:52:56 +01:00
commit 3070dc7610
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using GameCult.Aetheria.EveRuntime;
using GameCult.Aetheria.State.Verse;
using GameCult.Eve.Surface;
using GameCult.Mesh;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Utilities;
@ -14,7 +15,7 @@ public class InputDisplayLayout : MonoBehaviour
private UIDocument _surfaceDocument;
private AetheriaInput _ownedInput;
private string _clientStatePath = "";
private AetheriaRuntimePlayerSettingsDocument _playerSettings;
private CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettings;
private InputAction _captureAction;
private InputActionAsset _input;
private string _captureActionName = "";
@ -94,6 +95,8 @@ public class InputDisplayLayout : MonoBehaviour
_ownedInput?.Dispose();
_ownedInput = null;
ClearClientCaches();
if (_surfaceDocument != null)
{
AetheriaEveUnitySurfaceHost.DestroyDocument(_surfaceDocument);
@ -378,27 +381,28 @@ public class InputDisplayLayout : MonoBehaviour
private void ClearClientCaches()
{
_playerSettings?.Dispose();
_playerSettings = null;
}
private AetheriaRuntimePlayerSettingsDocument ResolvePlayerSettings()
{
if (_playerSettings != null)
return _playerSettings;
return _playerSettings.Current;
try
{
_playerSettings = ResolveClient()
.Aetheria()
.Settings
.LatestPlayer();
.ReactivePlayer();
}
catch (Exception ex)
{
Debug.LogWarning($"Failed to read Aetheria player settings for input screen: {ex.Message}");
Debug.LogWarning($"Failed to bind Aetheria player settings for input screen: {ex.Message}");
}
return _playerSettings;
return _playerSettings?.Current;
}
private void ClearCapture()