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

Rename Unity observed frame helpers

Browse source
This commit is contained in:
Meta Vens 2026-06-28 14:37:28 +01:00
commit 50ae86bc4c
8 changed files with 80 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Assets/Scripts/Gameplay/ActionGameManager.cs
View file

@ -17,9 +17,9 @@ public class ActionGameManager : MonoBehaviour
private AetheriaDaemonObserver _daemonObserver;
private AetheriaUnityPilotCommandSender _pilotCommands;
private AetheriaUnityObservedDockingIndex _observedDocking;
private AetheriaUnityObservedEntityProjector _observedEntityProjector;
private AetheriaUnityObservedEntityRestorer _observedEntityRestorer;
private AetheriaUnityCurrentEntityBinder _currentEntityBinder;
private AetheriaUnityObservedZoneContextProjector _observedZoneContextProjector;
private AetheriaUnityObservedZoneContextFactory _observedZoneContextFactory;
private AetheriaUnityPilotFrameAdapter _pilotFrameAdapter;
private AetheriaUnityPilotOperationAdapter _pilotOperationAdapter;
private AetheriaUnityObservedTargetQuery _observedTargetQuery;
@ -38,15 +38,15 @@ public class ActionGameManager : MonoBehaviour
_observedDocking ??= new AetheriaUnityObservedDockingIndex(
() => ResolveDaemonObserver()?.Client,
_observedEntityIndex);
private AetheriaUnityObservedEntityProjector ObservedEntityProjector =>
_observedEntityProjector ??= new AetheriaUnityObservedEntityProjector(
private AetheriaUnityObservedEntityRestorer ObservedEntityRestorer =>
_observedEntityRestorer ??= new AetheriaUnityObservedEntityRestorer(
_observedEntityIndex,
ItemManager,
EntityConstructionBlueprintProjector.ProjectObservedEntity,
_loadoutItemFactory.CreateLoadoutItem,
Debug.LogWarning);
private AetheriaUnityObservedZoneContextProjector ObservedZoneContextProjector =>
_observedZoneContextProjector ??= new AetheriaUnityObservedZoneContextProjector(
private AetheriaUnityObservedZoneContextFactory ObservedZoneContextFactory =>
_observedZoneContextFactory ??= new AetheriaUnityObservedZoneContextFactory(
ItemManager,
Settings.PlanetSettings,
() => ObservedGalaxy,
@ -100,8 +100,8 @@ public class ActionGameManager : MonoBehaviour
() => Zone,
zone => Zone = zone,
_observedEntityIndex,
ObservedEntityProjector,
ObservedZoneContextProjector,
ObservedEntityRestorer,
ObservedZoneContextFactory,
() => ZoneRenderer,
() => CurrentEntity,
entity => CurrentEntityBinder.RestoreBinding(entity),

4
Assets/Scripts/Gameplay/AetheriaUnityObservedEntityProjector.cs → Assets/Scripts/Gameplay/AetheriaUnityObservedEntityRestorer.cs
View file

@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using GameCult.Aetheria.State.Verse;
public sealed class AetheriaUnityObservedEntityProjector
public sealed class AetheriaUnityObservedEntityRestorer
{
private readonly AetheriaUnityObservedEntityIndex _entityIndex;
private readonly ItemManager _itemManager;
@ -14,7 +14,7 @@ public sealed class AetheriaUnityObservedEntityProjector
private readonly Func<AetheriaRuntimeLoadoutItemSnapshot, ItemInstance> _createLoadoutItem;
private readonly Action<string> _logWarning;
public AetheriaUnityObservedEntityProjector(
public AetheriaUnityObservedEntityRestorer(
AetheriaUnityObservedEntityIndex entityIndex,
ItemManager itemManager,
Func<AetheriaRuntimeEntitySnapshot, bool, EntityConstructionBlueprint> createBlueprint,

0
Assets/Scripts/Gameplay/AetheriaUnityObservedEntityProjector.cs.meta → Assets/Scripts/Gameplay/AetheriaUnityObservedEntityRestorer.cs.meta
View file

18
Assets/Scripts/Gameplay/AetheriaUnityObservedFrameApplier.cs
View file

@ -14,8 +14,8 @@ public sealed class AetheriaUnityObservedFrameApplier
private readonly Func<Zone> _getZone;
private readonly Action<Zone> _setZone;
private readonly AetheriaUnityObservedEntityIndex _entityIndex;
private readonly AetheriaUnityObservedEntityProjector _entityProjector;
private readonly AetheriaUnityObservedZoneContextProjector _zoneContextProjector;
private readonly AetheriaUnityObservedEntityRestorer _entityRestorer;
private readonly AetheriaUnityObservedZoneContextFactory _zoneContextFactory;
private readonly Func<ZoneRenderer> _resolveZoneRenderer;
private readonly Func<Entity> _getCurrentEntity;
private readonly Action<Entity> _restoreCurrentEntityBinding;
@ -32,8 +32,8 @@ public sealed class AetheriaUnityObservedFrameApplier
Func<Zone> getZone,
Action<Zone> setZone,
AetheriaUnityObservedEntityIndex entityIndex,
AetheriaUnityObservedEntityProjector entityProjector,
AetheriaUnityObservedZoneContextProjector zoneContextProjector,
AetheriaUnityObservedEntityRestorer entityRestorer,
AetheriaUnityObservedZoneContextFactory zoneContextFactory,
Func<ZoneRenderer> resolveZoneRenderer,
Func<Entity> getCurrentEntity,
Action<Entity> restoreCurrentEntityBinding,
@ -44,8 +44,8 @@ public sealed class AetheriaUnityObservedFrameApplier
_getZone = getZone ?? (() => null);
_setZone = setZone ?? (_ => { });
_entityIndex = entityIndex ?? throw new ArgumentNullException(nameof(entityIndex));
_entityProjector = entityProjector ?? throw new ArgumentNullException(nameof(entityProjector));
_zoneContextProjector = zoneContextProjector ?? throw new ArgumentNullException(nameof(zoneContextProjector));
_entityRestorer = entityRestorer ?? throw new ArgumentNullException(nameof(entityRestorer));
_zoneContextFactory = zoneContextFactory ?? throw new ArgumentNullException(nameof(zoneContextFactory));
_resolveZoneRenderer = resolveZoneRenderer ?? (() => null);
_getCurrentEntity = getCurrentEntity ?? (() => null);
_restoreCurrentEntityBinding = restoreCurrentEntityBinding ?? (_ => { });
@ -115,7 +115,7 @@ public sealed class AetheriaUnityObservedFrameApplier
}
var zoneRenderer = _resolveZoneRenderer();
if (_entityProjector.TryApplyInPlace(
if (_entityRestorer.TryApplyInPlace(
_lastAppliedZoneRenderRunId,
_lastAppliedZoneRenderZoneIndex,
runId,
@ -138,14 +138,14 @@ public sealed class AetheriaUnityObservedFrameApplier
if (_getZone()?.GalaxyZone != targetZone)
{
var resolvedZone = _zoneContextProjector.ResolveContext(targetZone, render);
var resolvedZone = _zoneContextFactory.ResolveContext(targetZone, render);
if (resolvedZone == null)
return false;
_setZone(resolvedZone);
}
_entityProjector.Replace(entitySnapshots, currentEntityKey, _getZone());
_entityRestorer.Replace(entitySnapshots, currentEntityKey, _getZone());
zoneRenderer?.LoadDaemonZoneView(_entityIndex.EntitiesByDaemonIndex, render);
if (_entityIndex.TryResolveEntityByRecordKey(currentEntityKey, out var currentEntity))
_restoreCurrentEntityBinding(currentEntity);

4
Assets/Scripts/Gameplay/AetheriaUnityObservedZoneContextProjector.cs → Assets/Scripts/Gameplay/AetheriaUnityObservedZoneContextFactory.cs
View file

@ -10,7 +10,7 @@ using UnityEngine;
using float2 = Unity.Mathematics.float2;
using float4 = Unity.Mathematics.float4;
public sealed class AetheriaUnityObservedZoneContextProjector
public sealed class AetheriaUnityObservedZoneContextFactory
{
private readonly Dictionary<int, Zone> _observedZoneContextsByDaemonIndex = new Dictionary<int, Zone>();
private readonly ItemManager _itemManager;
@ -20,7 +20,7 @@ public sealed class AetheriaUnityObservedZoneContextProjector
private readonly Action<MusicType> _playMusic;
private Galaxy _observedGalaxy;
public AetheriaUnityObservedZoneContextProjector(
public AetheriaUnityObservedZoneContextFactory(
ItemManager itemManager,
PlanetSettings planetSettings,
Func<Galaxy> resolveObservedGalaxy,

0
Assets/Scripts/Gameplay/AetheriaUnityObservedZoneContextProjector.cs.meta → Assets/Scripts/Gameplay/AetheriaUnityObservedZoneContextFactory.cs.meta
View file