diff --git a/Aetheria.State.Daemon/Aetheria.State.Daemon.csproj b/Aetheria.State.Daemon/Aetheria.State.Daemon.csproj
new file mode 100644
index 000000000..ca788873d
--- /dev/null
+++ b/Aetheria.State.Daemon/Aetheria.State.Daemon.csproj
@@ -0,0 +1,13 @@
+
+
+ Exe
+ net10.0
+ enable
+ latest
+ enable
+
+
+
+
+
+
diff --git a/Aetheria.State.Daemon/Program.cs b/Aetheria.State.Daemon/Program.cs
new file mode 100644
index 000000000..7185e7c4e
--- /dev/null
+++ b/Aetheria.State.Daemon/Program.cs
@@ -0,0 +1,402 @@
+using Aetheria.State;
+using Aetheria.State.Documents;
+using GameCult.Aetheria.State.Unity;
+
+var options = AetheriaDaemonHostOptions.Parse(args);
+var startedAtUtc = DateTimeOffset.UtcNow.ToString("O");
+
+Console.WriteLine($"Aetheria Verse daemon starting: {options.StatePath}");
+
+await using var node = await AetheriaStateNode.OpenAsync(
+ options.StatePath,
+ runtimeId: options.DaemonId,
+ startServer: true).ConfigureAwait(false);
+using var discoveryHost = new AetheriaVerseDiscoveryHost(node);
+
+await EnsureWorldDocumentAsync(node).ConfigureAwait(false);
+var verseHost = await EnsureVerseHostSettingsAsync(node, options, startedAtUtc).ConfigureAwait(false);
+discoveryHost.Update(verseHost);
+await PublishRuntimeSessionAsync(node, options, startedAtUtc, "starting").ConfigureAwait(false);
+await PublishStateSurfacesAsync(node, options, startedAtUtc).ConfigureAwait(false);
+var firstTick = await TickAsync(node, options).ConfigureAwait(false);
+Console.WriteLine($"Aetheria Verse daemon published frame {firstTick.Frame.FrameId}.");
+
+if (options.Once)
+{
+ await PublishRuntimeSessionAsync(node, options, startedAtUtc, "completed").ConfigureAwait(false);
+ return;
+}
+
+var stopped = new TaskCompletionSource();
+Console.CancelKeyPress += (_, eventArgs) =>
+{
+ eventArgs.Cancel = true;
+ stopped.TrySetResult(null);
+};
+
+await PublishRuntimeSessionAsync(node, options, startedAtUtc, "running").ConfigureAwait(false);
+Console.WriteLine("Aetheria Verse daemon is running. Press Ctrl+C to stop.");
+
+while (!stopped.Task.IsCompleted)
+{
+ var completed = await Task.WhenAny(stopped.Task, Task.Delay(options.TickInterval)).ConfigureAwait(false);
+ if (completed == stopped.Task)
+ break;
+
+ var tick = await TickAsync(node, options).ConfigureAwait(false);
+ discoveryHost.Update(await node.GetVerseHostSettingsAsync().ConfigureAwait(false));
+ await PublishRuntimeSessionAsync(node, options, startedAtUtc, "running").ConfigureAwait(false);
+ Console.WriteLine($"Aetheria Verse daemon published frame {tick.Frame.FrameId}.");
+}
+
+await PublishRuntimeSessionAsync(node, options, startedAtUtc, "stopping").ConfigureAwait(false);
+Console.WriteLine("Aetheria Verse daemon stopping.");
+
+static async Task TickAsync(
+ AetheriaStateNode node,
+ AetheriaDaemonHostOptions options)
+{
+ await AcceptEveCommandsAsync(node, options).ConfigureAwait(false);
+
+ var currentFrame = AetheriaRuntimeDaemonFrameStore.TryReadFrame(node.StatePath, out var frame)
+ ? frame
+ : null;
+ var fixedDeltaSeconds = currentFrame?.FixedDeltaSeconds > 0
+ ? currentFrame.FixedDeltaSeconds
+ : options.FixedDeltaSeconds;
+ var nextFrameId = (currentFrame?.FrameId ?? -1) + 1;
+ var simulationTimeSeconds = (currentFrame?.SimulationTimeSeconds ?? 0) + fixedDeltaSeconds;
+ var sessionId = string.IsNullOrWhiteSpace(currentFrame?.SessionId)
+ ? options.SessionId
+ : currentFrame.SessionId;
+ var run = currentFrame?.Run ?? new AetheriaRuntimeRunCheckpointCommit();
+
+ var loadoutTemplates = node.Cache
+ .GetAll()
+ .Select(ToLoadoutTemplateCommit)
+ .ToArray();
+ var observedCommands = node.ReadObservedDaemonCommands();
+
+ var result = AetheriaRuntimeDaemonTickRunner.Tick(
+ node.StatePath,
+ run,
+ new AetheriaRuntimeDaemonTickOptions
+ {
+ DaemonId = options.DaemonId,
+ SessionId = sessionId,
+ VerseId = options.VerseId,
+ CultMeshAddress = options.CultMeshAddress,
+ FrameId = nextFrameId,
+ SimulationTimeSeconds = simulationTimeSeconds,
+ FixedDeltaSeconds = fixedDeltaSeconds,
+ ObservedCommands = observedCommands,
+ AccountedCommandIds = currentFrame?.AccountedCommandIds ?? Array.Empty(),
+ OperationContext = new AetheriaRuntimeDaemonOperationContext
+ {
+ LoadoutTemplates = loadoutTemplates
+ }
+ });
+
+ await PublishDaemonApiDocumentsAsync(node, result).ConfigureAwait(false);
+ await PublishStateSurfacesAsync(node, options, result.Frame.PublishedAtUtc).ConfigureAwait(false);
+ return result;
+}
+
+static async Task PublishDaemonApiDocumentsAsync(
+ AetheriaStateNode node,
+ AetheriaRuntimeDaemonTickResult result)
+{
+ await node.PutDaemonFrameAsync(result.Frame).ConfigureAwait(false);
+ if (AetheriaRuntimeDaemonSoaViewStore.TryReadView(node.StatePath, out var soaView) &&
+ string.Equals(soaView.Schema, AetheriaRuntimeDaemonSchemas.SoaView, StringComparison.Ordinal))
+ {
+ await node.PutDaemonSoaViewAsync(soaView).ConfigureAwait(false);
+ }
+
+ if (AetheriaRuntimeDaemonPublicationStore.TryReadProviderAdvertisement(node.StatePath, out var provider))
+ await node.PutDaemonProviderAdvertisementAsync(provider).ConfigureAwait(false);
+ if (AetheriaRuntimeDaemonPublicationStore.TryReadHealth(node.StatePath, out var health))
+ await node.PutDaemonHealthAsync(health).ConfigureAwait(false);
+ if (AetheriaRuntimeDaemonPublicationStore.TryReadCommandBoundary(node.StatePath, out var commandBoundary))
+ await node.PutDaemonCommandBoundaryAsync(commandBoundary).ConfigureAwait(false);
+ if (AetheriaRuntimeDaemonPublicationStore.TryReadGameSurface(node.StatePath, out var gameSurface))
+ await node.PutDaemonGameSurfaceAsync(AetheriaRuntimeEveSurfaceStateProjector.ToState(gameSurface)).ConfigureAwait(false);
+ if (AetheriaRuntimeDaemonPublicationStore.TryReadGameTuiSurface(node.StatePath, out var gameTuiSurface))
+ await node.PutDaemonGameTuiSurfaceAsync(AetheriaRuntimeEveSurfaceStateProjector.ToState(gameTuiSurface)).ConfigureAwait(false);
+ if (AetheriaRuntimeDaemonPublicationStore.TryReadEditorSurface(node.StatePath, out var editorSurface))
+ await node.PutDaemonEditorSurfaceAsync(AetheriaRuntimeEveSurfaceStateProjector.ToState(editorSurface)).ConfigureAwait(false);
+ if (AetheriaRuntimeDaemonPublicationStore.TryReadEditorTuiSurface(node.StatePath, out var editorTuiSurface))
+ await node.PutDaemonEditorTuiSurfaceAsync(AetheriaRuntimeEveSurfaceStateProjector.ToState(editorTuiSurface)).ConfigureAwait(false);
+}
+
+static async Task AcceptEveCommandsAsync(AetheriaStateNode node, AetheriaDaemonHostOptions options)
+{
+ var commandCountBefore = node.ReadObservedEveCommands().Count;
+ var now = DateTimeOffset.UtcNow.ToString("O");
+ try
+ {
+ var existingStatus = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false);
+ var report = await AetheriaEveCommandBridge.AcceptObservedAsync(
+ node,
+ existingStatus?.AccountedCommandIds)
+ .ConfigureAwait(false);
+ await node.PutEveCommandAcceptanceStatusAsync(new AetheriaEveCommandAcceptanceStatus
+ {
+ RuntimeId = options.DaemonId,
+ StatePath = node.StatePath,
+ LastPollAtUtc = now,
+ LastAcceptedAtUtc = report.AcceptedCommandIds.Length > 0 ? now : "",
+ ObservedBeforeAccept = commandCountBefore,
+ CommandsAccepted = report.AcceptedCommandIds.Length,
+ CommandsRejected = report.RejectedCommands,
+ AppliedCatalogRefreshes = report.AcceptedCatalogRefreshes,
+ AppliedOperationsRefreshes = report.AcceptedOperationsRefreshes,
+ AppliedPlayerSettingsCommands = report.AcceptedPlayerSettingsCommands,
+ AppliedInputSettingsCommands = report.AcceptedInputSettingsCommands,
+ AppliedLoadoutTemplateCommands = report.AcceptedLoadoutTemplateCommands,
+ AppliedVerseHostCommands = report.AcceptedVerseHostCommands,
+ AccountedCommandIds = report.AccountedCommandIds,
+ LastRejectedCommand = report.LastRejectedCommand,
+ LastRejectedReason = report.LastRejectedReason,
+ ConsecutiveFailures = 0,
+ Status = report.RejectedCommands > 0 ? "rejected" : "ok"
+ }).ConfigureAwait(false);
+ }
+ catch (Exception ex)
+ {
+ var existing = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false);
+ await node.PutEveCommandAcceptanceStatusAsync(new AetheriaEveCommandAcceptanceStatus
+ {
+ RuntimeId = options.DaemonId,
+ StatePath = node.StatePath,
+ LastPollAtUtc = now,
+ LastAcceptedAtUtc = existing?.LastAcceptedAtUtc ?? "",
+ ObservedBeforeAccept = commandCountBefore,
+ AccountedCommandIds = existing?.AccountedCommandIds ?? [],
+ ConsecutiveFailures = (existing?.ConsecutiveFailures ?? 0) + 1,
+ LastError = ex.ToString(),
+ Status = "error"
+ }).ConfigureAwait(false);
+ throw;
+ }
+}
+
+static async Task PublishStateSurfacesAsync(
+ AetheriaStateNode node,
+ AetheriaDaemonHostOptions options,
+ string updatedAtUtc)
+{
+ var verseHost = await EnsureVerseHostSettingsAsync(node, options, updatedAtUtc).ConfigureAwait(false);
+ var eveStatus = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false);
+ var runtimeSession = await node.GetRuntimeSessionAsync(options.DaemonId).ConfigureAwait(false);
+ var playerSettings = await node.GetPlayerSettingsAsync().ConfigureAwait(false) ?? new AetheriaPlayerSettings();
+ var playerSettingsUpdatedAt = string.IsNullOrWhiteSpace(playerSettings.LastUpdatedAtUtc)
+ ? updatedAtUtc
+ : playerSettings.LastUpdatedAtUtc;
+
+ await node.PutOperationsSurfaceAsync(
+ AetheriaOperationsSurfaceProjector.Build(eveStatus, verseHost, runtimeSession)).ConfigureAwait(false);
+ await node.PutPlayerSettingsSurfaceAsync(
+ AetheriaPlayerSettingsSurfaceProjector.Build(playerSettings, playerSettingsUpdatedAt)).ConfigureAwait(false);
+ await node.PutProviderAdvertisementAsync(
+ AetheriaProviderAdvertisementProjector.Build(verseHost, node.StatePath, updatedAtUtc)).ConfigureAwait(false);
+ await node.FlushAsync().ConfigureAwait(false);
+}
+
+static async Task PublishRuntimeSessionAsync(
+ AetheriaStateNode node,
+ AetheriaDaemonHostOptions options,
+ string startedAtUtc,
+ string status)
+{
+ var now = DateTimeOffset.UtcNow.ToString("O");
+ await node.PutRuntimeSessionAsync(new AetheriaRuntimeSession
+ {
+ RuntimeId = options.DaemonId,
+ Role = "verse-daemon",
+ StartedAtUtc = startedAtUtc,
+ LastSeenAtUtc = now,
+ Status = status
+ }).ConfigureAwait(false);
+ await PublishStateSurfacesAsync(node, options, now).ConfigureAwait(false);
+}
+
+static async Task EnsureWorldDocumentAsync(AetheriaStateNode node)
+{
+ var now = DateTimeOffset.UtcNow.ToString("O");
+ var existing = await node.GetWorldAsync().ConfigureAwait(false);
+ if (existing != null)
+ {
+ existing.UpdatedAtUtc = now;
+ await node.PutWorldAsync(existing).ConfigureAwait(false);
+ return;
+ }
+
+ await node.PutWorldAsync(new AetheriaWorldState
+ {
+ Name = "Aetheria",
+ WorldId = "aetheria",
+ SchemaEpoch = 1,
+ CreatedAtUtc = now,
+ UpdatedAtUtc = now
+ }).ConfigureAwait(false);
+}
+
+static async Task EnsureVerseHostSettingsAsync(
+ AetheriaStateNode node,
+ AetheriaDaemonHostOptions options,
+ string now)
+{
+ var existing = await node.GetVerseHostSettingsAsync().ConfigureAwait(false);
+ var normalized = AetheriaVerseHostSettingsNormalizer.Normalize(existing);
+ normalized.ServiceId = options.DaemonId;
+ normalized.VerseId = options.VerseId;
+ normalized.CultMeshAddress = options.CultMeshAddress;
+
+ if (existing == null ||
+ string.IsNullOrWhiteSpace(existing.LastUpdatedAtUtc) ||
+ !AetheriaVerseHostSettingsNormalizer.Equivalent(existing, normalized))
+ {
+ normalized.LastUpdatedAtUtc = now;
+ await node.PutVerseHostSettingsAsync(normalized).ConfigureAwait(false);
+ }
+
+ return normalized;
+}
+
+static AetheriaRuntimeLoadoutTemplateCommit ToLoadoutTemplateCommit(AetheriaLoadoutTemplate template)
+{
+ return new AetheriaRuntimeLoadoutTemplateCommit
+ {
+ Name = template.Name ?? "",
+ OwnerPlayerKey = template.OwnerPlayerKey ?? "",
+ RootEntity = ToEntityLoadoutCommit(template.RootEntity)
+ };
+}
+
+static AetheriaRuntimeEntityLoadoutCommit ToEntityLoadoutCommit(AetheriaEntityLoadout? entity)
+{
+ entity ??= new AetheriaEntityLoadout();
+ return new AetheriaRuntimeEntityLoadoutCommit
+ {
+ Name = entity.Name ?? "",
+ Kind = entity.Kind ?? "",
+ FactionKey = entity.FactionKey ?? "",
+ Hull = ToLoadoutItemCommit(entity.Hull),
+ Equipment = ToSlotCommits(entity.Equipment),
+ CargoBays = ToSlotCommits(entity.CargoBays),
+ DockingBays = ToSlotCommits(entity.DockingBays),
+ CargoContents = ToCargoBayCommits(entity.CargoContents),
+ DockingBayContents = ToCargoBayCommits(entity.DockingBayContents),
+ DockingBayAssignments = (entity.DockingBayAssignments ?? Array.Empty()).ToArray(),
+ WeaponGroups = (entity.WeaponGroups ?? Array.Empty>())
+ .Select(group => (group ?? Array.Empty()).ToArray())
+ .ToArray(),
+ Children = (entity.Children ?? Array.Empty())
+ .Select(ToEntityLoadoutCommit)
+ .ToArray()
+ };
+}
+
+static AetheriaRuntimeLoadoutItemSlotCommit[] ToSlotCommits(
+ IReadOnlyList? slots)
+{
+ return (slots ?? Array.Empty())
+ .Select(slot => new AetheriaRuntimeLoadoutItemSlotCommit
+ {
+ X = slot.Position?.X ?? 0,
+ Y = slot.Position?.Y ?? 0,
+ Item = ToLoadoutItemCommit(slot.Item)
+ })
+ .ToArray();
+}
+
+static AetheriaRuntimeCargoBayLoadoutCommit[] ToCargoBayCommits(
+ IReadOnlyList? cargoBays)
+{
+ return (cargoBays ?? Array.Empty())
+ .Select(cargoBay => new AetheriaRuntimeCargoBayLoadoutCommit
+ {
+ Items = ToSlotCommits(cargoBay.Items)
+ })
+ .ToArray();
+}
+
+static AetheriaRuntimeLoadoutItemCommit ToLoadoutItemCommit(AetheriaLoadoutItem? item)
+{
+ return new AetheriaRuntimeLoadoutItemCommit
+ {
+ ItemKey = item?.ItemKey ?? "",
+ Quality = item?.Quality ?? 0,
+ Durability = item?.Durability ?? 0,
+ Quantity = item?.Quantity ?? 0,
+ Enabled = item?.Enabled ?? false,
+ OverrideShutdown = item?.OverrideShutdown ?? false
+ };
+}
+
+internal sealed class AetheriaDaemonHostOptions
+{
+ public string StatePath { get; init; } = "";
+ public string DaemonId { get; init; } = "aetheria-daemon";
+ public string SessionId { get; init; } = "local";
+ public string VerseId { get; init; } = "aetheria.local";
+ public string CultMeshAddress { get; init; } = "cultmesh://aetheria.local/eve/providers/aetheria.daemon";
+ public TimeSpan TickInterval { get; init; } = TimeSpan.FromMilliseconds(50);
+ public double FixedDeltaSeconds { get; init; } = 0.02;
+ public bool Once { get; init; }
+
+ public static AetheriaDaemonHostOptions Parse(IReadOnlyList args)
+ {
+ var root = ReadOption(args, "--root");
+ if (string.IsNullOrWhiteSpace(root))
+ root = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..", "..", "..", ".."));
+
+ var state = ReadOption(args, "--state");
+ var intervalMs = ReadPositiveInt(args, "--tick-interval-ms") ?? 50;
+ var fixedDeltaMs = ReadPositiveInt(args, "--fixed-delta-ms") ?? 20;
+ var daemonId = ReadOption(args, "--daemon-id");
+ var verseId = ReadOption(args, "--verse-id");
+ var cultMeshAddress = ReadOption(args, "--cultmesh-address");
+ var sessionId = ReadOption(args, "--session-id");
+
+ return new AetheriaDaemonHostOptions
+ {
+ StatePath = string.IsNullOrWhiteSpace(state)
+ ? AetheriaStatePaths.ResolveDefaultStatePath(root)
+ : Path.GetFullPath(state),
+ DaemonId = string.IsNullOrWhiteSpace(daemonId) ? "aetheria-daemon" : daemonId,
+ SessionId = string.IsNullOrWhiteSpace(sessionId) ? "local" : sessionId,
+ VerseId = string.IsNullOrWhiteSpace(verseId) ? "aetheria.local" : verseId,
+ CultMeshAddress = string.IsNullOrWhiteSpace(cultMeshAddress)
+ ? "cultmesh://aetheria.local/eve/providers/aetheria.daemon"
+ : cultMeshAddress,
+ TickInterval = TimeSpan.FromMilliseconds(intervalMs),
+ FixedDeltaSeconds = fixedDeltaMs / 1000.0,
+ Once = HasFlag(args, "--once")
+ };
+ }
+
+ private static string ReadOption(IReadOnlyList args, string name)
+ {
+ for (var i = 0; i < args.Count - 1; i++)
+ {
+ if (string.Equals(args[i], name, StringComparison.OrdinalIgnoreCase))
+ return args[i + 1];
+ }
+
+ return "";
+ }
+
+ private static int? ReadPositiveInt(IReadOnlyList args, string name)
+ {
+ return int.TryParse(ReadOption(args, name), out var value) && value > 0
+ ? value
+ : null;
+ }
+
+ private static bool HasFlag(IReadOnlyList args, string name)
+ {
+ return args.Any(arg => string.Equals(arg, name, StringComparison.OrdinalIgnoreCase));
+ }
+}
diff --git a/Aetheria.State.Smoke/Aetheria.State.Smoke.csproj b/Aetheria.State.Smoke/Aetheria.State.Smoke.csproj
index e9e2dc0f7..ca788873d 100644
--- a/Aetheria.State.Smoke/Aetheria.State.Smoke.csproj
+++ b/Aetheria.State.Smoke/Aetheria.State.Smoke.csproj
@@ -9,6 +9,5 @@
-
diff --git a/Aetheria.State.Smoke/Program.cs b/Aetheria.State.Smoke/Program.cs
index c4cab143b..3ebc1ffac 100644
--- a/Aetheria.State.Smoke/Program.cs
+++ b/Aetheria.State.Smoke/Program.cs
@@ -3,7 +3,6 @@ using Aetheria.State.Documents;
using Aetheria.State.Migration;
using GameCult.Caching;
using GameCult.Aetheria.State.Unity;
-using GameCult.Eve.Surface;
var root = args.Length > 0 ? args[0] : Directory.GetCurrentDirectory();
var stateDirectory = Path.Combine(Path.GetTempPath(), "aetheria-state-smoke", Guid.NewGuid().ToString("N"));
@@ -93,27 +92,73 @@ await using (var node = await AetheriaStateNode.OpenAsync(statePath, "aetheria-s
await node.PutCatalogSurfaceAsync(
AetheriaCatalogSurfaceProjector.Build(node.ReadCatalogSnapshot(), now));
- var drainStatus = new AetheriaRuntimeCommitDrainStatus
- {
- RuntimeId = "smoke-runtime",
- StatePath = statePath,
- LastPollAtUtc = now,
- LastAppliedAtUtc = now,
- PendingBeforeApply = 1,
- CommandsApplied = 1,
- AppliedPlayerSettings = 1,
- Status = "ok"
- };
- await node.PutRuntimeCommitDrainStatusAsync(drainStatus);
var verseHostSettings = AetheriaVerseHostSettingsNormalizer.Normalize(new AetheriaVerseHostSettings
{
LastUpdatedAtUtc = now
});
await node.PutVerseHostSettingsAsync(verseHostSettings);
await node.PutOperationsSurfaceAsync(
- AetheriaOperationsSurfaceProjector.Build(drainStatus, verseHostSettings: verseHostSettings));
+ AetheriaOperationsSurfaceProjector.Build(verseHostSettings: verseHostSettings));
await node.PutProviderAdvertisementAsync(
AetheriaProviderAdvertisementProjector.Build(verseHostSettings, statePath, now));
+ var daemonProvider = AetheriaRuntimeDaemonProviderAdvertisementDocument.Create(
+ statePath,
+ "smoke-daemon",
+ "aetheria.local",
+ "cultmesh://aetheria.local/eve/providers/aetheria.daemon");
+ var daemonHealth = new AetheriaRuntimeDaemonHealthDocument
+ {
+ DaemonId = "smoke-daemon",
+ VerseId = "aetheria.local",
+ PublishedAtUtc = now,
+ StatePath = statePath,
+ FrameId = 7,
+ ObservedCommandCount = 1,
+ AppliedCommandCount = 2,
+ RejectedCommandCount = 0,
+ Status = "healthy",
+ CommandBoundaryPath = AetheriaRuntimeStateBoundary.GetDaemonCommandBoundaryPath(statePath)
+ };
+ var daemonCommandBoundary = AetheriaRuntimeDaemonCommandBoundaryDocument.Create("smoke-daemon");
+ var daemonFrame = AetheriaRuntimeDaemonFrameDocument.Create(
+ new AetheriaRuntimeRunCheckpointCommit
+ {
+ RunId = "smoke-run",
+ CurrentZoneIndex = 0,
+ CurrentEntityKey = entityKey.ToString()
+ },
+ "smoke-daemon",
+ "smoke-session",
+ 7,
+ 0.14,
+ 0.02);
+ var daemonGameSurface = AetheriaRuntimeDaemonGameSurfaceBuilder.Build(
+ daemonFrame,
+ daemonHealth,
+ daemonCommandBoundary);
+ await node.PutDaemonProviderAdvertisementAsync(daemonProvider);
+ await node.PutDaemonHealthAsync(daemonHealth);
+ await node.PutDaemonCommandBoundaryAsync(daemonCommandBoundary);
+ using var daemonCommandPort = await AetheriaCommandPort.OpenAsync(
+ statePath,
+ "aetheria-state-smoke-command-client");
+ var daemonSubmitEnvelope = await daemonCommandPort.SubmitDaemonCommandAsync(
+ AetheriaRuntimeDaemonCommandDocument.Create(
+ AetheriaRuntimeDaemonCommandKinds.SensorPing,
+ "aetheria-state-smoke",
+ "smoke-session",
+ daemonFrame.FrameId,
+ entityKey.ToString()));
+
+ await using (var commandVerifyNode = await AetheriaStateNode.OpenAsync(
+ statePath,
+ "aetheria-state-smoke-command-check"))
+ {
+ if (commandVerifyNode.ReadObservedDaemonCommands().All(command => command.CommandId != daemonSubmitEnvelope!.CommandId))
+ throw new InvalidOperationException("Runtime command port daemon submission did not appear as a typed state record.");
+ }
+ await node.PutDaemonFrameAsync(daemonFrame);
+ await node.PutDaemonGameSurfaceAsync(AetheriaRuntimeEveSurfaceStateProjector.ToState(daemonGameSurface));
await node.PutRuntimeSessionAsync(new AetheriaRuntimeSession
{
RuntimeId = "smoke-runtime",
@@ -123,7 +168,6 @@ await using (var node = await AetheriaStateNode.OpenAsync(statePath, "aetheria-s
Status = "running"
});
await node.PutOperationsSurfaceAsync(AetheriaOperationsSurfaceProjector.Build(
- drainStatus,
verseHostSettings: verseHostSettings,
runtimeSession: await node.GetRuntimeSessionAsync("smoke-runtime")));
@@ -488,62 +532,64 @@ await using (var node = await AetheriaStateNode.OpenAsync(statePath, "aetheria-s
await node.GetPlayerSettingsAsync(),
now));
- AetheriaRuntimeEveCommandLog.QueueCommand(
+ using var eveCommandPort = await AetheriaCommandPort.OpenAsync(
statePath,
- new EveSurfaceCommandRequest(
- AetheriaProviderAdvertisementProjector.ProviderId,
- AetheriaCatalogSurfaceProjector.SurfaceId,
- "aetheria.catalog.refresh",
- new Dictionary { ["source"] = "state-smoke" },
- DateTimeOffset.UtcNow,
- "aetheria-state-smoke"));
- AetheriaRuntimeEveCommandLog.QueueCommand(
- statePath,
- new EveSurfaceCommandRequest(
- AetheriaProviderAdvertisementProjector.ProviderId,
- AetheriaPlayerSettingsSurfaceProjector.SurfaceId,
- "aetheria.player_settings.gameplay.significant_digits.increment",
- new Dictionary { ["source"] = "state-smoke" },
- DateTimeOffset.UtcNow,
- "aetheria-state-smoke"));
- AetheriaRuntimeEveCommandLog.QueueCommand(
- statePath,
- new EveSurfaceCommandRequest(
- AetheriaProviderAdvertisementProjector.ProviderId,
- AetheriaPlayerSettingsSurfaceProjector.SurfaceId,
- "aetheria.player_settings.graphics.show_asteroids.toggle",
- new Dictionary { ["source"] = "state-smoke" },
- DateTimeOffset.UtcNow,
- "aetheria-state-smoke"));
- AetheriaRuntimeEveCommandLog.QueueCommand(
- statePath,
- new EveSurfaceCommandRequest(
- AetheriaProviderAdvertisementProjector.ProviderId,
- AetheriaCatalogSurfaceProjector.SurfaceId,
+ "aetheria-state-smoke-eve-command-client");
+ var eveSubmitEnvelope = await eveCommandPort.SubmitEveCommandAsync(
+ AetheriaRuntimeEveCommandClient.ToDocument(
+ AetheriaRuntimeEveCommands.SubmitCatalogCommand(
+ statePath,
+ AetheriaRuntimeCatalogCommands.Refresh,
+ "aetheria-state-smoke")));
+ await using (var commandVerifyNode = await AetheriaStateNode.OpenAsync(
+ statePath,
+ "aetheria-state-smoke-eve-command-check"))
+ {
+ if (commandVerifyNode.ReadObservedEveCommands().All(command => command.CommandId != eveSubmitEnvelope!.CommandId))
+ throw new InvalidOperationException("Runtime command port Eve submission did not appear as a typed state record.");
+ }
+ await node.SubmitEveCommandAsync(AetheriaRuntimeEveCommandClient.ToDocument(
+ AetheriaRuntimeEveCommands.SubmitCatalogCommand(
+ statePath,
+ AetheriaRuntimeCatalogCommands.Refresh,
+ "aetheria-state-smoke")));
+ await node.SubmitEveCommandAsync(AetheriaRuntimeEveCommandClient.ToDocument(
+ AetheriaRuntimeEveCommands.SubmitPlayerSettingsCommand(
+ statePath,
+ AetheriaRuntimePlayerSettingsCommands.IncrementSignificantDigits,
+ new AetheriaRuntimePlayerSettingsCommandBody(),
+ "aetheria-state-smoke")));
+ await node.SubmitEveCommandAsync(AetheriaRuntimeEveCommandClient.ToDocument(
+ AetheriaRuntimeEveCommands.SubmitPlayerSettingsCommand(
+ statePath,
+ AetheriaRuntimePlayerSettingsCommands.ToggleShowAsteroidsInMinimap,
+ new AetheriaRuntimePlayerSettingsCommandBody(),
+ "aetheria-state-smoke")));
+ await node.SubmitEveCommandAsync(AetheriaRuntimeEveCommandClient.ToDocument(
+ AetheriaRuntimeEveCommands.SubmitCatalogCommand(
+ statePath,
"aetheria.catalog.unknown",
- new Dictionary { ["source"] = "state-smoke" },
- DateTimeOffset.UtcNow,
- "aetheria-state-smoke"));
- var eveCommandReport = await AetheriaEveCommandBridge.ApplyPendingAsync(node);
- var eveCommandStatus = new AetheriaEveCommandDrainStatus
+ "aetheria-state-smoke")));
+ var eveCommandReport = await AetheriaEveCommandBridge.AcceptObservedAsync(node);
+ var eveCommandStatus = new AetheriaEveCommandAcceptanceStatus
{
RuntimeId = "smoke-runtime",
StatePath = statePath,
LastPollAtUtc = now,
LastAcceptedAtUtc = now,
- PendingBeforeApply = 4,
- CommandsAccepted = eveCommandReport.AcceptedPaths.Length,
+ ObservedBeforeAccept = 4,
+ CommandsAccepted = eveCommandReport.AcceptedCommandIds.Length,
CommandsRejected = eveCommandReport.RejectedCommands,
- AppliedCatalogRefreshes = eveCommandReport.AppliedCatalogRefreshes,
- AppliedOperationsRefreshes = eveCommandReport.AppliedOperationsRefreshes,
- AppliedPlayerSettingsCommands = eveCommandReport.AppliedPlayerSettingsCommands,
+ AppliedCatalogRefreshes = eveCommandReport.AcceptedCatalogRefreshes,
+ AppliedOperationsRefreshes = eveCommandReport.AcceptedOperationsRefreshes,
+ AppliedPlayerSettingsCommands = eveCommandReport.AcceptedPlayerSettingsCommands,
+ AccountedCommandIds = eveCommandReport.AccountedCommandIds,
LastRejectedCommand = eveCommandReport.LastRejectedCommand,
LastRejectedReason = eveCommandReport.LastRejectedReason,
Status = eveCommandReport.RejectedCommands > 0 ? "rejected" : "ok"
};
- await node.PutEveCommandDrainStatusAsync(eveCommandStatus);
+ await node.PutEveCommandAcceptanceStatusAsync(eveCommandStatus);
await node.PutOperationsSurfaceAsync(AetheriaOperationsSurfaceProjector.Build(
- drainStatus,
eveCommandStatus,
verseHostSettings: await node.GetVerseHostSettingsAsync(),
runtimeSession: await node.GetRuntimeSessionAsync("smoke-runtime")));
@@ -559,11 +605,15 @@ await using (var reopened = await AetheriaStateNode.OpenAsync(statePath, "aether
var nameFile = await reopened.GetNameFileByLegacyIdAsync(nameFileLegacyId);
var quarantine = await reopened.GetLegacyCatalogQuarantineAsync();
var catalogSurface = await reopened.GetCatalogSurfaceAsync();
- var drainStatus = await reopened.GetRuntimeCommitDrainStatusAsync();
- var eveCommandStatus = await reopened.GetEveCommandDrainStatusAsync();
+ var eveCommandStatus = await reopened.GetEveCommandAcceptanceStatusAsync();
var operationsSurface = await reopened.GetOperationsSurfaceAsync();
var playerSettingsSurface = await reopened.GetPlayerSettingsSurfaceAsync();
var advertisement = await reopened.GetProviderAdvertisementAsync();
+ var daemonProvider = await reopened.GetDaemonProviderAdvertisementAsync();
+ var daemonHealth = await reopened.GetDaemonHealthAsync();
+ var daemonCommandBoundary = await reopened.GetDaemonCommandBoundaryAsync();
+ var daemonFrame = await reopened.GetDaemonFrameAsync();
+ var daemonGameSurface = await reopened.GetDaemonGameSurfaceAsync();
var runtimeSession = await reopened.GetRuntimeSessionAsync("smoke-runtime");
var playerSettings = await reopened.GetPlayerSettingsAsync();
var loadout = await reopened.GetLoadoutTemplateAsync(loadoutKey);
@@ -602,32 +652,71 @@ await using (var reopened = await AetheriaStateNode.OpenAsync(statePath, "aether
throw new InvalidOperationException("Eve catalog surface did not survive flush/reopen.");
}
- if (drainStatus?.RuntimeId != "smoke-runtime" ||
- drainStatus.CommandsApplied != 1 ||
- eveCommandStatus?.CommandsAccepted != 3 ||
+ if (eveCommandStatus?.CommandsAccepted != 3 ||
eveCommandStatus.CommandsRejected != 1 ||
eveCommandStatus.AppliedCatalogRefreshes != 1 ||
eveCommandStatus.AppliedPlayerSettingsCommands != 2 ||
!eveCommandStatus.LastRejectedReason.Contains("not advertised", StringComparison.Ordinal) ||
operationsSurface?.Surface.Id != AetheriaOperationsSurfaceProjector.SurfaceId ||
!operationsSurface.Surface.Root.Children.Any(child => child.Id == "aetheria.operations.eveCommandDrain") ||
+ operationsSurface.Surface.Root.Children.Any(child => child.Id == "aetheria.operations.commitDrain") ||
!operationsSurface.Surface.Root.Children.Any(child => child.Id == "aetheria.operations.runtimeSession"))
{
- throw new InvalidOperationException("Runtime commit/Eve command drain status or operations surface did not survive flush/reopen.");
+ throw new InvalidOperationException("Eve request acceptance status or operations surface did not survive flush/reopen.");
}
if (advertisement?.ProviderId != AetheriaProviderAdvertisementProjector.ProviderId ||
- advertisement.Surfaces.Length < 3 ||
+ advertisement.Surfaces.Length < 7 ||
!advertisement.Surfaces.Any(surface => surface.SurfaceId == AetheriaCatalogSurfaceProjector.SurfaceId) ||
!advertisement.Surfaces.Any(surface => surface.SurfaceId == AetheriaOperationsSurfaceProjector.SurfaceId) ||
!advertisement.Surfaces.Any(surface => surface.SurfaceId == AetheriaPlayerSettingsSurfaceProjector.SurfaceId) ||
+ !advertisement.Surfaces.Any(surface =>
+ surface.SurfaceId == AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId &&
+ surface.Key == AetheriaProviderAdvertisementProjector.DaemonGameSurfaceKey) ||
+ !advertisement.Surfaces.Any(surface =>
+ surface.SurfaceId == AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId &&
+ surface.Key == AetheriaProviderAdvertisementProjector.DaemonGameTuiSurfaceKey) ||
+ !advertisement.Surfaces.Any(surface =>
+ surface.SurfaceId == AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId &&
+ surface.Key == AetheriaProviderAdvertisementProjector.DaemonEditorSurfaceKey) ||
+ !advertisement.Surfaces.Any(surface =>
+ surface.SurfaceId == AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId &&
+ surface.Key == AetheriaProviderAdvertisementProjector.DaemonEditorTuiSurfaceKey) ||
!advertisement.Schemas.Contains("aetheria.runtime_session.v1") ||
+ !advertisement.Schemas.Contains(AetheriaRuntimeDaemonSchemas.ProviderAdvertisement) ||
+ !advertisement.Schemas.Contains(AetheriaRuntimeDaemonSchemas.Frame) ||
+ !advertisement.Schemas.Contains(AetheriaRuntimeDaemonSchemas.SoaView) ||
+ !advertisement.Schemas.Contains(AetheriaRuntimeDaemonSchemas.Health) ||
+ !advertisement.Schemas.Contains(AetheriaRuntimeDaemonSchemas.CommandBoundary) ||
+ !advertisement.Schemas.Contains(AetheriaRuntimeDaemonSchemas.GameSurface) ||
+ !advertisement.Schemas.Contains(AetheriaRuntimeDaemonSchemas.EditorSurface) ||
+ !advertisement.Witnesses.Any(witness =>
+ witness.Kind == "cultcache-witness" &&
+ witness.Ref == AetheriaRuntimeStateBoundary.GetDaemonProviderPath(statePath)) ||
+ !advertisement.Witnesses.Any(witness =>
+ witness.Kind == "cultcache-witness" &&
+ witness.Ref == AetheriaRuntimeStateBoundary.GetDaemonCommandBoundaryPath(statePath)) ||
+ !advertisement.Commands.Any(command =>
+ command.Command == "aetheria.daemon.commands" &&
+ command.Transport == "cultcache-witness") ||
!advertisement.Commands.Any(command => command.Command == "aetheria.player_settings.graphics.show_asteroids.toggle") ||
!advertisement.Schemas.Contains(AetheriaEveCommandBridge.CommandSchema))
{
throw new InvalidOperationException("Aetheria Eve provider advertisement did not survive flush/reopen.");
}
+ if (daemonProvider?.DaemonId != "smoke-daemon" ||
+ daemonHealth?.FrameId != 7 ||
+ daemonCommandBoundary?.BoundaryId != "aetheria.daemon.commands" ||
+ !daemonCommandBoundary.Commands.Any(command => command.Kind == AetheriaRuntimeDaemonCommandKinds.FireWeaponGroup) ||
+ daemonFrame?.FrameId != 7 ||
+ daemonFrame.SessionId != "smoke-session" ||
+ daemonGameSurface?.Surface.Id != AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId ||
+ daemonGameSurface.Surface.Root.Id != "aetheria.daemon.game.root")
+ {
+ throw new InvalidOperationException("Daemon Verse API documents did not survive flush/reopen as typed CultCache records.");
+ }
+
if (runtimeSession?.RuntimeId != "smoke-runtime" ||
runtimeSession.Role != "state-smoke" ||
runtimeSession.Status != "running")
diff --git a/Aetheria.State.Unity.Smoke/Aetheria.State.Unity.Smoke.csproj b/Aetheria.State.Unity.Smoke/Aetheria.State.Unity.Smoke.csproj
index 6516b3064..169606e45 100644
--- a/Aetheria.State.Unity.Smoke/Aetheria.State.Unity.Smoke.csproj
+++ b/Aetheria.State.Unity.Smoke/Aetheria.State.Unity.Smoke.csproj
@@ -9,5 +9,7 @@
+
+
diff --git a/Aetheria.State.Unity.Smoke/Program.cs b/Aetheria.State.Unity.Smoke/Program.cs
index 847da0cdd..88af307ab 100644
--- a/Aetheria.State.Unity.Smoke/Program.cs
+++ b/Aetheria.State.Unity.Smoke/Program.cs
@@ -1,8 +1,8 @@
+extern alias PackageUnity;
+
using Aetheria.State;
using Aetheria.State.Unity;
-using GameCult.Aetheria.State.Unity;
-using GameCult.Eve.Surface;
-using MessagePack;
+using PackageUnity::GameCult.Aetheria.State.Unity;
var root = args.Length > 0 ? Path.GetFullPath(args[0]) : Directory.GetCurrentDirectory();
var statePath = args.Length > 1
@@ -164,836 +164,53 @@ if (packageSurface == null ||
packageSurface.ProviderId != "aetheria" ||
packageSurface.Surface.Root.Kind != "surface" ||
packageSurface.Surface.Root.Children.Count == 0 ||
- packageSurface.Commands.All(command => command.Command != "aetheria.catalog.refresh"))
+ packageSurface.Commands.All(command => command.Command != AetheriaRuntimeCatalogCommands.Refresh))
{
throw new InvalidOperationException("Package runtime store did not read the typed Eve surface contract from CultCache.");
}
try
{
- var commit = AetheriaRuntimeStateCommitLog.QueuePlayerSettings(
+ var eveCommand = AetheriaRuntimeEveCommands.SubmitCatalogCommand(
commitSmokeStatePath,
- new AetheriaRuntimePlayerSettingsCommit
+ AetheriaRuntimeCatalogCommands.Refresh,
+ "aetheria-state-unity-smoke");
+ await using var eveCommandNode = await AetheriaStateNode.OpenAsync(
+ commitSmokeStatePath,
+ "aetheria-unity-runtime-eve-command-smoke");
+ await eveCommandNode.SubmitEveCommandAsync(new GameCult.Aetheria.State.Unity.AetheriaRuntimeEveCommandDocument
+ {
+ Schema = eveCommand.Schema,
+ CommandId = eveCommand.CommandId,
+ ProviderId = eveCommand.ProviderId,
+ SurfaceId = eveCommand.SurfaceId,
+ Command = eveCommand.Command,
+ IssuedAtUtc = eveCommand.IssuedAtUtc,
+ ClientId = eveCommand.ClientId,
+ PlayerSettings = new GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommandBody
{
- PlayerName = "Unity smoke",
- TutorialPassed = true,
- ActionBarInputs = new[] { "/1" }
- });
- AetheriaRuntimeStateCommitLog.QueueLoadoutTemplate(
- commitSmokeStatePath,
- new AetheriaRuntimeLoadoutTemplateCommit
+ PlayerName = eveCommand.PlayerSettings.PlayerName
+ },
+ InputSettings = new GameCult.Aetheria.State.Unity.AetheriaRuntimeInputSettingsCommandBody
{
- Name = "Unity Smoke Loadout",
- OwnerPlayerKey = "global:aetheria.player_settings.v1",
- RootEntity = new AetheriaRuntimeEntityLoadoutCommit
- {
- Name = "Unity Smoke Ship",
- Kind = "ship",
- FactionKey = "aetheria.corporation:legacy:smoke:faction",
- Hull = new AetheriaRuntimeLoadoutItemCommit
- {
- ItemKey = "aetheria.item_definition:legacy:smoke:hull",
- Quality = 0.7,
- Durability = 0.6
- },
- Equipment = new[]
- {
- new AetheriaRuntimeLoadoutItemSlotCommit
- {
- X = 1,
- Y = 2,
- Item = new AetheriaRuntimeLoadoutItemCommit
- {
- ItemKey = "aetheria.item_definition:legacy:smoke:weapon",
- Quality = 0.9,
- Durability = 0.8,
- Enabled = false,
- OverrideShutdown = true
- }
- }
- },
- CargoContents = new[]
- {
- new AetheriaRuntimeCargoBayLoadoutCommit
- {
- Items = new[]
- {
- new AetheriaRuntimeLoadoutItemSlotCommit
- {
- X = 3,
- Y = 4,
- Item = new AetheriaRuntimeLoadoutItemCommit
- {
- ItemKey = "aetheria.item_definition:legacy:smoke:ore",
- Quantity = 5
- }
- }
- }
- }
- },
- DockingBayAssignments = new[] { -1 },
- WeaponGroups = new[] { new[] { 0 } }
- }
- });
- var runCommit = AetheriaRuntimeStateCommitLog.QueueRunCheckpoint(
- commitSmokeStatePath,
- new AetheriaRuntimeRunCheckpointCommit
- {
- RunId = "smoke-run",
- GenerationSeed = 424242,
- CurrentZoneIndex = 0,
- CurrentEntityKey = "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1",
- DiscoveredZoneIndices = new[] { 0 },
- ActionBarBindings = new[]
- {
- new AetheriaRuntimeActionBarBindingCommit
- {
- ControlPath = "/1",
- Kind = "weapon_group",
- WeaponGroup = 0
- },
- new AetheriaRuntimeActionBarBindingCommit
- {
- ControlPath = "/2",
- Kind = "gear",
- ItemKey = "aetheria.item_definition:legacy:smoke:weapon",
- EquipmentIndex = 0,
- BehaviorIndex = 1
- }
- },
- FactionRelationships = new[]
- {
- new AetheriaRuntimeFactionRelationshipCommit
- {
- FactionKey = "aetheria.corporation:legacy:smoke:faction",
- Relationship = "Friendly",
- Standing = 3
- }
- },
- Zones = new[]
- {
- new AetheriaRuntimeZoneSnapshotCommit
- {
- ZoneIndex = 0,
- Name = "Unity Smoke Zone",
- PositionX = 12.0,
- PositionY = -4.0,
- AdjacentZoneIndices = new[] { 1 },
- OwnerFactionIndex = 0,
- Orbits = new[]
- {
- new AetheriaRuntimeOrbitSnapshotCommit
- {
- OrbitKey = "aetheria.orbit:legacy:smoke:orbit",
- ParentOrbitKey = "aetheria.orbit:legacy:smoke:parent-orbit",
- Distance = 100.0,
- Phase = 0.25,
- FixedPositionX = 5.0,
- FixedPositionY = -6.0
- }
- },
- Bodies = new[]
- {
- new AetheriaRuntimeBodySnapshotCommit
- {
- BodyKey = "aetheria.body:legacy:smoke:body",
- Kind = "asteroid_belt",
- Name = "Smoke Belt",
- OrbitKey = "aetheria.orbit:legacy:smoke:orbit",
- Mass = 42.0,
- Resources = new[]
- {
- new AetheriaRuntimeBodyResourceCommit
- {
- ItemKey = "aetheria.item_definition:legacy:smoke:ore",
- Amount = 3.5
- }
- },
- BodyRadiusMultiplier = 1.25,
- GravityRadiusMultiplier = 2.0,
- GravityDepthMultiplier = 0.5,
- GravityDepthExponent = 12.0,
- Asteroids = new[]
- {
- new AetheriaRuntimeAsteroidCommit
- {
- Distance = 7.0,
- Phase = 0.75,
- Size = 2.0,
- RotationSpeed = 0.5,
- Damage = 1.25,
- RespawnTimer = 6.5,
- MiningAccumulators = new[]
- {
- new AetheriaRuntimeAsteroidMiningAccumulatorCommit
- {
- MinerEntityIndex = 0,
- Amount = 0.75
- }
- }
- }
- }
- }
- },
- DroppedPickups = new[]
- {
- new AetheriaRuntimeDroppedPickupCommit
- {
- PickupIndex = 2,
- PositionX = 9.0,
- PositionY = 1.5,
- PositionZ = -3.0,
- VelocityX = 0.25,
- VelocityY = -0.5,
- VelocityZ = 2.0,
- Item = new AetheriaRuntimeLoadoutItemCommit
- {
- ItemKey = "aetheria.item_definition:legacy:smoke:ore",
- Quantity = 11
- }
- }
- },
- Entities = new[]
- {
- new AetheriaRuntimeEntitySnapshotCommit
- {
- EntityIndex = 0,
- Name = "Unity Smoke Ship",
- Kind = "ship",
- PositionX = 1.0,
- PositionY = 2.0,
- PositionZ = 3.0,
- DirectionX = 0.0,
- DirectionY = 1.0,
- FactionKey = "aetheria.corporation:legacy:smoke:faction",
- VelocityX = 4.0,
- VelocityY = -2.0,
- TargetEntityIndex = 0,
- IsActive = true,
- HeatsinksEnabled = false,
- OverrideShutdown = true,
- TractorPower = 12.5,
- Heatstroke = 0.25,
- Hypothermia = 0.125,
- HullItemKey = "aetheria.item_definition:legacy:smoke:hull",
- Equipment = new[]
- {
- new AetheriaRuntimeLoadoutItemSlotCommit
- {
- X = 0,
- Y = 0,
- Item = new AetheriaRuntimeLoadoutItemCommit
- {
- ItemKey = "aetheria.item_definition:legacy:smoke:weapon",
- Quality = 0.9,
- Durability = 0.8,
- Enabled = false,
- OverrideShutdown = true
- }
- }
- },
- CargoContents = new[]
- {
- new AetheriaRuntimeCargoBayLoadoutCommit
- {
- Items = new[]
- {
- new AetheriaRuntimeLoadoutItemSlotCommit
- {
- X = 2,
- Y = 3,
- Item = new AetheriaRuntimeLoadoutItemCommit
- {
- ItemKey = "aetheria.item_definition:legacy:smoke:ore",
- Quantity = 7
- }
- }
- }
- }
- },
- DockingBayAssignments = new[] { -1 },
- Visibility = 12.75,
- VisibilitySourceCount = 3,
- Contacts = new[]
- {
- new AetheriaRuntimeEntityContactCommit
- {
- TargetEntityIndex = 0,
- InfoGathered = 0.85,
- Hostile = true,
- Visible = true
- }
- },
- WeaponGroups = new[] { new[] { 0 } },
- ActiveConsumables = new[]
- {
- new AetheriaRuntimeActiveConsumableCommit
- {
- ItemKey = "aetheria.item_definition:legacy:smoke:consumable",
- Quality = 0.75,
- RemainingDuration = 3.0,
- Duration = 5.0
- }
- },
- BehaviorProgress = new[]
- {
- new AetheriaRuntimeBehaviorProgressCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 0,
- BehaviorIndex = 1,
- BehaviorKind = "Cooldown",
- Progress = 0.5
- },
- new AetheriaRuntimeBehaviorProgressCommit
- {
- OwnerKind = "active_consumable",
- OwnerIndex = 0,
- BehaviorIndex = 0,
- BehaviorKind = "Shield",
- Progress = 0.75
- }
- },
- WeaponStates = new[]
- {
- new AetheriaRuntimeWeaponStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 0,
- BehaviorIndex = 1,
- BehaviorKind = "InstantWeapon",
- Firing = true,
- Ammo = 2,
- BurstRemaining = 3,
- BurstTimer = 0.25,
- BurstInterval = 0.125,
- CooldownProgress = 0.5,
- CoolingDown = true
- },
- new AetheriaRuntimeWeaponStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 1,
- BehaviorIndex = 0,
- BehaviorKind = "ChargedWeapon",
- Ammo = 1,
- Charging = true,
- Charged = false,
- Charge = 0.8
- },
- new AetheriaRuntimeWeaponStateCommit
- {
- OwnerKind = "active_consumable",
- OwnerIndex = 0,
- BehaviorIndex = 0,
- BehaviorKind = "ConstantWeapon",
- Firing = true,
- Ammo = 1,
- Reloading = true,
- ReloadProgress = 0.4,
- AmmoIntervalProgress = 0.6
- },
- new AetheriaRuntimeWeaponStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 2,
- BehaviorIndex = 1,
- BehaviorKind = "LockWeapon",
- Ammo = 1,
- LockProgress = 0.65,
- LockTargetEntityIndex = 0
- }
- },
- BehaviorStates = new[]
- {
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 0,
- BehaviorIndex = 2,
- BehaviorKind = "Sensor",
- Pinging = true,
- PingCooldown = 0.25,
- PingLerp = 0.5,
- PingRadius = 1200.0,
- PingedEntityCount = 3
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 1,
- BehaviorIndex = 0,
- BehaviorKind = "Radiator",
- RadiatorTemperature = 450.0,
- Emissivity = 0.8,
- PumpedHeat = 12.0,
- WasteHeat = 1.5,
- EnergyUsage = 2.25
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 2,
- BehaviorIndex = 0,
- BehaviorKind = "Reactor",
- ReactorDraw = 4.5,
- ReactorLoadRatio = 1.25
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 3,
- BehaviorIndex = 0,
- BehaviorKind = "Capacitor",
- CapacitorCharge = 7.5,
- CapacitorCapacity = 10.0,
- CapacitorEfficiency = 0.95
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 4,
- BehaviorIndex = 0,
- BehaviorKind = "AetherDrive",
- AetherDriveAxisX = 0.5,
- AetherDriveAxisY = -0.25,
- AetherDriveAxisZ = 0.75,
- AetherDriveThrustX = 12.0,
- AetherDriveThrustY = 6.0,
- AetherDriveThrustZ = 3.0,
- AetherDriveRpmX = 1200.0,
- AetherDriveRpmY = 900.0,
- AetherDriveRpmZ = 450.0,
- AetherDriveMaximumRpm = 2400.0,
- AetherDriveThrustDirectionX = 1.5,
- AetherDriveThrustDirectionY = -0.5
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 5,
- BehaviorIndex = 0,
- BehaviorKind = "ResourceScanner",
- ResourceScannerTargetBodyKey = "aetheria.body:legacy:smoke:body",
- ResourceScannerAsteroidIndex = 2,
- ResourceScannerScanTime = 1.25,
- ResourceScannerRange = 500.0,
- ResourceScannerMinimumDensity = 0.2,
- ResourceScannerScanDuration = 3.5
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 6,
- BehaviorIndex = 0,
- BehaviorKind = "MiningTool",
- MiningToolAsteroidBeltKey = "aetheria.body:legacy:smoke:body",
- MiningToolAsteroidIndex = 3,
- MiningToolRange = 275.0
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 7,
- BehaviorIndex = 0,
- BehaviorKind = "Thruster",
- ThrusterAxis = 0.8,
- ThrusterThrust = 125.0,
- ThrusterTorque = -0.4
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 8,
- BehaviorIndex = 0,
- BehaviorKind = "Shield",
- ShieldEfficiency = 0.7,
- ShieldEnergyUsage = 1.4
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 9,
- BehaviorIndex = 0,
- BehaviorKind = "VelocityLimit",
- VelocityLimit = 42.0
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 10,
- BehaviorIndex = 0,
- BehaviorKind = "Thermotoggle",
- ThermotoggleTargetTemperature = 315.5
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 11,
- BehaviorIndex = 0,
- BehaviorKind = "Switch",
- SwitchActivated = true
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 12,
- BehaviorIndex = 0,
- BehaviorKind = "Trigger",
- TriggerPulled = true
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 13,
- BehaviorIndex = 0,
- BehaviorKind = "StatModifier",
- StatModifierApplied = true,
- StatModifierExecuted = true,
- StatModifierTargetStatCount = 2
- },
- new AetheriaRuntimeBehaviorStateCommit
- {
- OwnerKind = "equipment",
- OwnerIndex = 14,
- BehaviorIndex = 0,
- BehaviorKind = "TurretController",
- TurretControllerWeaponCount = 2,
- TurretControllerShotSpeed = 80.0,
- TurretControllerPredictShots = true
- }
- },
- StatGrids = new[]
- {
- new AetheriaRuntimeEntityStatGridCommit
- {
- Name = "temperature",
- Width = 2,
- Height = 1,
- Values = new[] { 280.0, 281.0 }
- },
- new AetheriaRuntimeEntityStatGridCommit
- {
- Name = "hull_conductivity_x",
- Width = 2,
- Height = 1,
- Values = new[] { 1.0, 0.0 }
- }
- }
- }
- }
- }
- }
- });
- var pending = AetheriaRuntimeStateCommitLog.ReadPending(commitSmokeStatePath);
- if (pending.Count != 3 ||
- pending[0].Kind != AetheriaRuntimeCommitKind.PlayerSettings ||
- pending[0].Schema != AetheriaRuntimeStateCommitLog.CommitSchema ||
- pending[0].Path != commit.Path)
+ ActionName = eveCommand.InputSettings.ActionName,
+ BindingIndex = eveCommand.InputSettings.BindingIndex,
+ InputSystemPath = eveCommand.InputSettings.InputSystemPath,
+ Enabled = eveCommand.InputSettings.Enabled
+ }
+ });
+ var eveSubmitted = eveCommandNode.ReadObservedEveCommands();
+ if (eveSubmitted.Count != 1 ||
+ eveSubmitted[0].Schema != AetheriaRuntimeEveCommandClient.CommandSchema ||
+ eveSubmitted[0].CommandId != eveCommand.CommandId ||
+ eveSubmitted[0].ProviderId != "aetheria" ||
+ eveSubmitted[0].SurfaceId != AetheriaRuntimeCatalogCommands.SurfaceId ||
+ eveSubmitted[0].Command != AetheriaRuntimeCatalogCommands.Refresh ||
+ eveSubmitted[0].PlayerSettings == null ||
+ eveSubmitted[0].InputSettings == null)
{
- throw new InvalidOperationException("Runtime state commit log did not read the queued player settings command.");
+ throw new InvalidOperationException("Runtime Eve command state record did not preserve typed command envelopes separately from state commits.");
}
- AssertPendingCultCacheEnvelope(commit.Path, AetheriaRuntimeStateCommitDocument.SchemaId);
- AssertRunCheckpointPendingPayloadUsesCurrentEntityKey(runCommit.Path);
-
- var typedNodeApplied = false;
- await using (var commitNode = await AetheriaStateNode.OpenAsync(commitSmokeStatePath, "aetheria-unity-runtime-commit-smoke"))
- {
- var report = await AetheriaRuntimeCommitLogApplier.ApplyPendingAsync(commitNode);
- var settings = await commitNode.GetPlayerSettingsAsync();
- var loadout = await commitNode.GetLoadoutTemplateAsync(new("global:aetheria.loadout_template.unity-smoke-loadout.v1"));
- var run = await commitNode.GetRunStateAsync(new("global:aetheria.run_state.smoke-run.v1"));
- var zone = await commitNode.GetZoneStateAsync(new("global:aetheria.run_state.smoke-run.zone.0.v1"));
- var entity = await commitNode.GetEntitySnapshotAsync(new("global:aetheria.run_state.smoke-run.zone.0.entity.0.v1"));
- typedNodeApplied = report.AppliedPlayerSettings == 1 &&
- report.AppliedLoadoutTemplates == 1 &&
- report.AppliedRunCheckpoints == 1 &&
- settings?.PlayerName == "Unity smoke" &&
- settings.Input.ActionBarInputs.Length == 1 &&
- loadout?.Name == "Unity Smoke Loadout" &&
- loadout.RootEntity.Hull.ItemKey == "aetheria.item_definition:legacy:smoke:hull" &&
- loadout.RootEntity.FactionKey == "aetheria.corporation:legacy:smoke:faction" &&
- loadout.RootEntity.Equipment.Length == 1 &&
- loadout.RootEntity.Equipment[0].Position.X == 1 &&
- !loadout.RootEntity.Equipment[0].Item.Enabled &&
- loadout.RootEntity.Equipment[0].Item.OverrideShutdown &&
- loadout.RootEntity.CargoContents.Length == 1 &&
- loadout.RootEntity.CargoContents[0].Items[0].Item.Quantity == 5 &&
- run?.ZoneKeys.Length == 1 &&
- run.CurrentEntityKey == "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" &&
- run.GenerationSeed == 424242 &&
- run.ActionBarBindings.Length == 2 &&
- run.ActionBarBindings[0].ControlPath == "/1" &&
- run.ActionBarBindings[0].Kind == "weapon_group" &&
- run.ActionBarBindings[0].WeaponGroup == 0 &&
- run.ActionBarBindings[1].ControlPath == "/2" &&
- run.ActionBarBindings[1].Kind == "gear" &&
- run.ActionBarBindings[1].TargetKey == "aetheria.item_definition:legacy:smoke:weapon" &&
- run.ActionBarBindings[1].EquipmentIndex == 0 &&
- run.ActionBarBindings[1].BehaviorIndex == 1 &&
- run.FactionRelationships.Length == 1 &&
- run.FactionRelationships[0].FactionKey == "aetheria.corporation:legacy:smoke:faction" &&
- run.FactionRelationships[0].Relationship == "Friendly" &&
- run.FactionRelationships[0].Standing == 3 &&
- zone?.EntityKeys.Length == 1 &&
- zone.Orbits.Length == 1 &&
- zone.Orbits[0].OrbitKey == "aetheria.orbit:legacy:smoke:orbit" &&
- zone.Orbits[0].ParentOrbitKey == "aetheria.orbit:legacy:smoke:parent-orbit" &&
- zone.Orbits[0].FixedPosition.X == 5.0 &&
- zone.Bodies.Length == 1 &&
- zone.Bodies[0].BodyKey == "aetheria.body:legacy:smoke:body" &&
- zone.Bodies[0].OrbitKey == "aetheria.orbit:legacy:smoke:orbit" &&
- zone.Bodies[0].Kind == "asteroid_belt" &&
- zone.Bodies[0].Resources.Length == 1 &&
- zone.Bodies[0].Resources[0].ItemKey == "aetheria.item_definition:legacy:smoke:ore" &&
- zone.Bodies[0].Asteroids.Length == 1 &&
- zone.Bodies[0].Asteroids[0].Damage == 1.25 &&
- zone.Bodies[0].Asteroids[0].RespawnTimer == 6.5 &&
- zone.Bodies[0].Asteroids[0].MiningAccumulators.Length == 1 &&
- zone.Bodies[0].Asteroids[0].MiningAccumulators[0].MinerEntityKey == "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" &&
- zone.Bodies[0].Asteroids[0].MiningAccumulators[0].Amount == 0.75 &&
- zone.DroppedPickups.Length == 1 &&
- zone.DroppedPickups[0].PickupIndex == 2 &&
- zone.DroppedPickups[0].Position.X == 9.0 &&
- zone.DroppedPickups[0].Velocity.Z == 2.0 &&
- zone.DroppedPickups[0].Item.ItemKey == "aetheria.item_definition:legacy:smoke:ore" &&
- zone.DroppedPickups[0].Item.Quantity == 11 &&
- entity?.Equipment.Length == 1 &&
- entity.FactionKey == "aetheria.corporation:legacy:smoke:faction" &&
- entity.Equipment[0].Quality == 0.9 &&
- entity.Equipment[0].Durability == 0.8 &&
- entity.Equipment[0].Quantity == 1 &&
- !entity.Equipment[0].Enabled &&
- entity.Equipment[0].OverrideShutdown &&
- entity.Velocity.X == 4.0 &&
- entity.Velocity.Y == -2.0 &&
- entity.TargetEntityKey == "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" &&
- entity.IsActive &&
- !entity.HeatsinksEnabled &&
- entity.OverrideShutdown &&
- entity.TractorPower == 12.5 &&
- entity.Heatstroke == 0.25 &&
- entity.Hypothermia == 0.125 &&
- entity.ActiveConsumables.Length == 1 &&
- entity.CargoContents.Length == 1 &&
- entity.CargoContents[0].Items[0].Item.Quantity == 7 &&
- entity.DockingBayAssignments.Length == 1 &&
- entity.DockingBayAssignments[0] == -1 &&
- entity.Visibility == 12.75 &&
- entity.VisibilitySourceCount == 3 &&
- entity.Contacts.Length == 1 &&
- entity.Contacts[0].TargetEntityKey == "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" &&
- entity.Contacts[0].InfoGathered == 0.85 &&
- entity.Contacts[0].Hostile &&
- entity.Contacts[0].Visible &&
- entity.ActiveConsumables[0].ItemKey == "aetheria.item_definition:legacy:smoke:consumable" &&
- entity.ActiveConsumables[0].RemainingDuration == 3.0 &&
- entity.BehaviorProgress.Length == 2 &&
- entity.BehaviorProgress[0].OwnerKind == "equipment" &&
- entity.BehaviorProgress[0].BehaviorKind == "Cooldown" &&
- entity.BehaviorProgress[0].Progress == 0.5 &&
- entity.BehaviorProgress[1].OwnerKind == "active_consumable" &&
- entity.BehaviorProgress[1].Progress == 0.75 &&
- entity.WeaponStates.Length == 4 &&
- entity.WeaponStates[0].BehaviorKind == "InstantWeapon" &&
- entity.WeaponStates[0].Firing &&
- entity.WeaponStates[0].Ammo == 2 &&
- entity.WeaponStates[0].BurstRemaining == 3 &&
- entity.WeaponStates[0].CooldownProgress == 0.5 &&
- entity.WeaponStates[0].CoolingDown &&
- entity.WeaponStates[1].BehaviorKind == "ChargedWeapon" &&
- entity.WeaponStates[1].Charging &&
- entity.WeaponStates[1].Charge == 0.8 &&
- entity.WeaponStates[2].OwnerKind == "active_consumable" &&
- entity.WeaponStates[2].BehaviorKind == "ConstantWeapon" &&
- entity.WeaponStates[2].Reloading &&
- entity.WeaponStates[2].AmmoIntervalProgress == 0.6 &&
- entity.WeaponStates[3].BehaviorKind == "LockWeapon" &&
- entity.WeaponStates[3].LockProgress == 0.65 &&
- entity.WeaponStates[3].LockTargetEntityKey == "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" &&
- entity.BehaviorStates.Length == 15 &&
- entity.BehaviorStates[0].BehaviorKind == "Sensor" &&
- entity.BehaviorStates[0].Pinging &&
- entity.BehaviorStates[0].PingRadius == 1200.0 &&
- entity.BehaviorStates[1].BehaviorKind == "Radiator" &&
- entity.BehaviorStates[1].RadiatorTemperature == 450.0 &&
- entity.BehaviorStates[1].PumpedHeat == 12.0 &&
- entity.BehaviorStates[2].BehaviorKind == "Reactor" &&
- entity.BehaviorStates[2].ReactorLoadRatio == 1.25 &&
- entity.BehaviorStates[3].BehaviorKind == "Capacitor" &&
- entity.BehaviorStates[3].CapacitorCharge == 7.5 &&
- entity.BehaviorStates[3].CapacitorEfficiency == 0.95 &&
- entity.BehaviorStates[4].BehaviorKind == "AetherDrive" &&
- entity.BehaviorStates[4].AetherDriveAxisX == 0.5 &&
- entity.BehaviorStates[4].AetherDriveRpmY == 900.0 &&
- entity.BehaviorStates[4].AetherDriveMaximumRpm == 2400.0 &&
- entity.BehaviorStates[4].AetherDriveThrustDirectionY == -0.5 &&
- entity.BehaviorStates[5].BehaviorKind == "ResourceScanner" &&
- entity.BehaviorStates[5].ResourceScannerTargetBodyKey == "aetheria.body:legacy:smoke:body" &&
- entity.BehaviorStates[5].ResourceScannerAsteroidIndex == 2 &&
- entity.BehaviorStates[5].ResourceScannerScanTime == 1.25 &&
- entity.BehaviorStates[5].ResourceScannerScanDuration == 3.5 &&
- entity.BehaviorStates[6].BehaviorKind == "MiningTool" &&
- entity.BehaviorStates[6].MiningToolAsteroidBeltKey == "aetheria.body:legacy:smoke:body" &&
- entity.BehaviorStates[6].MiningToolAsteroidIndex == 3 &&
- entity.BehaviorStates[6].MiningToolRange == 275.0 &&
- entity.BehaviorStates[7].BehaviorKind == "Thruster" &&
- entity.BehaviorStates[7].ThrusterAxis == 0.8 &&
- entity.BehaviorStates[7].ThrusterThrust == 125.0 &&
- entity.BehaviorStates[7].ThrusterTorque == -0.4 &&
- entity.BehaviorStates[8].BehaviorKind == "Shield" &&
- entity.BehaviorStates[8].ShieldEfficiency == 0.7 &&
- entity.BehaviorStates[8].ShieldEnergyUsage == 1.4 &&
- entity.BehaviorStates[9].BehaviorKind == "VelocityLimit" &&
- entity.BehaviorStates[9].VelocityLimit == 42.0 &&
- entity.BehaviorStates[10].BehaviorKind == "Thermotoggle" &&
- entity.BehaviorStates[10].ThermotoggleTargetTemperature == 315.5 &&
- entity.BehaviorStates[11].BehaviorKind == "Switch" &&
- entity.BehaviorStates[11].SwitchActivated &&
- entity.BehaviorStates[12].BehaviorKind == "Trigger" &&
- entity.BehaviorStates[12].TriggerPulled &&
- entity.BehaviorStates[13].BehaviorKind == "StatModifier" &&
- entity.BehaviorStates[13].StatModifierApplied &&
- entity.BehaviorStates[13].StatModifierExecuted &&
- entity.BehaviorStates[13].StatModifierTargetStatCount == 2 &&
- entity.BehaviorStates[14].BehaviorKind == "TurretController" &&
- entity.BehaviorStates[14].TurretControllerWeaponCount == 2 &&
- entity.BehaviorStates[14].TurretControllerShotSpeed == 80.0 &&
- entity.BehaviorStates[14].TurretControllerPredictShots &&
- entity.WeaponGroups.Length == 1 &&
- entity.StatGrids.Length == 2 &&
- entity.StatGrids.Any(grid => grid.Name == "temperature" && grid.Values.Length == 2 && grid.Values[1] == 281.0) &&
- entity.StatGrids.Any(grid => grid.Name == "hull_conductivity_x" && grid.Values.Length == 2 && grid.Values[0] == 1.0) &&
- AetheriaRuntimeStateCommitLog.ReadPending(commitSmokeStatePath).Count == 0;
- }
-
- var packageSettings = AetheriaRuntimeCatalogStore.ReadPlayerSettings(commitSmokeStatePath);
- var packageLoadouts = AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(commitSmokeStatePath);
- var packageRuns = AetheriaRuntimeCatalogStore.ReadRunStates(commitSmokeStatePath);
- var packageZones = AetheriaRuntimeCatalogStore.ReadZoneStates(commitSmokeStatePath);
- var packageEntities = AetheriaRuntimeCatalogStore.ReadEntitySnapshots(commitSmokeStatePath);
- if (!typedNodeApplied ||
- packageSettings?.PlayerName != "Unity smoke" ||
- packageSettings.TutorialPassed != true ||
- packageSettings.ActionBarInputs.Count != 1 ||
- packageLoadouts.Count != 1 ||
- packageLoadouts[0].RootEntity.Hull.ItemKey != "aetheria.item_definition:legacy:smoke:hull" ||
- packageLoadouts[0].RootEntity.FactionKey != "aetheria.corporation:legacy:smoke:faction" ||
- packageLoadouts[0].RootEntity.Equipment[0].X != 1 ||
- packageLoadouts[0].RootEntity.Equipment[0].Item.Enabled ||
- !packageLoadouts[0].RootEntity.Equipment[0].Item.OverrideShutdown ||
- packageLoadouts[0].RootEntity.CargoContents[0].Items[0].Item.Quantity != 5 ||
- packageRuns.Count != 1 ||
- packageRuns[0].RunId != "smoke-run" ||
- packageRuns[0].GenerationSeed != 424242 ||
- packageRuns[0].CurrentEntityKey != "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" ||
- packageRuns[0].ZoneKeys.Count != 1 ||
- packageRuns[0].ActionBarBindings.Count != 2 ||
- packageRuns[0].ActionBarBindings[1].TargetKey != "aetheria.item_definition:legacy:smoke:weapon" ||
- packageRuns[0].FactionRelationships.Count != 1 ||
- packageRuns[0].FactionRelationships[0].FactionKey != "aetheria.corporation:legacy:smoke:faction" ||
- packageZones.Count != 1 ||
- packageZones[0].RecordKey != "global:aetheria.run_state.smoke-run.zone.0.v1" ||
- packageZones[0].Name != "Unity Smoke Zone" ||
- packageZones[0].EntityKeys.Count != 1 ||
- packageZones[0].Orbits.Count != 1 ||
- packageZones[0].Orbits[0].OrbitKey != "aetheria.orbit:legacy:smoke:orbit" ||
- packageZones[0].Orbits[0].ParentOrbitKey != "aetheria.orbit:legacy:smoke:parent-orbit" ||
- packageZones[0].Orbits[0].FixedPositionX != 5.0 ||
- packageZones[0].Bodies.Count != 1 ||
- packageZones[0].Bodies[0].BodyKey != "aetheria.body:legacy:smoke:body" ||
- packageZones[0].Bodies[0].OrbitKey != "aetheria.orbit:legacy:smoke:orbit" ||
- packageZones[0].Bodies[0].ResourceCount != 1 ||
- packageZones[0].Bodies[0].AsteroidCount != 1 ||
- packageZones[0].Bodies[0].DamagedAsteroidCount != 1 ||
- packageZones[0].Bodies[0].RespawningAsteroidCount != 1 ||
- packageZones[0].Bodies[0].AsteroidMiningAccumulatorCount != 1 ||
- packageZones[0].DroppedPickups.Count != 1 ||
- packageZones[0].DroppedPickups[0].PickupIndex != 2 ||
- packageZones[0].DroppedPickups[0].PositionX != 9.0 ||
- packageZones[0].DroppedPickups[0].VelocityZ != 2.0 ||
- packageZones[0].DroppedPickups[0].Item.ItemKey != "aetheria.item_definition:legacy:smoke:ore" ||
- packageZones[0].DroppedPickups[0].Item.Quantity != 11 ||
- packageEntities.Count != 1 ||
- packageEntities[0].RecordKey != "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" ||
- packageEntities[0].Name != "Unity Smoke Ship" ||
- packageEntities[0].FactionKey != "aetheria.corporation:legacy:smoke:faction" ||
- packageEntities[0].Equipment[0].Quality != 0.9 ||
- packageEntities[0].Equipment[0].Durability != 0.8 ||
- packageEntities[0].Equipment[0].Quantity != 1 ||
- packageEntities[0].Equipment[0].Enabled ||
- !packageEntities[0].Equipment[0].OverrideShutdown ||
- packageEntities[0].VelocityX != 4.0 ||
- packageEntities[0].VelocityY != -2.0 ||
- packageEntities[0].TargetEntityKey != "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" ||
- packageEntities[0].ActiveConsumables.Count != 1 ||
- packageEntities[0].CargoContents.Count != 1 ||
- packageEntities[0].CargoContents[0].Items[0].Item.Quantity != 7 ||
- packageEntities[0].DockingBayAssignments.Count != 1 ||
- packageEntities[0].DockingBayAssignments[0] != -1 ||
- packageEntities[0].Visibility != 12.75 ||
- packageEntities[0].VisibilitySourceCount != 3 ||
- packageEntities[0].Contacts.Count != 1 ||
- packageEntities[0].Contacts[0].TargetEntityKey != "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" ||
- packageEntities[0].Contacts[0].InfoGathered != 0.85 ||
- !packageEntities[0].Contacts[0].Hostile ||
- !packageEntities[0].Contacts[0].Visible ||
- packageEntities[0].ActiveConsumables[0].ItemKey != "aetheria.item_definition:legacy:smoke:consumable" ||
- packageEntities[0].BehaviorProgress.Count != 2 ||
- packageEntities[0].WeaponStates.Count != 4 ||
- packageEntities[0].WeaponStates[2].AmmoIntervalProgress != 0.6 ||
- packageEntities[0].WeaponStates[3].LockProgress != 0.65 ||
- packageEntities[0].WeaponStates[3].LockTargetEntityKey != "global:aetheria.run_state.smoke-run.zone.0.entity.0.v1" ||
- packageEntities[0].BehaviorStates.Count != 15 ||
- packageEntities[0].BehaviorStates[3].CapacitorCharge != 7.5 ||
- packageEntities[0].BehaviorStates[4].AetherDriveRpmY != 900.0 ||
- packageEntities[0].BehaviorStates[4].AetherDriveMaximumRpm != 2400.0 ||
- packageEntities[0].BehaviorStates[5].ResourceScannerTargetBodyKey != "aetheria.body:legacy:smoke:body" ||
- packageEntities[0].BehaviorStates[5].ResourceScannerScanDuration != 3.5 ||
- packageEntities[0].BehaviorStates[6].MiningToolAsteroidBeltKey != "aetheria.body:legacy:smoke:body" ||
- packageEntities[0].BehaviorStates[6].MiningToolRange != 275.0 ||
- packageEntities[0].BehaviorStates[7].ThrusterAxis != 0.8 ||
- packageEntities[0].BehaviorStates[7].ThrusterThrust != 125.0 ||
- packageEntities[0].BehaviorStates[8].ShieldEfficiency != 0.7 ||
- packageEntities[0].BehaviorStates[9].VelocityLimit != 42.0 ||
- packageEntities[0].BehaviorStates[10].ThermotoggleTargetTemperature != 315.5 ||
- !packageEntities[0].BehaviorStates[11].SwitchActivated ||
- !packageEntities[0].BehaviorStates[12].TriggerPulled ||
- !packageEntities[0].BehaviorStates[13].StatModifierApplied ||
- packageEntities[0].BehaviorStates[13].StatModifierTargetStatCount != 2 ||
- packageEntities[0].BehaviorStates[14].TurretControllerWeaponCount != 2 ||
- packageEntities[0].BehaviorStates[14].TurretControllerShotSpeed != 80.0 ||
- !packageEntities[0].BehaviorStates[14].TurretControllerPredictShots ||
- packageEntities[0].StatGrids.Count != 2 ||
- packageEntities[0].StatGrids.All(grid => grid.Name != "temperature" || grid.Values.Count != 2 || grid.Values[1] != 281.0))
- {
- throw new InvalidOperationException(
- "Runtime state commit log did not apply queued settings/loadout/run snapshots through the typed state node. " +
- $"typedNodeApplied={typedNodeApplied}, packageSettings={(packageSettings == null ? "null" : $"{packageSettings.PlayerName}/{packageSettings.TutorialPassed}/{packageSettings.ActionBarInputs.Count}")}, packageLoadouts={packageLoadouts.Count}, packageRuns={packageRuns.Count}, packageZones={packageZones.Count}, packageEntities={packageEntities.Count}");
- }
-
- var eveCommand = AetheriaRuntimeEveCommandLog.QueueCommand(
- commitSmokeStatePath,
- new EveSurfaceCommandRequest(
- "aetheria",
- "aetheria.catalog.operator",
- "aetheria.catalog.refresh",
- new Dictionary { ["source"] = "unity-smoke" },
- DateTimeOffset.UtcNow,
- "aetheria-state-unity-smoke"));
- var evePending = AetheriaRuntimeEveCommandLog.ReadPending(commitSmokeStatePath);
- if (evePending.Count != 1 ||
- evePending[0].Schema != AetheriaRuntimeEveCommandLog.CommandSchema ||
- evePending[0].CommandId != eveCommand.CommandId ||
- evePending[0].ProviderId != "aetheria" ||
- evePending[0].SurfaceId != "aetheria.catalog.operator" ||
- evePending[0].Command != "aetheria.catalog.refresh" ||
- evePending[0].Payload["source"] != "unity-smoke" ||
- AetheriaRuntimeStateCommitLog.ReadPending(commitSmokeStatePath).Count != 0)
- {
- throw new InvalidOperationException("Runtime Eve command log did not preserve typed command envelopes separately from state commits.");
- }
- AssertPendingCultCacheEnvelope(eveCommand.Path, AetheriaRuntimeEveCommandDocument.SchemaId);
}
finally
{
@@ -1011,131 +228,7 @@ Console.WriteLine($"Behavior payload sample: {behaviorHost.Name} {behaviorPayloa
Console.WriteLine($"Behavior sample: {behaviorKind}");
Console.WriteLine($"Eve surface: {surface.Surface.Id}");
Console.WriteLine($"Package Eve surfaces: {packageSurfaces.Count}");
-Console.WriteLine("Runtime state commit log smoke: settings, loadouts, action-bar bindings, faction relationships, and run zone/entity/pickup snapshots queued, applied, and cleared");
-Console.WriteLine("Runtime Eve command log smoke: surface command queued separately from state commits");
-
-static void AssertPendingCultCacheEnvelope(string path, string expectedSchemaId)
-{
- var reader = new MessagePackReader(File.ReadAllBytes(path));
- var fieldCount = reader.ReadArrayHeader();
- if (fieldCount < 3)
- {
- throw new InvalidOperationException($"Pending file {path} is not a CultCache store snapshot.");
- }
-
- var formatVersion = reader.ReadString();
- if (formatVersion != "cultcache.store.v1")
- {
- throw new InvalidOperationException($"Pending file {path} has format '{formatVersion}', not cultcache.store.v1.");
- }
-
- var catalogCount = reader.ReadArrayHeader();
- var catalogHasSchema = false;
- for (var index = 0; index < catalogCount; index++)
- {
- var catalogFieldCount = reader.ReadArrayHeader();
- var schemaId = catalogFieldCount > 0 ? reader.ReadString() : "";
- catalogHasSchema |= schemaId == expectedSchemaId;
- for (var field = 1; field < catalogFieldCount; field++)
- {
- reader.Skip();
- }
- }
-
- var recordCount = reader.ReadArrayHeader();
- if (recordCount != 1)
- {
- throw new InvalidOperationException($"Pending file {path} should contain one CultCache record, found {recordCount}.");
- }
-
- var recordFieldCount = reader.ReadArrayHeader();
- if (recordFieldCount < 4)
- {
- throw new InvalidOperationException($"Pending file {path} has an incomplete CultCache record.");
- }
-
- var key = reader.ReadString();
- var recordSchemaId = reader.ReadString();
- reader.Skip();
- var payload = reader.ReadBytes();
- var payloadLength = payload?.Length ?? 0;
- if (!catalogHasSchema || recordSchemaId != expectedSchemaId || string.IsNullOrWhiteSpace(key) || payloadLength == 0)
- {
- throw new InvalidOperationException($"Pending file {path} does not publish a typed CultCache record for {expectedSchemaId}.");
- }
-}
-
-static void AssertRunCheckpointPendingPayloadUsesCurrentEntityKey(string path)
-{
- var reader = new MessagePackReader(File.ReadAllBytes(path));
- var fieldCount = reader.ReadArrayHeader();
- if (fieldCount < 3)
- {
- throw new InvalidOperationException($"Pending file {path} is not a CultCache store snapshot.");
- }
-
- reader.Skip(); // formatVersion
-
- var catalogCount = reader.ReadArrayHeader();
- for (var index = 0; index < catalogCount; index++)
- {
- reader.Skip();
- }
-
- var recordCount = reader.ReadArrayHeader();
- if (recordCount != 1)
- {
- throw new InvalidOperationException($"Pending file {path} should contain one CultCache record.");
- }
-
- reader.ReadArrayHeader();
- reader.Skip(); // key
- reader.Skip(); // schemaId
- reader.Skip(); // storedAt
- var payload = reader.ReadBytes() is { } payloadSequence
- ? SequenceToArray(payloadSequence)
- : Array.Empty();
- if (payload.Length == 0)
- {
- throw new InvalidOperationException($"Pending file {path} has an empty runtime commit payload.");
- }
-
- var payloadReader = new MessagePackReader(payload);
- var payloadFieldCount = payloadReader.ReadArrayHeader();
- if (payloadFieldCount < 7)
- {
- throw new InvalidOperationException($"Pending runtime commit payload {path} is incomplete.");
- }
-
- payloadReader.Skip(); // schema
- payloadReader.Skip(); // kind
- payloadReader.Skip(); // commandId
- payloadReader.Skip(); // createdAtUtc
- payloadReader.Skip(); // playerSettings
- payloadReader.Skip(); // loadoutTemplate
- var runCheckpointPayload = SequenceToArray(payloadReader.ReadRaw());
-
- var runReader = new MessagePackReader(runCheckpointPayload);
- var runFieldCount = runReader.ReadArrayHeader();
- if (runFieldCount != 11)
- {
- throw new InvalidOperationException(
- $"Pending run checkpoint payload should use the 11-field CurrentEntityKey layout, found {runFieldCount} fields.");
- }
-}
-
-static byte[] SequenceToArray(System.Buffers.ReadOnlySequence sequence)
-{
- var payload = new byte[checked((int)sequence.Length)];
- var offset = 0;
- foreach (var segment in sequence)
- {
- segment.Span.CopyTo(payload.AsSpan(offset));
- offset += segment.Length;
- }
-
- return payload;
-}
+Console.WriteLine("Runtime Eve command smoke: surface command document is a typed state record");
static int CountRequiredBehaviorItemRefsMissingItemKeys(AetheriaRuntimeBehaviorPayload payload)
{
diff --git a/Aetheria.State.Unity/Aetheria.State.Unity.csproj b/Aetheria.State.Unity/Aetheria.State.Unity.csproj
index e40e74ad4..7c0d12267 100644
--- a/Aetheria.State.Unity/Aetheria.State.Unity.csproj
+++ b/Aetheria.State.Unity/Aetheria.State.Unity.csproj
@@ -8,23 +8,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/Aetheria.State.Unity/AetheriaRuntimeCatalogSnapshotMapper.cs b/Aetheria.State.Unity/AetheriaRuntimeCatalogSnapshotMapper.cs
index 9494221df..6731be24e 100644
--- a/Aetheria.State.Unity/AetheriaRuntimeCatalogSnapshotMapper.cs
+++ b/Aetheria.State.Unity/AetheriaRuntimeCatalogSnapshotMapper.cs
@@ -78,7 +78,8 @@ internal static class AetheriaRuntimeCatalogSnapshotMapper
stat.Max,
stat.HeatExponentMultiplier,
stat.DurabilityExponentMultiplier,
- stat.QualityExponent);
+ stat.QualityExponent,
+ null);
}
private static AetheriaRuntimeShapeCell FromState(AetheriaShapeCell cell)
diff --git a/Aetheria.State.Verify/Aetheria.State.Verify.csproj b/Aetheria.State.Verify/Aetheria.State.Verify.csproj
index e9e2dc0f7..a9150ffa9 100644
--- a/Aetheria.State.Verify/Aetheria.State.Verify.csproj
+++ b/Aetheria.State.Verify/Aetheria.State.Verify.csproj
@@ -10,5 +10,6 @@
+
diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs
index 35618a89a..5dc6640cd 100644
--- a/Aetheria.State.Verify/Program.cs
+++ b/Aetheria.State.Verify/Program.cs
@@ -4755,6 +4755,7 @@ static void RequireClientTargetBootAuthority(string root)
var boundaryPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeStateBoundary.cs");
var bootPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeStateBoot.cs");
var clientTargetStorePath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeClientTargetStore.cs");
+ var clientTargetCommandsPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeClientTargetCommands.cs");
var aetheriaStatePath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaState.cs");
var verseDiscoveryPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeVerseDiscovery.cs");
var replicaBridgePath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeVerseReplicaBridge.cs");
@@ -4770,6 +4771,7 @@ static void RequireClientTargetBootAuthority(string root)
boundaryPath,
bootPath,
clientTargetStorePath,
+ clientTargetCommandsPath,
aetheriaStatePath,
verseDiscoveryPath,
replicaBridgePath,
@@ -4795,6 +4797,7 @@ static void RequireClientTargetBootAuthority(string root)
var boundary = File.ReadAllText(boundaryPath);
var boot = File.ReadAllText(bootPath);
var clientTargetStore = File.ReadAllText(clientTargetStorePath);
+ var clientTargetCommands = File.ReadAllText(clientTargetCommandsPath);
var aetheriaState = File.ReadAllText(aetheriaStatePath);
var verseDiscovery = File.ReadAllText(verseDiscoveryPath);
var replicaBridge = File.ReadAllText(replicaBridgePath);
@@ -4941,9 +4944,6 @@ static void RequireClientTargetBootAuthority(string root)
"public AetheriaRuntimeClientTargetDocument RequestStateFilePath(string stateFilePath)",
"public AetheriaRuntimeClientTargetDocument RequestDiscoveryEndpoints(IEnumerable? discoveryEndpoints)",
"public AetheriaRuntimeClientTargetDocument SelectDiscoveredVerse(",
- "public bool TryRequest(AetheriaClientTargetOperation operation, out AetheriaRuntimeClientTargetDocument? document)",
- "public AetheriaRuntimeClientTargetDocument Request(AetheriaClientTargetOperation operation)",
- "AetheriaClientTargetOperationKind.SelectDiscoveredVerse",
"AetheriaRuntimeStateBoundary.GetClientTargetPath(_gameDataDirectory)",
"AetheriaRuntimeStateBoundary.GetStateFilePath(_gameDataDirectory)",
"AetheriaRuntimeVerseDiscovery.RefreshClientTarget(",
@@ -4969,6 +4969,15 @@ static void RequireClientTargetBootAuthority(string root)
"Aetheria state sugar still exposes Apply vocabulary for client-target edits; Unity should request typed target changes.");
}
+ if (aetheriaState.Contains("public bool TryRequest(AetheriaClientTargetOperation", StringComparison.Ordinal) ||
+ aetheriaState.Contains("public AetheriaRuntimeClientTargetDocument Request(AetheriaClientTargetOperation", StringComparison.Ordinal) ||
+ clientTargetCommands.Contains("public readonly struct AetheriaClientTargetOperation", StringComparison.Ordinal) ||
+ clientTargetCommands.Contains("public enum AetheriaClientTargetOperationKind", StringComparison.Ordinal))
+ {
+ throw new InvalidOperationException(
+ "Aetheria client-target sugar still exposes generic operation-bag dispatch instead of native request methods plus a surface adapter.");
+ }
+
var forbiddenClientTargetSetters = new[]
{
"public AetheriaRuntimeClientTargetDocument SetTitle(",
@@ -5081,8 +5090,7 @@ static void RequireClientTargetBootAuthority(string root)
"AetheriaState.At(ActionGameManager.GameDataDirectory)",
".ClientTarget",
"TryRequestClientTargetCommand(request)",
- "AetheriaRuntimeClientTargetSurfaceCommands.TryRead(request, out var operation)",
- ".ClientTarget.Request(operation)",
+ "AetheriaRuntimeClientTargetSurfaceCommands.TryRequest(",
"ProjectMainMenuSurfaceState(",
"AetheriaRuntimeMainMenuSurfaceBuilder.BuildRoot(",
"AetheriaRuntimeMainMenuSurfaceBuilder.BuildSettings(",
@@ -5424,9 +5432,6 @@ static void RequireVerseSettingsShellAndBridge(string root)
"public AetheriaRuntimeClientTargetDocument RequestStateFilePath(string stateFilePath)",
"public AetheriaRuntimeClientTargetDocument RequestDiscoveryEndpoints(IEnumerable? discoveryEndpoints)",
"public AetheriaRuntimeClientTargetDocument SelectDiscoveredVerse(",
- "public bool TryRequest(AetheriaClientTargetOperation operation, out AetheriaRuntimeClientTargetDocument? document)",
- "public AetheriaRuntimeClientTargetDocument Request(AetheriaClientTargetOperation operation)",
- "AetheriaClientTargetOperationKind.SelectDiscoveredVerse",
"AetheriaRuntimeClientTargetStore.Update(",
"AetheriaRuntimeVerseDiscovery.RefreshClientTarget(",
"AetheriaRuntimeVerseReplicaBridge.Sync(",
@@ -5449,6 +5454,15 @@ static void RequireVerseSettingsShellAndBridge(string root)
"Aetheria state sugar still exposes Apply vocabulary for Verse settings edits; Unity should request typed target changes.");
}
+ if (aetheriaState.Contains("public bool TryRequest(AetheriaClientTargetOperation", StringComparison.Ordinal) ||
+ aetheriaState.Contains("public AetheriaRuntimeClientTargetDocument Request(AetheriaClientTargetOperation", StringComparison.Ordinal) ||
+ clientTargetCommands.Contains("public readonly struct AetheriaClientTargetOperation", StringComparison.Ordinal) ||
+ clientTargetCommands.Contains("public enum AetheriaClientTargetOperationKind", StringComparison.Ordinal))
+ {
+ throw new InvalidOperationException(
+ "Verse settings sugar still exposes generic operation-bag dispatch instead of native request methods plus a surface adapter.");
+ }
+
var forbiddenClientTargetSetters = new[]
{
"public AetheriaRuntimeClientTargetDocument SetTitle(",
@@ -5536,8 +5550,7 @@ static void RequireVerseSettingsShellAndBridge(string root)
"AetheriaRuntimeEveCommands.TrySendVerseHostCommand(",
"AetheriaState.At(ActionGameManager.GameDataDirectory)",
".ClientTarget",
- "AetheriaRuntimeClientTargetSurfaceCommands.TryRead(request, out var operation)",
- ".ClientTarget.Request(operation)",
+ "AetheriaRuntimeClientTargetSurfaceCommands.TryRequest(",
"AetheriaRuntimeEveCommands.TrySendVerseHostCommand("
};
var missingMainMenuSymbols = requiredMainMenuSymbols
@@ -5892,7 +5905,6 @@ static void RequireTypedDaemonCommandPayloads(string root)
"public AetheriaRuntimeDaemonCommandEnvelope Send(",
"public bool TrySend(",
"ReadObservedDaemonCommands()",
- "DeleteDaemonCommandAsync(",
"_operationClient.Create(",
"_operationClient.TrySend(command, out var envelope, out var error)",
"command.ActionBarBinding.Kind",
@@ -6275,12 +6287,10 @@ static void RequireDaemonVersePublication(string root)
string.Join(", ", survivingDaemonQueueSymbols));
}
- if (daemonDocuments.Contains("public int PendingBeforeApply", StringComparison.Ordinal) &&
- (!daemonDocuments.Contains("[IgnoreMember]", StringComparison.Ordinal) ||
- !daemonDocuments.Contains("public int ObservedCommandCount", StringComparison.Ordinal)))
+ if (daemonDocuments.Contains("PendingBeforeApply", StringComparison.Ordinal))
{
throw new InvalidOperationException(
- "Daemon health exposes PendingBeforeApply without the ObservedCommandCount compatibility wrapper.");
+ "Daemon health still exposes the legacy PendingBeforeApply queue vocabulary instead of observed Verse command documents.");
}
var requiredProviderAdvertisementSymbols = new[]
@@ -6339,7 +6349,9 @@ static void RequireDaemonVersePublication(string root)
"AetheriaRuntimeDaemonPublicationStore.PublishEditorSurface",
"AetheriaRuntimeDaemonPublicationStore.PublishEditorTuiSurface",
"ObservedCommands",
- "ObservedCommandCount = commands.Length",
+ "AccountedCommandIds",
+ "frame.AccountedCommandIds = accountedBeforeTick",
+ "ObservedCommandCount = observedCommands.Length",
"PublicationSource = \"daemon-published\""
};
var missingTickSymbols = requiredTickSymbols
@@ -6365,10 +6377,8 @@ static void RequireDaemonVersePublication(string root)
"PutDaemonGameSurfaceAsync(AetheriaRuntimeEveSurfaceStateProjector.ToState(gameSurface))",
"PutDaemonEditorTuiSurfaceAsync(AetheriaRuntimeEveSurfaceStateProjector.ToState(editorTuiSurface))",
"AetheriaEveCommandBridge.AcceptObservedAsync(",
- "!options.KeepAccountedCommandRecords",
"ReadObservedDaemonCommands()",
- "DeleteAccountedDaemonCommandsAsync(node, result)",
- "DeleteDaemonCommandAsync(commandId)",
+ "AccountedCommandIds = currentFrame?.AccountedCommandIds ?? Array.Empty()",
"AetheriaRuntimeDaemonTickRunner.Tick(",
"AetheriaProviderAdvertisementProjector.Build(verseHost, node.StatePath, updatedAtUtc)",
"AetheriaOperationsSurfaceProjector.Build(eveStatus, verseHost, runtimeSession)",
@@ -6397,6 +6407,21 @@ static void RequireDaemonVersePublication(string root)
"MapGet(",
"JsonSerializer.Serialize"
};
+ if (daemonHostSource.Contains("KeepAccountedCommandRecords", StringComparison.Ordinal) ||
+ daemonHostSource.Contains("--keep-accounted-command-records", StringComparison.Ordinal))
+ {
+ throw new InvalidOperationException(
+ "Aetheria.State.Daemon still exposes command-retention toggles after adopting receipt-ledger command accounting.");
+ }
+
+ if (stateNode.Contains("DeleteDaemonCommandAsync(", StringComparison.Ordinal) ||
+ daemonHostSource.Contains("DeleteAccountedDaemonCommandsAsync", StringComparison.Ordinal) ||
+ daemonHostSource.Contains("DeleteDaemonCommandAsync(", StringComparison.Ordinal))
+ {
+ throw new InvalidOperationException(
+ "Daemon command documents are still consumed by deletion instead of accounted by frame receipts.");
+ }
+
var survivingDaemonHostSymbols = forbiddenDaemonHostSymbols
.Where(symbol => daemonHostSource.Contains(symbol, StringComparison.Ordinal))
.ToArray();
@@ -6643,10 +6668,9 @@ static void RequireTypedEveCommandBodies(string root)
"ToDocument(",
"AcceptObservedAsync(",
"node.ReadObservedEveCommands()",
- "node.DeleteEveCommandAsync(",
+ "AccountedCommandIds",
"SubmitEveCommandAsync(",
"ReadObservedEveCommands(",
- "DeleteEveCommandAsync(",
"EveCommandKey(",
"CultNetDocumentBinding.ForDocument",
"typeof(AetheriaRuntimeEveCommandDocument)",
@@ -6661,6 +6685,19 @@ static void RequireTypedEveCommandBodies(string root)
};
var mainMenu = File.ReadAllText(mainMenuPath);
var typedCommandSources = eveCommandClient + "\n" + runtimeCommandPort + "\n" + eveCommandBridge + "\n" + stateNode + "\n" + documentRegistry + "\n" + actionGameManager + "\n" + mainMenu + "\n" + evePresenter;
+ if (typedCommandSources.Contains("DeleteEveCommandAsync(", StringComparison.Ordinal))
+ {
+ throw new InvalidOperationException(
+ "Eve command documents are still consumed by deletion instead of accounted by acceptance receipts.");
+ }
+
+ if (eveCommandBridge.Contains("AcceptedPaths", StringComparison.Ordinal) ||
+ eveCommandBridge.Contains("RejectedPaths", StringComparison.Ordinal))
+ {
+ throw new InvalidOperationException(
+ "Eve command acceptance report still exposes path vocabulary instead of command-id receipts.");
+ }
+
var missingTypedCommandSymbols = requiredTypedCommandSymbols
.Where(symbol => !typedCommandSources.Contains(symbol, StringComparison.Ordinal))
.ToArray();
diff --git a/Aetheria.State/Aetheria.State.csproj b/Aetheria.State/Aetheria.State.csproj
index ac1c3d428..00068e1e0 100644
--- a/Aetheria.State/Aetheria.State.csproj
+++ b/Aetheria.State/Aetheria.State.csproj
@@ -8,15 +8,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aetheria.State/AetheriaCatalogSurfaceProjector.cs b/Aetheria.State/AetheriaCatalogSurfaceProjector.cs
index e979c5c24..ddfd182b8 100644
--- a/Aetheria.State/AetheriaCatalogSurfaceProjector.cs
+++ b/Aetheria.State/AetheriaCatalogSurfaceProjector.cs
@@ -1,13 +1,14 @@
using System;
using System.Linq;
using Aetheria.State.Documents;
+using GameCult.Aetheria.State.Unity;
namespace Aetheria.State;
public static class AetheriaCatalogSurfaceProjector
{
public const string SurfaceKey = "eve:surface:aetheria.catalog.operator";
- public const string SurfaceId = "aetheria.catalog.operator";
+ public const string SurfaceId = AetheriaRuntimeCatalogCommands.SurfaceId;
public static EveSurfaceState Build(AetheriaCatalogSnapshot catalog, string updatedAtUtc, long version = 1)
{
@@ -68,7 +69,7 @@ public static class AetheriaCatalogSurfaceProjector
[
new EveCommandTemplate
{
- Command = "aetheria.catalog.refresh",
+ Command = AetheriaRuntimeCatalogCommands.Refresh,
Label = "Refresh",
Transport = "cultmesh"
}
diff --git a/Aetheria.State/AetheriaDocumentRegistry.cs b/Aetheria.State/AetheriaDocumentRegistry.cs
index 3fcee08f1..104b8b1c9 100644
--- a/Aetheria.State/AetheriaDocumentRegistry.cs
+++ b/Aetheria.State/AetheriaDocumentRegistry.cs
@@ -1,5 +1,6 @@
using Aetheria.State.Documents;
using GameCult.Caching;
+using GameCult.Aetheria.State.Unity;
using GameCult.Networking;
namespace Aetheria.State;
@@ -38,8 +39,14 @@ public static class AetheriaDocumentRegistry
CultNetDocumentBinding.ForDocument(registry),
CultNetDocumentBinding.ForDocument(registry),
CultNetDocumentBinding.ForDocument(registry),
- CultNetDocumentBinding.ForDocument(registry),
- CultNetDocumentBinding.ForDocument(registry),
+ CultNetDocumentBinding.ForDocument(registry),
+ CultNetDocumentBinding.ForDocument(registry),
+ CultNetDocumentBinding.ForDocument(registry),
+ CultNetDocumentBinding.ForDocument(registry),
+ CultNetDocumentBinding.ForDocument(registry),
+ CultNetDocumentBinding.ForDocument(registry),
+ CultNetDocumentBinding.ForDocument(registry),
+ CultNetDocumentBinding.ForDocument(registry),
CultNetDocumentBinding.ForDocument(registry),
CultNetDocumentBinding.ForDocument(registry)
});
@@ -61,8 +68,14 @@ public static class AetheriaDocumentRegistry
typeof(AetheriaZoneState),
typeof(AetheriaEntitySnapshot),
typeof(AetheriaVerseHostSettings),
- typeof(AetheriaRuntimeCommitDrainStatus),
- typeof(AetheriaEveCommandDrainStatus),
+ typeof(AetheriaEveCommandAcceptanceStatus),
+ typeof(AetheriaRuntimeDaemonProviderAdvertisementDocument),
+ typeof(AetheriaRuntimeDaemonHealthDocument),
+ typeof(AetheriaRuntimeDaemonCommandBoundaryDocument),
+ typeof(AetheriaRuntimeDaemonFrameDocument),
+ typeof(AetheriaRuntimeDaemonSoaViewDocument),
+ typeof(AetheriaRuntimeDaemonCommandDocument),
+ typeof(AetheriaRuntimeEveCommandDocument),
typeof(EveSurfaceState),
typeof(EveProviderAdvertisementState)
];
diff --git a/Aetheria.State/AetheriaEveCommandBridge.cs b/Aetheria.State/AetheriaEveCommandBridge.cs
index 1084dc748..82f8c5706 100644
--- a/Aetheria.State/AetheriaEveCommandBridge.cs
+++ b/Aetheria.State/AetheriaEveCommandBridge.cs
@@ -3,15 +3,18 @@ using GameCult.Aetheria.State.Unity;
namespace Aetheria.State;
-public sealed class AetheriaEveCommandApplyReport
+public sealed class AetheriaEveCommandAcceptanceReport
{
- public int AppliedCatalogRefreshes { get; set; }
- public int AppliedOperationsRefreshes { get; set; }
- public int AppliedPlayerSettingsCommands { get; set; }
- public int AppliedVerseHostCommands { get; set; }
+ public int AcceptedCatalogRefreshes { get; set; }
+ public int AcceptedOperationsRefreshes { get; set; }
+ public int AcceptedPlayerSettingsCommands { get; set; }
+ public int AcceptedInputSettingsCommands { get; set; }
+ public int AcceptedLoadoutTemplateCommands { get; set; }
+ public int AcceptedVerseHostCommands { get; set; }
public int RejectedCommands { get; set; }
- public string[] AcceptedPaths { get; set; } = [];
- public string[] RejectedPaths { get; set; } = [];
+ public string[] AcceptedCommandIds { get; set; } = [];
+ public string[] RejectedCommandIds { get; set; } = [];
+ public string[] AccountedCommandIds { get; set; } = [];
public string LastRejectedCommand { get; set; } = "";
public string LastRejectedReason { get; set; } = "";
}
@@ -20,61 +23,45 @@ public static class AetheriaEveCommandBridge
{
public const string CommandSchema = "gamecult.eve.command.v1";
- public static string GetPendingDirectory(string stateFilePath)
- {
- if (string.IsNullOrWhiteSpace(stateFilePath))
- throw new ArgumentException("State file path must be non-empty.", nameof(stateFilePath));
-
- return stateFilePath + ".eve.pending";
- }
-
- public static async Task ApplyPendingAsync(
+ public static async Task AcceptObservedAsync(
AetheriaStateNode node,
- bool deleteAccounted = true)
+ IEnumerable? accountedCommandIds = null)
{
if (node == null) throw new ArgumentNullException(nameof(node));
- var pendingDirectory = GetPendingDirectory(node.StatePath);
- var report = new AetheriaEveCommandApplyReport();
+ var report = new AetheriaEveCommandAcceptanceReport();
var accepted = new List();
var rejected = new List();
-
- if (!Directory.Exists(pendingDirectory))
- return report;
-
- foreach (var path in Directory.EnumerateFiles(pendingDirectory, "*.cc").OrderBy(path => path, StringComparer.Ordinal))
+ var accounted = new HashSet(accountedCommandIds ?? Array.Empty(), StringComparer.Ordinal);
+ foreach (var command in node.ReadObservedEveCommands()
+ .Where(command => !string.IsNullOrWhiteSpace(command.CommandId))
+ .Where(command => !accounted.Contains(command.CommandId)))
{
- var command = ReadCommand(path);
var rejection = Validate(command);
if (!string.IsNullOrWhiteSpace(rejection))
{
- RecordRejection(report, command, rejection, path, rejected, deleteAccounted);
+ RecordRejection(report, command, rejection, rejected);
continue;
}
switch (command.Command)
{
- case "aetheria.catalog.refresh":
+ case AetheriaRuntimeCatalogCommands.Refresh:
await node.PutCatalogSurfaceAsync(
AetheriaCatalogSurfaceProjector.Build(node.ReadCatalogSnapshot(), command.IssuedAtUtc)).ConfigureAwait(false);
- report.AppliedCatalogRefreshes++;
+ report.AcceptedCatalogRefreshes++;
break;
- case "aetheria.operations.refresh":
- var commitStatus = await node.GetRuntimeCommitDrainStatusAsync().ConfigureAwait(false) ??
- EmptyCommitDrainStatus(node.StatePath, command.IssuedAtUtc);
- var eveStatus = await node.GetEveCommandDrainStatusAsync().ConfigureAwait(false) ??
- EmptyEveCommandDrainStatus(node.StatePath, command.IssuedAtUtc);
+ case AetheriaRuntimeOperationsCommands.Refresh:
+ var eveStatus = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false) ??
+ EmptyEveCommandAcceptanceStatus(node.StatePath, command.IssuedAtUtc);
var verseHostSettings = await node.GetVerseHostSettingsAsync().ConfigureAwait(false);
- var runtimeSession = string.IsNullOrWhiteSpace(commitStatus.RuntimeId)
- ? null
- : await node.GetRuntimeSessionAsync(commitStatus.RuntimeId).ConfigureAwait(false);
+ var runtimeSession = await node.GetRuntimeSessionAsync(eveStatus.RuntimeId).ConfigureAwait(false);
await node.PutOperationsSurfaceAsync(
AetheriaOperationsSurfaceProjector.Build(
- commitStatus,
eveStatus,
verseHostSettings,
runtimeSession)).ConfigureAwait(false);
- report.AppliedOperationsRefreshes++;
+ report.AcceptedOperationsRefreshes++;
break;
case GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.Refresh:
case GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.SetPlayerName:
@@ -83,32 +70,41 @@ public static class AetheriaEveCommandBridge
case GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.IncrementSignificantDigits:
case GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.CycleNebulaQuality:
case GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.ToggleShowAsteroidsInMinimap:
- await ApplyPlayerSettingsCommandAsync(node, command).ConfigureAwait(false);
- report.AppliedPlayerSettingsCommands++;
+ await ExecutePlayerSettingsCommandAsync(node, command).ConfigureAwait(false);
+ report.AcceptedPlayerSettingsCommands++;
+ break;
+ case GameCult.Aetheria.State.Unity.AetheriaRuntimeInputSettingsCommands.Refresh:
+ case GameCult.Aetheria.State.Unity.AetheriaRuntimeInputSettingsCommands.SetBindingOverride:
+ case GameCult.Aetheria.State.Unity.AetheriaRuntimeInputSettingsCommands.SetActionBarEnabled:
+ await ExecuteInputSettingsCommandAsync(node, command).ConfigureAwait(false);
+ report.AcceptedInputSettingsCommands++;
+ break;
+ case GameCult.Aetheria.State.Unity.AetheriaRuntimeLoadoutTemplateCommands.Save:
+ await ExecuteLoadoutTemplateCommandAsync(node, command).ConfigureAwait(false);
+ report.AcceptedLoadoutTemplateCommands++;
break;
case GameCult.Aetheria.State.Unity.AetheriaRuntimeVerseHostCommands.Refresh:
case GameCult.Aetheria.State.Unity.AetheriaRuntimeVerseHostCommands.CycleVisibility:
- await ApplyVerseHostCommandAsync(node, command).ConfigureAwait(false);
- report.AppliedVerseHostCommands++;
+ await ExecuteVerseHostCommandAsync(node, command).ConfigureAwait(false);
+ report.AcceptedVerseHostCommands++;
break;
}
- accepted.Add(path);
- if (deleteAccounted)
- File.Delete(path);
+ accepted.Add(command.CommandId ?? "");
}
await node.FlushAsync().ConfigureAwait(false);
- report.AcceptedPaths = accepted.ToArray();
- report.RejectedPaths = rejected.ToArray();
+ report.AcceptedCommandIds = accepted.ToArray();
+ report.RejectedCommandIds = rejected.ToArray();
+ report.AccountedCommandIds = accounted
+ .Concat(report.AcceptedCommandIds)
+ .Concat(report.RejectedCommandIds)
+ .Where(commandId => !string.IsNullOrWhiteSpace(commandId))
+ .Distinct(StringComparer.Ordinal)
+ .ToArray();
return report;
}
- private static AetheriaRuntimeEveCommandDocument ReadCommand(string path)
- {
- return AetheriaRuntimePendingCultCacheStore.ReadEveCommand(path);
- }
-
private static string Validate(AetheriaRuntimeEveCommandDocument command)
{
if (!string.Equals(command.Schema, CommandSchema, StringComparison.Ordinal))
@@ -123,17 +119,21 @@ public static class AetheriaEveCommandBridge
private static bool KnownCommand(string surfaceId, string command)
{
- return (string.Equals(surfaceId, AetheriaCatalogSurfaceProjector.SurfaceId, StringComparison.Ordinal) &&
- string.Equals(command, "aetheria.catalog.refresh", StringComparison.Ordinal)) ||
- (string.Equals(surfaceId, AetheriaOperationsSurfaceProjector.SurfaceId, StringComparison.Ordinal) &&
- string.Equals(command, "aetheria.operations.refresh", StringComparison.Ordinal)) ||
+ return (string.Equals(surfaceId, AetheriaRuntimeCatalogCommands.SurfaceId, StringComparison.Ordinal) &&
+ AetheriaRuntimeCatalogCommands.IsKnown(command)) ||
+ (string.Equals(surfaceId, AetheriaRuntimeOperationsCommands.SurfaceId, StringComparison.Ordinal) &&
+ AetheriaRuntimeOperationsCommands.IsKnown(command)) ||
(string.Equals(surfaceId, AetheriaPlayerSettingsSurfaceProjector.SurfaceId, StringComparison.Ordinal) &&
GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.IsKnown(command)) ||
+ (string.Equals(surfaceId, GameCult.Aetheria.State.Unity.AetheriaRuntimeInputSettingsCommands.SurfaceId, StringComparison.Ordinal) &&
+ GameCult.Aetheria.State.Unity.AetheriaRuntimeInputSettingsCommands.IsKnown(command)) ||
+ (string.Equals(surfaceId, GameCult.Aetheria.State.Unity.AetheriaRuntimeLoadoutTemplateCommands.SurfaceId, StringComparison.Ordinal) &&
+ GameCult.Aetheria.State.Unity.AetheriaRuntimeLoadoutTemplateCommands.IsKnown(command)) ||
(string.Equals(surfaceId, GameCult.Aetheria.State.Unity.AetheriaRuntimeVerseHostCommands.SurfaceId, StringComparison.Ordinal) &&
GameCult.Aetheria.State.Unity.AetheriaRuntimeVerseHostCommands.IsKnown(command));
}
- private static async Task ApplyPlayerSettingsCommandAsync(
+ private static async Task ExecutePlayerSettingsCommandAsync(
AetheriaStateNode node,
AetheriaRuntimeEveCommandDocument command)
{
@@ -145,9 +145,7 @@ public static class AetheriaEveCommandBridge
switch (command.Command)
{
case GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.SetPlayerName:
- settings.PlayerName = command.Payload.TryGetValue("value", out var playerName)
- ? playerName ?? ""
- : "";
+ settings.PlayerName = command.PlayerSettings.PlayerName ?? "";
persistSettings = true;
break;
case GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.CycleTemperatureUnit:
@@ -193,7 +191,66 @@ public static class AetheriaEveCommandBridge
.ConfigureAwait(false);
}
- private static async Task ApplyVerseHostCommandAsync(
+ private static async Task ExecuteInputSettingsCommandAsync(
+ AetheriaStateNode node,
+ AetheriaRuntimeEveCommandDocument command)
+ {
+ var settings = await node.GetPlayerSettingsAsync().ConfigureAwait(false) ?? new AetheriaPlayerSettings();
+ settings.Input ??= new AetheriaPlayerInputSettings();
+ var persistSettings = false;
+
+ switch (command.Command)
+ {
+ case GameCult.Aetheria.State.Unity.AetheriaRuntimeInputSettingsCommands.SetBindingOverride:
+ var actionName = command.InputSettings.ActionName ?? "";
+ var inputSystemPath = command.InputSettings.InputSystemPath ?? "";
+ var bindingIndex = command.InputSettings.BindingIndex;
+ if (!string.IsNullOrWhiteSpace(actionName) && bindingIndex >= 0)
+ {
+ settings.Input.BindingOverrides = settings.Input.BindingOverrides
+ .Where(binding => !string.Equals(binding.ActionName, actionName, StringComparison.Ordinal) ||
+ binding.BindingIndex != bindingIndex)
+ .Concat(new[]
+ {
+ new AetheriaInputBindingOverride
+ {
+ ActionName = actionName,
+ BindingIndex = bindingIndex,
+ BindingPath = inputSystemPath
+ }
+ })
+ .OrderBy(binding => binding.ActionName, StringComparer.Ordinal)
+ .ThenBy(binding => binding.BindingIndex)
+ .ToArray();
+ persistSettings = true;
+ }
+ break;
+ case GameCult.Aetheria.State.Unity.AetheriaRuntimeInputSettingsCommands.SetActionBarEnabled:
+ var inputPath = command.InputSettings.InputSystemPath ?? "";
+ var enabled = command.InputSettings.Enabled;
+ if (!string.IsNullOrWhiteSpace(inputPath))
+ {
+ var inputs = settings.Input.ActionBarInputs
+ .Where(path => !string.Equals(path, inputPath, StringComparison.Ordinal))
+ .ToList();
+ if (enabled)
+ inputs.Add(inputPath);
+ settings.Input.ActionBarInputs = inputs
+ .OrderBy(path => path, StringComparer.Ordinal)
+ .ToArray();
+ persistSettings = true;
+ }
+ break;
+ }
+
+ if (persistSettings)
+ {
+ settings.LastUpdatedAtUtc = command.IssuedAtUtc;
+ await node.PutPlayerSettingsAsync(settings).ConfigureAwait(false);
+ }
+ }
+
+ private static async Task ExecuteVerseHostCommandAsync(
AetheriaStateNode node,
AetheriaRuntimeEveCommandDocument command)
{
@@ -215,17 +272,12 @@ public static class AetheriaEveCommandBridge
await node.PutVerseHostSettingsAsync(normalized).ConfigureAwait(false);
}
- var commitStatus = await node.GetRuntimeCommitDrainStatusAsync().ConfigureAwait(false) ??
- EmptyCommitDrainStatus(node.StatePath, command.IssuedAtUtc);
- var eveStatus = await node.GetEveCommandDrainStatusAsync().ConfigureAwait(false) ??
- EmptyEveCommandDrainStatus(node.StatePath, command.IssuedAtUtc);
- var runtimeSession = string.IsNullOrWhiteSpace(commitStatus.RuntimeId)
- ? null
- : await node.GetRuntimeSessionAsync(commitStatus.RuntimeId).ConfigureAwait(false);
+ var eveStatus = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false) ??
+ EmptyEveCommandAcceptanceStatus(node.StatePath, command.IssuedAtUtc);
+ var runtimeSession = await node.GetRuntimeSessionAsync(eveStatus.RuntimeId).ConfigureAwait(false);
await node.PutOperationsSurfaceAsync(
AetheriaOperationsSurfaceProjector.Build(
- commitStatus,
eveStatus,
normalized,
runtimeSession)).ConfigureAwait(false);
@@ -233,6 +285,18 @@ public static class AetheriaEveCommandBridge
AetheriaProviderAdvertisementProjector.Build(normalized, node.StatePath, command.IssuedAtUtc)).ConfigureAwait(false);
}
+ private static async Task ExecuteLoadoutTemplateCommandAsync(
+ AetheriaStateNode node,
+ AetheriaRuntimeEveCommandDocument command)
+ {
+ var commit = command.LoadoutTemplate ?? throw new InvalidOperationException(
+ $"Loadout template command '{command.CommandId}' is missing its typed payload.");
+ var loadout = AetheriaRuntimeStateMapper.ToLoadoutTemplate(commit, command.IssuedAtUtc);
+ await node.PutLoadoutTemplateAsync(
+ AetheriaRuntimeStateMapper.LoadoutKey(loadout.Name),
+ loadout).ConfigureAwait(false);
+ }
+
private static string Cycle(string current, params string[] values)
{
if (values.Length == 0)
@@ -246,37 +310,22 @@ public static class AetheriaEveCommandBridge
}
private static void RecordRejection(
- AetheriaEveCommandApplyReport report,
+ AetheriaEveCommandAcceptanceReport report,
AetheriaRuntimeEveCommandDocument command,
string reason,
- string path,
- List rejected,
- bool deleteAccounted)
+ List rejected)
{
report.RejectedCommands++;
report.LastRejectedCommand = string.IsNullOrWhiteSpace(command.Command)
? command.CommandId
: command.Command;
report.LastRejectedReason = reason;
- rejected.Add(path);
- if (deleteAccounted)
- File.Delete(path);
+ rejected.Add(command.CommandId ?? "");
}
- private static AetheriaRuntimeCommitDrainStatus EmptyCommitDrainStatus(string statePath, string now)
+ private static AetheriaEveCommandAcceptanceStatus EmptyEveCommandAcceptanceStatus(string statePath, string now)
{
- return new AetheriaRuntimeCommitDrainStatus
- {
- RuntimeId = "aetheria-state",
- StatePath = statePath,
- LastPollAtUtc = now,
- Status = "idle"
- };
- }
-
- private static AetheriaEveCommandDrainStatus EmptyEveCommandDrainStatus(string statePath, string now)
- {
- return new AetheriaEveCommandDrainStatus
+ return new AetheriaEveCommandAcceptanceStatus
{
RuntimeId = "aetheria-state",
StatePath = statePath,
diff --git a/Aetheria.State/AetheriaOperationsSurfaceProjector.cs b/Aetheria.State/AetheriaOperationsSurfaceProjector.cs
index 52ba5b738..79cc09485 100644
--- a/Aetheria.State/AetheriaOperationsSurfaceProjector.cs
+++ b/Aetheria.State/AetheriaOperationsSurfaceProjector.cs
@@ -1,22 +1,21 @@
using Aetheria.State.Documents;
+using GameCult.Aetheria.State.Unity;
namespace Aetheria.State;
public static class AetheriaOperationsSurfaceProjector
{
public const string SurfaceKey = "eve:surface:aetheria.operations";
- public const string SurfaceId = "aetheria.operations";
+ public const string SurfaceId = AetheriaRuntimeOperationsCommands.SurfaceId;
public static EveSurfaceState Build(
- AetheriaRuntimeCommitDrainStatus drainStatus,
- AetheriaEveCommandDrainStatus? eveCommandStatus = null,
+ AetheriaEveCommandAcceptanceStatus? eveCommandStatus = null,
AetheriaVerseHostSettings? verseHostSettings = null,
AetheriaRuntimeSession? runtimeSession = null,
long version = 1)
{
var normalizedVerseHost = AetheriaVerseHostSettingsNormalizer.Normalize(verseHostSettings);
var updatedAtUtc = LatestTimestamp(
- drainStatus.LastPollAtUtc,
eveCommandStatus?.LastPollAtUtc,
normalizedVerseHost.LastUpdatedAtUtc,
runtimeSession?.LastSeenAtUtc);
@@ -35,37 +34,22 @@ public static class AetheriaOperationsSurfaceProjector
"surface",
[],
Node(
- "aetheria.operations.commitDrain",
+ "aetheria.operations.eveCommandAcceptance",
"card",
- [("title", "Runtime Commit Drain")],
- Metric("commitDrain.status", "Status", drainStatus.Status),
- Metric("commitDrain.pending", "Pending Before Apply", drainStatus.PendingBeforeApply.ToString()),
- Metric("commitDrain.applied", "Commands Applied", drainStatus.CommandsApplied.ToString()),
- Metric("commitDrain.settings", "Settings", drainStatus.AppliedPlayerSettings.ToString()),
- Metric("commitDrain.loadouts", "Loadouts", drainStatus.AppliedLoadoutTemplates.ToString()),
- Metric("commitDrain.runs", "Run Checkpoints", drainStatus.AppliedRunCheckpoints.ToString()),
- Metric("commitDrain.failures", "Consecutive Failures", drainStatus.ConsecutiveFailures.ToString()),
+ [("title", "Eve Request Acceptance")],
+ Metric("eveCommandAcceptance.status", "Status", eveCommandStatus?.Status ?? "missing"),
+ Metric("eveCommandAcceptance.observed", "Observed Before Accept", (eveCommandStatus?.ObservedBeforeAccept ?? 0).ToString()),
+ Metric("eveCommandAcceptance.accepted", "Commands Accepted", (eveCommandStatus?.CommandsAccepted ?? 0).ToString()),
+ Metric("eveCommandAcceptance.rejected", "Commands Rejected", (eveCommandStatus?.CommandsRejected ?? 0).ToString()),
+ Metric("eveCommandAcceptance.catalogRefreshes", "Catalog Refreshes", (eveCommandStatus?.AppliedCatalogRefreshes ?? 0).ToString()),
+ Metric("eveCommandAcceptance.operationsRefreshes", "Operations Refreshes", (eveCommandStatus?.AppliedOperationsRefreshes ?? 0).ToString()),
+ Metric("eveCommandAcceptance.playerSettings", "Player Settings Commands", (eveCommandStatus?.AppliedPlayerSettingsCommands ?? 0).ToString()),
+ Metric("eveCommandAcceptance.inputSettings", "Input Settings Commands", (eveCommandStatus?.AppliedInputSettingsCommands ?? 0).ToString()),
+ Metric("eveCommandAcceptance.loadoutTemplates", "Loadout Template Commands", (eveCommandStatus?.AppliedLoadoutTemplateCommands ?? 0).ToString()),
+ Metric("eveCommandAcceptance.verseHost", "Verse Host Commands", (eveCommandStatus?.AppliedVerseHostCommands ?? 0).ToString()),
+ Metric("eveCommandAcceptance.failures", "Consecutive Failures", (eveCommandStatus?.ConsecutiveFailures ?? 0).ToString()),
Row(
- "commitDrain.last",
- ("runtime", drainStatus.RuntimeId),
- ("lastPoll", drainStatus.LastPollAtUtc),
- ("lastApplied", drainStatus.LastAppliedAtUtc),
- ("error", drainStatus.LastError))),
- Node(
- "aetheria.operations.eveCommandDrain",
- "card",
- [("title", "Eve Command Drain")],
- Metric("eveCommandDrain.status", "Status", eveCommandStatus?.Status ?? "missing"),
- Metric("eveCommandDrain.pending", "Pending Before Apply", (eveCommandStatus?.PendingBeforeApply ?? 0).ToString()),
- Metric("eveCommandDrain.accepted", "Commands Accepted", (eveCommandStatus?.CommandsAccepted ?? 0).ToString()),
- Metric("eveCommandDrain.rejected", "Commands Rejected", (eveCommandStatus?.CommandsRejected ?? 0).ToString()),
- Metric("eveCommandDrain.catalogRefreshes", "Catalog Refreshes", (eveCommandStatus?.AppliedCatalogRefreshes ?? 0).ToString()),
- Metric("eveCommandDrain.operationsRefreshes", "Operations Refreshes", (eveCommandStatus?.AppliedOperationsRefreshes ?? 0).ToString()),
- Metric("eveCommandDrain.playerSettings", "Player Settings Commands", (eveCommandStatus?.AppliedPlayerSettingsCommands ?? 0).ToString()),
- Metric("eveCommandDrain.verseHost", "Verse Host Commands", (eveCommandStatus?.AppliedVerseHostCommands ?? 0).ToString()),
- Metric("eveCommandDrain.failures", "Consecutive Failures", (eveCommandStatus?.ConsecutiveFailures ?? 0).ToString()),
- Row(
- "eveCommandDrain.last",
+ "eveCommandAcceptance.last",
("runtime", eveCommandStatus?.RuntimeId ?? ""),
("lastPoll", eveCommandStatus?.LastPollAtUtc ?? ""),
("lastAccepted", eveCommandStatus?.LastAcceptedAtUtc ?? ""),
@@ -101,7 +85,7 @@ public static class AetheriaOperationsSurfaceProjector
[
new EveCommandTemplate
{
- Command = "aetheria.operations.refresh",
+ Command = AetheriaRuntimeOperationsCommands.Refresh,
Label = "Refresh",
Transport = "cultmesh"
}
diff --git a/Aetheria.State/AetheriaProviderAdvertisementProjector.cs b/Aetheria.State/AetheriaProviderAdvertisementProjector.cs
index 8f75a45cf..7165d35cf 100644
--- a/Aetheria.State/AetheriaProviderAdvertisementProjector.cs
+++ b/Aetheria.State/AetheriaProviderAdvertisementProjector.cs
@@ -1,11 +1,18 @@
using Aetheria.State.Documents;
+using GameCult.Aetheria.State.Unity;
namespace Aetheria.State;
public static class AetheriaProviderAdvertisementProjector
{
public const string AdvertisementKey = "eve:provider:aetheria";
+ public const string DaemonGameSurfaceKey = "eve:surface:aetheria.daemon.game";
+ public const string DaemonGameTuiSurfaceKey = "eve:surface:aetheria.daemon.game.tui";
+ public const string DaemonEditorSurfaceKey = "eve:surface:aetheria.daemon.editor";
+ public const string DaemonEditorTuiSurfaceKey = "eve:surface:aetheria.daemon.editor.tui";
public const string ProviderId = "aetheria";
+ private const string DaemonCommandBoundaryId = "aetheria.daemon.commands";
+ private const string DaemonWitnessTransport = "cultcache-witness";
public static EveProviderAdvertisementState Build(
AetheriaVerseHostSettings settings,
@@ -44,10 +51,17 @@ public static class AetheriaProviderAdvertisementProjector
"aetheria.entity_snapshot.v1",
"aetheria.verse_host_settings.v1",
"aetheria.runtime_session.v1",
- "aetheria.runtime_commit_drain_status.v1",
- "aetheria.eve_command_drain_status.v1",
+ "aetheria.eve_command_acceptance_status.v1",
"gamecult.eve.surface.v1",
- "gamecult.eve.command.v1"
+ "gamecult.eve.command.v1",
+ AetheriaRuntimeDaemonSchemas.ProviderAdvertisement,
+ AetheriaRuntimeDaemonSchemas.Frame,
+ AetheriaRuntimeDaemonSchemas.SoaView,
+ AetheriaRuntimeDaemonSchemas.Health,
+ AetheriaRuntimeDaemonSchemas.CommandBoundary,
+ AetheriaRuntimeDaemonSchemas.GameSurface,
+ AetheriaRuntimeDaemonSchemas.EditorSurface,
+ AetheriaRuntimeDaemonSchemas.Command
],
Witnesses =
[
@@ -56,6 +70,60 @@ public static class AetheriaProviderAdvertisementProjector
Kind = "cultcache",
Ref = statePath,
Summary = "Aetheria typed CultCache state file"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonProviderPath(statePath),
+ Summary = "Aetheria daemon-owned provider advertisement"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonFramePath(statePath),
+ Summary = "Aetheria daemon simulation frame"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonSoaViewPath(statePath),
+ Summary = "Aetheria daemon SoA view for thin clients"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonHealthPath(statePath),
+ Summary = "Aetheria daemon health publication"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonCommandBoundaryPath(statePath),
+ Summary = "Aetheria daemon typed command boundary"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonGameSurfacePath(statePath),
+ Summary = "Aetheria daemon game Eve GUI surface"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonGameTuiSurfacePath(statePath),
+ Summary = "Aetheria daemon game Eve TUI surface"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonEditorSurfacePath(statePath),
+ Summary = "Aetheria daemon editor Eve GUI surface"
+ },
+ new EveProviderWitness
+ {
+ Kind = DaemonWitnessTransport,
+ Ref = AetheriaRuntimeStateBoundary.GetDaemonEditorTuiSurfacePath(statePath),
+ Summary = "Aetheria daemon editor Eve TUI surface"
}
],
Surfaces =
@@ -74,48 +142,74 @@ public static class AetheriaProviderAdvertisementProjector
{
SurfaceId = AetheriaPlayerSettingsSurfaceProjector.SurfaceId,
Key = AetheriaPlayerSettingsSurfaceProjector.SurfaceKey
+ },
+ new EveProviderSurfaceRef
+ {
+ SurfaceId = AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId,
+ Key = DaemonGameSurfaceKey
+ },
+ new EveProviderSurfaceRef
+ {
+ SurfaceId = AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId,
+ Key = DaemonGameTuiSurfaceKey
+ },
+ new EveProviderSurfaceRef
+ {
+ SurfaceId = AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId,
+ Key = DaemonEditorSurfaceKey
+ },
+ new EveProviderSurfaceRef
+ {
+ SurfaceId = AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId,
+ Key = DaemonEditorTuiSurfaceKey
}
],
Commands =
[
new EveProviderCommandRef
{
- Command = "aetheria.catalog.refresh",
+ Command = DaemonCommandBoundaryId,
+ Transport = DaemonWitnessTransport,
+ Summary = "Aetheria daemon typed command boundary"
+ },
+ new EveProviderCommandRef
+ {
+ Command = AetheriaRuntimeCatalogCommands.Refresh,
Summary = "Refresh catalog projection"
},
new EveProviderCommandRef
{
- Command = "aetheria.operations.refresh",
+ Command = AetheriaRuntimeOperationsCommands.Refresh,
Summary = "Refresh operations projection"
},
new EveProviderCommandRef
{
- Command = GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.Refresh,
+ Command = AetheriaRuntimePlayerSettingsCommands.Refresh,
Summary = "Refresh player settings projection"
},
new EveProviderCommandRef
{
- Command = GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.CycleTemperatureUnit,
+ Command = AetheriaRuntimePlayerSettingsCommands.CycleTemperatureUnit,
Summary = "Cycle the typed player temperature unit"
},
new EveProviderCommandRef
{
- Command = GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.DecrementSignificantDigits,
+ Command = AetheriaRuntimePlayerSettingsCommands.DecrementSignificantDigits,
Summary = "Decrease typed player significant digits"
},
new EveProviderCommandRef
{
- Command = GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.IncrementSignificantDigits,
+ Command = AetheriaRuntimePlayerSettingsCommands.IncrementSignificantDigits,
Summary = "Increase typed player significant digits"
},
new EveProviderCommandRef
{
- Command = GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.CycleNebulaQuality,
+ Command = AetheriaRuntimePlayerSettingsCommands.CycleNebulaQuality,
Summary = "Cycle typed player nebula quality"
},
new EveProviderCommandRef
{
- Command = GameCult.Aetheria.State.Unity.AetheriaRuntimePlayerSettingsCommands.ToggleShowAsteroidsInMinimap,
+ Command = AetheriaRuntimePlayerSettingsCommands.ToggleShowAsteroidsInMinimap,
Summary = "Toggle typed player minimap asteroid visibility"
}
]
diff --git a/Aetheria.State/AetheriaRuntimeCommitLogApplier.cs b/Aetheria.State/AetheriaRuntimeCommitLogApplier.cs
deleted file mode 100644
index ddd9fd598..000000000
--- a/Aetheria.State/AetheriaRuntimeCommitLogApplier.cs
+++ /dev/null
@@ -1,756 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Aetheria.State.Documents;
-using GameCult.Aetheria.State.Unity;
-using GameCult.Caching;
-
-namespace Aetheria.State;
-
-public sealed class AetheriaRuntimeCommitApplyReport
-{
- public int AppliedPlayerSettings { get; set; }
- public int AppliedLoadoutTemplates { get; set; }
- public int AppliedRunCheckpoints { get; set; }
- public string[] AppliedPaths { get; set; } = [];
-}
-
-public static class AetheriaRuntimeCommitLogApplier
-{
- public static async Task ApplyPendingAsync(
- AetheriaStateNode node,
- bool deleteApplied = true)
- {
- if (node == null) throw new ArgumentNullException(nameof(node));
-
- var pendingDirectory = node.StatePath + ".pending";
- var report = new AetheriaRuntimeCommitApplyReport();
- var applied = new List();
-
- if (!Directory.Exists(pendingDirectory))
- return report;
-
- foreach (var path in Directory.EnumerateFiles(pendingDirectory, "*.cc").OrderBy(path => path, StringComparer.Ordinal))
- {
- var command = ReadCommand(path);
- switch (command.Kind)
- {
- case "player_settings":
- var settings = ToPlayerSettings(
- command.PlayerSettings ?? throw MissingPayload(command),
- command.CreatedAtUtc);
- await node.PutPlayerSettingsAsync(settings).ConfigureAwait(false);
- await node.PutPlayerSettingsSurfaceAsync(
- AetheriaPlayerSettingsSurfaceProjector.Build(settings, command.CreatedAtUtc))
- .ConfigureAwait(false);
- report.AppliedPlayerSettings++;
- break;
- case "loadout_template":
- var loadout = ToLoadoutTemplate(
- command.LoadoutTemplate ?? throw MissingPayload(command),
- command.CreatedAtUtc);
- await node.PutLoadoutTemplateAsync(LoadoutKey(loadout.Name), loadout).ConfigureAwait(false);
- report.AppliedLoadoutTemplates++;
- break;
- case "run_checkpoint":
- await ApplyRunCheckpointAsync(
- node,
- command.RunCheckpoint ?? throw MissingPayload(command),
- command.CreatedAtUtc)
- .ConfigureAwait(false);
- report.AppliedRunCheckpoints++;
- break;
- default:
- throw new InvalidDataException($"Unknown Aetheria runtime commit kind '{command.Kind}' in {path}.");
- }
-
- applied.Add(path);
- if (deleteApplied)
- File.Delete(path);
- }
-
- await node.FlushAsync().ConfigureAwait(false);
- report.AppliedPaths = applied.ToArray();
- return report;
- }
-
- private static AetheriaRuntimeStateCommitDocument ReadCommand(string path)
- {
- var command = AetheriaRuntimePendingCultCacheStore.ReadStateCommit(path);
- if (!string.Equals(command.Schema, AetheriaRuntimeStateCommitDocument.SchemaId, StringComparison.Ordinal))
- throw new InvalidDataException($"Unexpected Aetheria runtime commit schema '{command.Schema}' in {path}.");
- return command;
- }
-
- private static AetheriaPlayerSettings ToPlayerSettings(
- AetheriaRuntimePlayerSettingsCommit settings,
- string updatedAtUtc)
- {
- return new AetheriaPlayerSettings
- {
- PlayerName = settings.PlayerName ?? "",
- TutorialPassed = settings.TutorialPassed,
- StoryFileHashes = (settings.StoryFileHashes ?? Array.Empty())
- .Select(hash => new AetheriaStoryFileHash
- {
- StoryPath = hash.StoryPath ?? "",
- Hash = hash.Hash ?? ""
- })
- .ToArray(),
- Gameplay = new AetheriaPlayerGameplaySettings
- {
- TemperatureUnit = settings.TemperatureUnit ?? "",
- SignificantDigits = settings.SignificantDigits
- },
- Graphics = new AetheriaPlayerGraphicsSettings
- {
- NebulaQuality = settings.NebulaQuality ?? "",
- ShowAsteroidsInMinimap = settings.ShowAsteroidsInMinimap
- },
- Input = new AetheriaPlayerInputSettings
- {
- BindingOverrides = (settings.BindingOverrides ?? Array.Empty())
- .Select(binding => new AetheriaInputBindingOverride
- {
- ActionName = binding.ActionName ?? "",
- BindingIndex = binding.BindingIndex,
- BindingPath = binding.BindingPath ?? ""
- })
- .ToArray(),
- ActionBarInputs = (settings.ActionBarInputs ?? Array.Empty())
- .Select(input => input ?? "")
- .ToArray()
- },
- LastUpdatedAtUtc = updatedAtUtc
- };
- }
-
- private static AetheriaLoadoutTemplate ToLoadoutTemplate(
- AetheriaRuntimeLoadoutTemplateCommit loadout,
- string updatedAtUtc)
- {
- return new AetheriaLoadoutTemplate
- {
- Name = loadout.Name ?? "",
- OwnerPlayerKey = loadout.OwnerPlayerKey ?? "",
- RootEntity = ToEntityLoadout(loadout.RootEntity),
- CreatedAtUtc = updatedAtUtc,
- UpdatedAtUtc = updatedAtUtc
- };
- }
-
- private static AetheriaEntityLoadout ToEntityLoadout(AetheriaRuntimeEntityLoadoutCommit? entity)
- {
- entity ??= new AetheriaRuntimeEntityLoadoutCommit();
- return new AetheriaEntityLoadout
- {
- Name = entity.Name ?? "",
- Kind = entity.Kind ?? "",
- FactionKey = entity.FactionKey ?? "",
- Hull = ToLoadoutItem(entity.Hull),
- Equipment = ToItemSlots(entity.Equipment),
- CargoBays = ToItemSlots(entity.CargoBays),
- DockingBays = ToItemSlots(entity.DockingBays),
- CargoContents = ToCargoBays(entity.CargoContents),
- DockingBayContents = ToCargoBays(entity.DockingBayContents),
- DockingBayAssignments = ToIntArray(entity.DockingBayAssignments),
- WeaponGroups = ToIntArrayArray(entity.WeaponGroups),
- Children = (entity.Children ?? Array.Empty())
- .Select(ToEntityLoadout)
- .ToArray()
- };
- }
-
- private static AetheriaLoadoutItem ToLoadoutItem(AetheriaRuntimeLoadoutItemCommit? item)
- {
- item ??= new AetheriaRuntimeLoadoutItemCommit();
- return new AetheriaLoadoutItem
- {
- ItemKey = item.ItemKey ?? "",
- Quality = item.Quality,
- Durability = item.Durability,
- Quantity = item.Quantity,
- Enabled = item.Enabled,
- OverrideShutdown = item.OverrideShutdown
- };
- }
-
- private static AetheriaLoadoutItemSlot[] ToItemSlots(
- IReadOnlyList? slots)
- {
- return (slots ?? Array.Empty())
- .Select(slot => new AetheriaLoadoutItemSlot
- {
- Position = new AetheriaGridCoord
- {
- X = slot.X,
- Y = slot.Y
- },
- Item = ToLoadoutItem(slot.Item)
- })
- .ToArray();
- }
-
- private static AetheriaEntityItemSlot[] ToEntityItemSlots(
- IReadOnlyList? slots)
- {
- return (slots ?? Array.Empty())
- .Select(slot =>
- {
- var item = ToLoadoutItem(slot.Item);
- return new AetheriaEntityItemSlot
- {
- Position = new AetheriaGridCoord
- {
- X = slot.X,
- Y = slot.Y
- },
- ItemKey = item.ItemKey,
- Quality = item.Quality,
- Durability = item.Durability,
- Quantity = item.Quantity,
- Enabled = item.Enabled,
- OverrideShutdown = item.OverrideShutdown
- };
- })
- .ToArray();
- }
-
- private static AetheriaCargoBayLoadout[] ToCargoBays(
- IReadOnlyList? cargoBays)
- {
- return (cargoBays ?? Array.Empty())
- .Select(bay => new AetheriaCargoBayLoadout
- {
- Items = ToItemSlots(bay.Items)
- })
- .ToArray();
- }
-
- private static async Task ApplyRunCheckpointAsync(
- AetheriaStateNode node,
- AetheriaRuntimeRunCheckpointCommit checkpoint,
- string updatedAtUtc)
- {
- var run = new AetheriaRunState
- {
- RunId = checkpoint.RunId ?? "",
- IsTutorial = checkpoint.IsTutorial,
- EntranceZoneIndex = checkpoint.EntranceZoneIndex,
- ExitZoneIndex = checkpoint.ExitZoneIndex,
- CurrentZoneIndex = checkpoint.CurrentZoneIndex,
- DiscoveredZoneIndices = ToIntArray(checkpoint.DiscoveredZoneIndices),
- ActionBarBindings = ToActionBarBindings(checkpoint.ActionBarBindings),
- FactionRelationships = ToFactionRelationships(checkpoint.FactionRelationships),
- UpdatedAtUtc = updatedAtUtc,
- GenerationSeed = checkpoint.GenerationSeed
- };
-
- var zoneKeys = new List();
- foreach (var zone in checkpoint.Zones ?? Array.Empty())
- {
- var zoneKey = ZoneKey(run.RunId, zone.ZoneIndex);
- var entityKeys = new List();
- foreach (var entity in zone.Entities ?? Array.Empty())
- {
- var entityKey = EntityKey(run.RunId, zone.ZoneIndex, entity.EntityIndex);
- var snapshot = ToEntitySnapshot(entity, run.RunId, zone.ZoneIndex);
- await node.PutEntitySnapshotAsync(entityKey, snapshot).ConfigureAwait(false);
- entityKeys.Add(entityKey.ToString());
- }
-
- await node.PutZoneStateAsync(
- zoneKey,
- new AetheriaZoneState
- {
- Name = zone.Name ?? "",
- Position = new AetheriaVector2
- {
- X = zone.PositionX,
- Y = zone.PositionY
- },
- AdjacentZoneIndices = ToIntArray(zone.AdjacentZoneIndices),
- FactionIndices = ToIntArray(zone.FactionIndices),
- OwnerFactionIndex = zone.OwnerFactionIndex,
- EntityKeys = entityKeys.ToArray(),
- Orbits = ToOrbitSnapshots(zone.Orbits),
- Bodies = ToBodySnapshots(zone.Bodies, run.RunId, zone.ZoneIndex),
- DroppedPickups = ToDroppedPickups(zone.DroppedPickups)
- })
- .ConfigureAwait(false);
- zoneKeys.Add(zoneKey.ToString());
- }
-
- if (zoneKeys.Count > 0)
- run.ZoneKeys = zoneKeys.ToArray();
- run.CurrentEntityKey = checkpoint.CurrentEntityKey ?? "";
- await node.PutRunStateAsync(RunKey(run.RunId), run).ConfigureAwait(false);
- }
-
- private static AetheriaDroppedPickupSnapshot[] ToDroppedPickups(
- IReadOnlyList? pickups)
- {
- return (pickups ?? Array.Empty())
- .Select(pickup => new AetheriaDroppedPickupSnapshot
- {
- PickupIndex = pickup.PickupIndex,
- Position = new AetheriaVector3
- {
- X = pickup.PositionX,
- Y = pickup.PositionY,
- Z = pickup.PositionZ
- },
- Velocity = new AetheriaVector3
- {
- X = pickup.VelocityX,
- Y = pickup.VelocityY,
- Z = pickup.VelocityZ
- },
- Item = ToLoadoutItem(pickup.Item)
- })
- .ToArray();
- }
-
- private static AetheriaOrbitSnapshot[] ToOrbitSnapshots(
- IReadOnlyList? orbits)
- {
- return (orbits ?? Array.Empty())
- .Select(orbit => new AetheriaOrbitSnapshot
- {
- OrbitKey = orbit.OrbitKey ?? "",
- ParentOrbitKey = orbit.ParentOrbitKey ?? "",
- Distance = orbit.Distance,
- Phase = orbit.Phase,
- FixedPosition = new AetheriaVector2
- {
- X = orbit.FixedPositionX,
- Y = orbit.FixedPositionY
- }
- })
- .ToArray();
- }
-
- private static AetheriaBodySnapshot[] ToBodySnapshots(
- IReadOnlyList? bodies,
- string runId,
- int zoneIndex)
- {
- return (bodies ?? Array.Empty())
- .Select(body => new AetheriaBodySnapshot
- {
- BodyKey = body.BodyKey ?? "",
- Kind = body.Kind ?? "",
- Name = body.Name ?? "",
- OrbitKey = body.OrbitKey ?? "",
- Mass = body.Mass,
- Resources = ToBodyResources(body.Resources),
- BodyRadiusMultiplier = body.BodyRadiusMultiplier,
- GravityRadiusMultiplier = body.GravityRadiusMultiplier,
- GravityDepthMultiplier = body.GravityDepthMultiplier,
- GravityDepthExponent = body.GravityDepthExponent,
- Asteroids = ToAsteroidSnapshots(body.Asteroids, runId, zoneIndex),
- GasGiantVisual = ToGasGiantVisual(body.GasGiantVisual),
- SunVisual = ToSunVisual(body.SunVisual)
- })
- .ToArray();
- }
-
- private static AetheriaBodyResource[] ToBodyResources(
- IReadOnlyList? resources)
- {
- return (resources ?? Array.Empty())
- .Select(resource => new AetheriaBodyResource
- {
- ItemKey = resource.ItemKey ?? "",
- Amount = resource.Amount
- })
- .ToArray();
- }
-
- private static AetheriaAsteroidSnapshot[] ToAsteroidSnapshots(
- IReadOnlyList? asteroids,
- string runId,
- int zoneIndex)
- {
- return (asteroids ?? Array.Empty())
- .Select(asteroid => new AetheriaAsteroidSnapshot
- {
- Distance = asteroid.Distance,
- Phase = asteroid.Phase,
- Size = asteroid.Size,
- RotationSpeed = asteroid.RotationSpeed,
- Damage = asteroid.Damage,
- RespawnTimer = asteroid.RespawnTimer,
- MiningAccumulators = ToAsteroidMiningAccumulators(asteroid.MiningAccumulators, runId, zoneIndex)
- })
- .ToArray();
- }
-
- private static AetheriaAsteroidMiningAccumulatorSnapshot[] ToAsteroidMiningAccumulators(
- IReadOnlyList? accumulators,
- string runId,
- int zoneIndex)
- {
- return (accumulators ?? Array.Empty())
- .Where(accumulator => accumulator.MinerEntityIndex >= 0)
- .Select(accumulator => new AetheriaAsteroidMiningAccumulatorSnapshot
- {
- MinerEntityKey = EntityKey(runId, zoneIndex, accumulator.MinerEntityIndex).ToString(),
- Amount = accumulator.Amount
- })
- .ToArray();
- }
-
- private static AetheriaGasGiantVisualState ToGasGiantVisual(AetheriaRuntimeGasGiantVisualCommit? visual)
- {
- if (visual == null)
- return new AetheriaGasGiantVisualState();
-
- return new AetheriaGasGiantVisualState
- {
- FirstOffsetDomainRotationSpeed = visual.FirstOffsetDomainRotationSpeed,
- FirstOffsetRotationSpeed = visual.FirstOffsetRotationSpeed,
- SecondOffsetDomainRotationSpeed = visual.SecondOffsetDomainRotationSpeed,
- SecondOffsetRotationSpeed = visual.SecondOffsetRotationSpeed,
- AlbedoRotationSpeed = visual.AlbedoRotationSpeed,
- WaveRadiusMultiplier = visual.WaveRadiusMultiplier,
- WaveDepthMultiplier = visual.WaveDepthMultiplier,
- WaveDepthExponent = visual.WaveDepthExponent,
- WaveSpeedMultiplier = visual.WaveSpeedMultiplier,
- MaterialOverrides = (visual.MaterialOverrides ?? Array.Empty()).ToArray(),
- Colors = (visual.Colors ?? Array.Empty())
- .Select(ToColor)
- .ToArray()
- };
- }
-
- private static AetheriaSunVisualState ToSunVisual(AetheriaRuntimeSunVisualCommit? visual)
- {
- if (visual == null)
- return new AetheriaSunVisualState();
-
- return new AetheriaSunVisualState
- {
- LightColor = new AetheriaVector3
- {
- X = visual.LightColorX,
- Y = visual.LightColorY,
- Z = visual.LightColorZ
- },
- FogTintColor = new AetheriaVector3
- {
- X = visual.FogTintColorX,
- Y = visual.FogTintColorY,
- Z = visual.FogTintColorZ
- },
- LightRadiusMultiplier = visual.LightRadiusMultiplier
- };
- }
-
- private static AetheriaColor ToColor(AetheriaRuntimeColorCommit color)
- {
- return new AetheriaColor
- {
- X = color.X,
- Y = color.Y,
- Z = color.Z,
- W = color.W
- };
- }
-
- private static AetheriaEntitySnapshot ToEntitySnapshot(
- AetheriaRuntimeEntitySnapshotCommit entity,
- string runId,
- int zoneIndex)
- {
- return new AetheriaEntitySnapshot
- {
- Name = entity.Name ?? "",
- Kind = entity.Kind ?? "",
- Position = new AetheriaVector3
- {
- X = entity.PositionX,
- Y = entity.PositionY,
- Z = entity.PositionZ
- },
- Direction = new AetheriaVector2
- {
- X = entity.DirectionX,
- Y = entity.DirectionY
- },
- Velocity = new AetheriaVector2
- {
- X = entity.VelocityX,
- Y = entity.VelocityY
- },
- TargetEntityKey = entity.TargetEntityIndex >= 0
- ? EntityKey(runId, zoneIndex, entity.TargetEntityIndex).ToString()
- : "",
- IsActive = entity.IsActive,
- HeatsinksEnabled = entity.HeatsinksEnabled,
- OverrideShutdown = entity.OverrideShutdown,
- TractorPower = entity.TractorPower,
- Heatstroke = entity.Heatstroke,
- Hypothermia = entity.Hypothermia,
- FactionKey = entity.FactionKey ?? "",
- HullItemKey = entity.HullItemKey ?? "",
- Equipment = ToEntityItemSlots(entity.Equipment),
- CargoBays = ToEntityItemSlots(entity.CargoBays),
- DockingBays = ToEntityItemSlots(entity.DockingBays),
- ChildEntityKeys = (entity.ChildEntityIndices ?? Array.Empty())
- .Select(childIndex => EntityKey(runId, zoneIndex, childIndex).ToString())
- .ToArray(),
- WeaponGroups = ToIntArrayArray(entity.WeaponGroups)
- .Select(group => new AetheriaWeaponGroupSnapshot { EquipmentIndices = group })
- .ToArray(),
- StatGrids = ToEntityStatGrids(entity.StatGrids),
- ActiveConsumables = ToActiveConsumables(entity.ActiveConsumables),
- BehaviorProgress = ToBehaviorProgress(entity.BehaviorProgress),
- WeaponStates = ToWeaponStates(entity.WeaponStates, runId, zoneIndex),
- BehaviorStates = ToBehaviorStates(entity.BehaviorStates),
- CargoContents = ToCargoBays(entity.CargoContents),
- DockingBayContents = ToCargoBays(entity.DockingBayContents),
- DockingBayAssignments = ToIntArray(entity.DockingBayAssignments),
- Visibility = entity.Visibility,
- VisibilitySourceCount = entity.VisibilitySourceCount,
- Contacts = ToEntityContacts(entity.Contacts, runId, zoneIndex)
- };
- }
-
- private static AetheriaEntityContactSnapshot[] ToEntityContacts(
- IReadOnlyList? contacts,
- string runId,
- int zoneIndex)
- {
- return (contacts ?? Array.Empty())
- .Where(contact => contact.TargetEntityIndex >= 0)
- .Select(contact => new AetheriaEntityContactSnapshot
- {
- TargetEntityKey = EntityKey(runId, zoneIndex, contact.TargetEntityIndex).ToString(),
- InfoGathered = contact.InfoGathered,
- Hostile = contact.Hostile,
- Visible = contact.Visible
- })
- .ToArray();
- }
-
- private static AetheriaBehaviorStateSnapshot[] ToBehaviorStates(
- IReadOnlyList? states)
- {
- return (states ?? Array.Empty())
- .Select(state => new AetheriaBehaviorStateSnapshot
- {
- OwnerKind = state.OwnerKind ?? "",
- OwnerIndex = state.OwnerIndex,
- BehaviorIndex = state.BehaviorIndex,
- BehaviorKind = state.BehaviorKind ?? "",
- Pinging = state.Pinging,
- PingCooldown = state.PingCooldown,
- PingLerp = state.PingLerp,
- PingRadius = state.PingRadius,
- PingedEntityCount = state.PingedEntityCount,
- RadiatorTemperature = state.RadiatorTemperature,
- Emissivity = state.Emissivity,
- PumpedHeat = state.PumpedHeat,
- WasteHeat = state.WasteHeat,
- EnergyUsage = state.EnergyUsage,
- ReactorDraw = state.ReactorDraw,
- ReactorLoadRatio = state.ReactorLoadRatio,
- CapacitorCharge = state.CapacitorCharge,
- CapacitorCapacity = state.CapacitorCapacity,
- CapacitorEfficiency = state.CapacitorEfficiency,
- AetherDriveAxisX = state.AetherDriveAxisX,
- AetherDriveAxisY = state.AetherDriveAxisY,
- AetherDriveAxisZ = state.AetherDriveAxisZ,
- AetherDriveThrustX = state.AetherDriveThrustX,
- AetherDriveThrustY = state.AetherDriveThrustY,
- AetherDriveThrustZ = state.AetherDriveThrustZ,
- AetherDriveRpmX = state.AetherDriveRpmX,
- AetherDriveRpmY = state.AetherDriveRpmY,
- AetherDriveRpmZ = state.AetherDriveRpmZ,
- AetherDriveMaximumRpm = state.AetherDriveMaximumRpm,
- AetherDriveThrustDirectionX = state.AetherDriveThrustDirectionX,
- AetherDriveThrustDirectionY = state.AetherDriveThrustDirectionY,
- ResourceScannerTargetBodyKey = state.ResourceScannerTargetBodyKey ?? "",
- ResourceScannerAsteroidIndex = state.ResourceScannerAsteroidIndex,
- ResourceScannerScanTime = state.ResourceScannerScanTime,
- ResourceScannerRange = state.ResourceScannerRange,
- ResourceScannerMinimumDensity = state.ResourceScannerMinimumDensity,
- ResourceScannerScanDuration = state.ResourceScannerScanDuration,
- MiningToolAsteroidBeltKey = state.MiningToolAsteroidBeltKey ?? "",
- MiningToolAsteroidIndex = state.MiningToolAsteroidIndex,
- MiningToolRange = state.MiningToolRange,
- ThrusterAxis = state.ThrusterAxis,
- ThrusterThrust = state.ThrusterThrust,
- ThrusterTorque = state.ThrusterTorque,
- ShieldEfficiency = state.ShieldEfficiency,
- ShieldEnergyUsage = state.ShieldEnergyUsage,
- VelocityLimit = state.VelocityLimit,
- ThermotoggleTargetTemperature = state.ThermotoggleTargetTemperature,
- SwitchActivated = state.SwitchActivated,
- TriggerPulled = state.TriggerPulled,
- StatModifierApplied = state.StatModifierApplied,
- StatModifierExecuted = state.StatModifierExecuted,
- StatModifierTargetStatCount = state.StatModifierTargetStatCount,
- TurretControllerWeaponCount = state.TurretControllerWeaponCount,
- TurretControllerShotSpeed = state.TurretControllerShotSpeed,
- TurretControllerPredictShots = state.TurretControllerPredictShots
- })
- .ToArray();
- }
-
- private static AetheriaWeaponStateSnapshot[] ToWeaponStates(
- IReadOnlyList? states,
- string runId,
- int zoneIndex)
- {
- return (states ?? Array.Empty())
- .Select(state => new AetheriaWeaponStateSnapshot
- {
- OwnerKind = state.OwnerKind ?? "",
- OwnerIndex = state.OwnerIndex,
- BehaviorIndex = state.BehaviorIndex,
- BehaviorKind = state.BehaviorKind ?? "",
- Firing = state.Firing,
- Ammo = state.Ammo,
- BurstRemaining = state.BurstRemaining,
- BurstTimer = state.BurstTimer,
- BurstInterval = state.BurstInterval,
- CooldownProgress = state.CooldownProgress,
- CoolingDown = state.CoolingDown,
- Charging = state.Charging,
- Charged = state.Charged,
- Charge = state.Charge,
- Reloading = state.Reloading,
- ReloadProgress = state.ReloadProgress,
- AmmoIntervalProgress = state.AmmoIntervalProgress,
- LockProgress = state.LockProgress,
- LockTargetEntityKey = state.LockTargetEntityIndex >= 0
- ? EntityKey(runId, zoneIndex, state.LockTargetEntityIndex).ToString()
- : ""
- })
- .ToArray();
- }
-
- private static AetheriaBehaviorProgressSnapshot[] ToBehaviorProgress(
- IReadOnlyList? progress)
- {
- return (progress ?? Array.Empty())
- .Select(entry => new AetheriaBehaviorProgressSnapshot
- {
- OwnerKind = entry.OwnerKind ?? "",
- OwnerIndex = entry.OwnerIndex,
- BehaviorIndex = entry.BehaviorIndex,
- BehaviorKind = entry.BehaviorKind ?? "",
- Progress = entry.Progress
- })
- .ToArray();
- }
-
- private static AetheriaActiveConsumableSnapshot[] ToActiveConsumables(
- IReadOnlyList? consumables)
- {
- return (consumables ?? Array.Empty())
- .Select(consumable => new AetheriaActiveConsumableSnapshot
- {
- ItemKey = consumable.ItemKey ?? "",
- Quality = consumable.Quality,
- RemainingDuration = consumable.RemainingDuration,
- Duration = consumable.Duration
- })
- .ToArray();
- }
-
- private static AetheriaEntityStatGrid[] ToEntityStatGrids(
- IReadOnlyList? grids)
- {
- return (grids ?? Array.Empty())
- .Select(grid => new AetheriaEntityStatGrid
- {
- Name = grid.Name ?? "",
- Width = grid.Width,
- Height = grid.Height,
- Values = (grid.Values ?? Array.Empty()).ToArray()
- })
- .ToArray();
- }
-
- private static int[] ToIntArray(IReadOnlyList? values)
- {
- return (values ?? Array.Empty()).ToArray();
- }
-
- private static int[][] ToIntArrayArray(IReadOnlyList>? values)
- {
- return (values ?? Array.Empty>())
- .Select(ToIntArray)
- .ToArray();
- }
-
- private static AetheriaActionBarBinding[] ToActionBarBindings(
- IReadOnlyList? bindings)
- {
- return (bindings ?? Array.Empty())
- .Select(binding => new AetheriaActionBarBinding
- {
- ControlPath = binding.ControlPath ?? "",
- Kind = binding.Kind ?? "",
- TargetKey = binding.ItemKey ?? "",
- EquipmentIndex = binding.EquipmentIndex,
- BehaviorIndex = binding.BehaviorIndex,
- WeaponGroup = binding.WeaponGroup
- })
- .ToArray();
- }
-
- private static AetheriaFactionRelationshipState[] ToFactionRelationships(
- IReadOnlyList? relationships)
- {
- return (relationships ?? Array.Empty())
- .Select(relationship => new AetheriaFactionRelationshipState
- {
- FactionKey = relationship.FactionKey ?? "",
- Relationship = relationship.Relationship ?? "",
- Standing = relationship.Standing
- })
- .ToArray();
- }
-
- private static CultRecordKey LoadoutKey(string name)
- {
- return new CultRecordKey($"global:aetheria.loadout_template.{StableToken(name)}.v1");
- }
-
- private static CultRecordKey RunKey(string runId)
- {
- return new CultRecordKey($"global:aetheria.run_state.{StableToken(runId)}.v1");
- }
-
- private static CultRecordKey ZoneKey(string runId, int zoneIndex)
- {
- return new CultRecordKey($"global:aetheria.run_state.{StableToken(runId)}.zone.{zoneIndex}.v1");
- }
-
- private static CultRecordKey EntityKey(string runId, int zoneIndex, int entityIndex)
- {
- return new CultRecordKey($"global:aetheria.run_state.{StableToken(runId)}.zone.{zoneIndex}.entity.{entityIndex}.v1");
- }
-
- private static string StableToken(string value)
- {
- var chars = (string.IsNullOrWhiteSpace(value) ? "unnamed" : value.Trim().ToLowerInvariant())
- .Select(ch => char.IsLetterOrDigit(ch) ? ch : '-')
- .ToArray();
- var token = new string(chars).Trim('-');
- while (token.Contains("--", StringComparison.Ordinal))
- token = token.Replace("--", "-", StringComparison.Ordinal);
- return string.IsNullOrWhiteSpace(token) ? "unnamed" : token;
- }
-
- private static InvalidDataException MissingPayload(AetheriaRuntimeStateCommitDocument command)
- {
- return new InvalidDataException($"Aetheria runtime commit '{command.CommandId}' has no {command.Kind} payload.");
- }
-}
diff --git a/Aetheria.State/AetheriaRuntimeEveSurfaceStateProjector.cs b/Aetheria.State/AetheriaRuntimeEveSurfaceStateProjector.cs
new file mode 100644
index 000000000..1a1251bc1
--- /dev/null
+++ b/Aetheria.State/AetheriaRuntimeEveSurfaceStateProjector.cs
@@ -0,0 +1,55 @@
+using Aetheria.State.Documents;
+using GameCult.Aetheria.State.Unity;
+
+namespace Aetheria.State;
+
+public static class AetheriaRuntimeEveSurfaceStateProjector
+{
+ public static EveSurfaceState ToState(AetheriaRuntimeSurfaceDocument document)
+ {
+ return new EveSurfaceState
+ {
+ ProviderId = document.ProviderId,
+ ProviderKind = document.ProviderKind,
+ Title = document.Title,
+ Version = document.Version,
+ UpdatedAtUtc = document.UpdatedAtUtc,
+ Surface = ToSurface(document.Surface),
+ Commands = document.Commands
+ .Select(command => new EveCommandTemplate
+ {
+ Command = command.Command,
+ Label = command.Label,
+ Transport = command.Transport
+ })
+ .ToArray()
+ };
+ }
+
+ private static EveSurface ToSurface(AetheriaRuntimeSurfaceTree surface)
+ {
+ return new EveSurface
+ {
+ Id = surface.Id,
+ Root = ToComponent(surface.Root),
+ Styles = surface.Styles
+ .Select(style => new EveStyleToken
+ {
+ Name = style.Name,
+ Value = style.Value
+ })
+ .ToArray()
+ };
+ }
+
+ private static EveSurfaceComponent ToComponent(AetheriaRuntimeSurfaceComponent component)
+ {
+ return new EveSurfaceComponent
+ {
+ Id = component.Id,
+ Kind = component.Kind,
+ Props = new Dictionary(component.Props, StringComparer.Ordinal),
+ Children = component.Children.Select(ToComponent).ToArray()
+ };
+ }
+}
diff --git a/Aetheria.State/AetheriaRuntimeStateMapper.cs b/Aetheria.State/AetheriaRuntimeStateMapper.cs
new file mode 100644
index 000000000..f0af1ac9d
--- /dev/null
+++ b/Aetheria.State/AetheriaRuntimeStateMapper.cs
@@ -0,0 +1,113 @@
+using Aetheria.State.Documents;
+using GameCult.Aetheria.State.Unity;
+using GameCult.Caching;
+
+namespace Aetheria.State;
+
+public static class AetheriaRuntimeStateMapper
+{
+ public static AetheriaLoadoutTemplate ToLoadoutTemplate(
+ AetheriaRuntimeLoadoutTemplateCommit loadout,
+ string updatedAtUtc)
+ {
+ return new AetheriaLoadoutTemplate
+ {
+ Name = loadout.Name ?? "",
+ OwnerPlayerKey = loadout.OwnerPlayerKey ?? "",
+ RootEntity = ToEntityLoadout(loadout.RootEntity),
+ CreatedAtUtc = updatedAtUtc,
+ UpdatedAtUtc = updatedAtUtc
+ };
+ }
+
+ public static CultRecordKey LoadoutKey(string name)
+ {
+ return new CultRecordKey($"global:aetheria.loadout_template.{StableToken(name)}.v1");
+ }
+
+ private static AetheriaEntityLoadout ToEntityLoadout(AetheriaRuntimeEntityLoadoutCommit? entity)
+ {
+ entity ??= new AetheriaRuntimeEntityLoadoutCommit();
+ return new AetheriaEntityLoadout
+ {
+ Name = entity.Name ?? "",
+ Kind = entity.Kind ?? "",
+ FactionKey = entity.FactionKey ?? "",
+ Hull = ToLoadoutItem(entity.Hull),
+ Equipment = ToItemSlots(entity.Equipment),
+ CargoBays = ToItemSlots(entity.CargoBays),
+ DockingBays = ToItemSlots(entity.DockingBays),
+ CargoContents = ToCargoBays(entity.CargoContents),
+ DockingBayContents = ToCargoBays(entity.DockingBayContents),
+ DockingBayAssignments = ToIntArray(entity.DockingBayAssignments),
+ WeaponGroups = ToIntArrayArray(entity.WeaponGroups),
+ Children = (entity.Children ?? Array.Empty())
+ .Select(ToEntityLoadout)
+ .ToArray()
+ };
+ }
+
+ private static AetheriaLoadoutItem ToLoadoutItem(AetheriaRuntimeLoadoutItemCommit? item)
+ {
+ item ??= new AetheriaRuntimeLoadoutItemCommit();
+ return new AetheriaLoadoutItem
+ {
+ ItemKey = item.ItemKey ?? "",
+ Quality = item.Quality,
+ Durability = item.Durability,
+ Quantity = item.Quantity,
+ Enabled = item.Enabled,
+ OverrideShutdown = item.OverrideShutdown
+ };
+ }
+
+ private static AetheriaLoadoutItemSlot[] ToItemSlots(
+ IReadOnlyList? slots)
+ {
+ return (slots ?? Array.Empty())
+ .Select(slot => new AetheriaLoadoutItemSlot
+ {
+ Position = new AetheriaGridCoord
+ {
+ X = slot.X,
+ Y = slot.Y
+ },
+ Item = ToLoadoutItem(slot.Item)
+ })
+ .ToArray();
+ }
+
+ private static AetheriaCargoBayLoadout[] ToCargoBays(
+ IReadOnlyList? cargoBays)
+ {
+ return (cargoBays ?? Array.Empty())
+ .Select(bay => new AetheriaCargoBayLoadout
+ {
+ Items = ToItemSlots(bay.Items)
+ })
+ .ToArray();
+ }
+
+ private static int[] ToIntArray(IReadOnlyList? values)
+ {
+ return (values ?? Array.Empty()).ToArray();
+ }
+
+ private static int[][] ToIntArrayArray(IReadOnlyList>? values)
+ {
+ return (values ?? Array.Empty>())
+ .Select(ToIntArray)
+ .ToArray();
+ }
+
+ private static string StableToken(string value)
+ {
+ var chars = (string.IsNullOrWhiteSpace(value) ? "unnamed" : value.Trim().ToLowerInvariant())
+ .Select(ch => char.IsLetterOrDigit(ch) ? ch : '-')
+ .ToArray();
+ var token = new string(chars).Trim('-');
+ while (token.Contains("--", StringComparison.Ordinal))
+ token = token.Replace("--", "-", StringComparison.Ordinal);
+ return string.IsNullOrWhiteSpace(token) ? "unnamed" : token;
+ }
+}
diff --git a/Aetheria.State/AetheriaStateNode.cs b/Aetheria.State/AetheriaStateNode.cs
index 1e6f7ea33..87ee8f2bd 100644
--- a/Aetheria.State/AetheriaStateNode.cs
+++ b/Aetheria.State/AetheriaStateNode.cs
@@ -2,6 +2,7 @@ using System;
using System.IO;
using System.Threading.Tasks;
using Aetheria.State.Documents;
+using GameCult.Aetheria.State.Unity;
using GameCult.Caching;
using GameCult.Caching.MessagePack;
using GameCult.Mesh;
@@ -207,6 +208,164 @@ public sealed class AetheriaStateNode : IAsyncDisposable, IDisposable
new CultRecordKey(AetheriaProviderAdvertisementProjector.AdvertisementKey));
}
+ public Task> PutDaemonProviderAdvertisementAsync(
+ AetheriaRuntimeDaemonProviderAdvertisementDocument advertisement)
+ {
+ return Database.PutAsync(new CultRecordKey("daemon:aetheria.provider_advertisement.v1"), advertisement);
+ }
+
+ public Task GetDaemonProviderAdvertisementAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey("daemon:aetheria.provider_advertisement.v1"));
+ }
+
+ public Task> PutDaemonHealthAsync(
+ AetheriaRuntimeDaemonHealthDocument health)
+ {
+ return Database.PutAsync(new CultRecordKey("daemon:aetheria.health.v1"), health);
+ }
+
+ public Task GetDaemonHealthAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey("daemon:aetheria.health.v1"));
+ }
+
+ public Task> PutDaemonCommandBoundaryAsync(
+ AetheriaRuntimeDaemonCommandBoundaryDocument boundary)
+ {
+ return Database.PutAsync(new CultRecordKey("daemon:aetheria.command_boundary.v1"), boundary);
+ }
+
+ public Task GetDaemonCommandBoundaryAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey("daemon:aetheria.command_boundary.v1"));
+ }
+
+ public Task> SubmitDaemonCommandAsync(
+ AetheriaRuntimeDaemonCommandDocument command)
+ {
+ if (command == null) throw new ArgumentNullException(nameof(command));
+ command.Schema = AetheriaRuntimeDaemonSchemas.Command;
+ if (string.IsNullOrWhiteSpace(command.CommandId))
+ command.CommandId = Guid.NewGuid().ToString("N");
+ if (string.IsNullOrWhiteSpace(command.IssuedAtUtc))
+ command.IssuedAtUtc = DateTime.UtcNow.ToString("O");
+
+ return Database.PutAsync(DaemonCommandKey(command.CommandId), command);
+ }
+
+ public IReadOnlyList ReadObservedDaemonCommands()
+ {
+ return Cache
+ .GetAll()
+ .OrderBy(command => command.IssuedAtUtc ?? "", StringComparer.Ordinal)
+ .ThenBy(command => command.CommandId ?? "", StringComparer.Ordinal)
+ .ToArray();
+ }
+
+ private static CultRecordKey DaemonCommandKey(string commandId)
+ {
+ return new CultRecordKey($"daemon:commands:{StableToken(commandId)}:gamecult.aetheria.daemon_command.v1");
+ }
+
+ public Task> SubmitEveCommandAsync(
+ AetheriaRuntimeEveCommandDocument command)
+ {
+ if (command == null) throw new ArgumentNullException(nameof(command));
+ command.Schema = AetheriaRuntimeEveCommandDocument.SchemaId;
+ if (string.IsNullOrWhiteSpace(command.CommandId))
+ command.CommandId = Guid.NewGuid().ToString("N");
+ if (string.IsNullOrWhiteSpace(command.IssuedAtUtc))
+ command.IssuedAtUtc = DateTime.UtcNow.ToString("O");
+
+ return Database.PutAsync(EveCommandKey(command.CommandId), command);
+ }
+
+ public IReadOnlyList ReadObservedEveCommands()
+ {
+ return Cache
+ .GetAll()
+ .OrderBy(command => command.IssuedAtUtc ?? "", StringComparer.Ordinal)
+ .ThenBy(command => command.CommandId ?? "", StringComparer.Ordinal)
+ .ToArray();
+ }
+
+ private static CultRecordKey EveCommandKey(string commandId)
+ {
+ return new CultRecordKey($"eve:commands:{StableToken(commandId)}:gamecult.eve.command.v1");
+ }
+
+ public Task> PutDaemonFrameAsync(
+ AetheriaRuntimeDaemonFrameDocument frame)
+ {
+ return Database.PutAsync(new CultRecordKey("daemon:aetheria.frame.latest.v1"), frame);
+ }
+
+ public Task GetDaemonFrameAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey("daemon:aetheria.frame.latest.v1"));
+ }
+
+ public Task> PutDaemonSoaViewAsync(
+ AetheriaRuntimeDaemonSoaViewDocument view)
+ {
+ return Database.PutAsync(new CultRecordKey("daemon:aetheria.soa_view.latest.v1"), view);
+ }
+
+ public Task GetDaemonSoaViewAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey("daemon:aetheria.soa_view.latest.v1"));
+ }
+
+ public Task> PutDaemonGameSurfaceAsync(EveSurfaceState surface)
+ {
+ return Database.PutAsync(new CultRecordKey(AetheriaProviderAdvertisementProjector.DaemonGameSurfaceKey), surface);
+ }
+
+ public Task GetDaemonGameSurfaceAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey(AetheriaProviderAdvertisementProjector.DaemonGameSurfaceKey));
+ }
+
+ public Task> PutDaemonGameTuiSurfaceAsync(EveSurfaceState surface)
+ {
+ return Database.PutAsync(new CultRecordKey(AetheriaProviderAdvertisementProjector.DaemonGameTuiSurfaceKey), surface);
+ }
+
+ public Task GetDaemonGameTuiSurfaceAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey(AetheriaProviderAdvertisementProjector.DaemonGameTuiSurfaceKey));
+ }
+
+ public Task> PutDaemonEditorSurfaceAsync(EveSurfaceState surface)
+ {
+ return Database.PutAsync(new CultRecordKey(AetheriaProviderAdvertisementProjector.DaemonEditorSurfaceKey), surface);
+ }
+
+ public Task GetDaemonEditorSurfaceAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey(AetheriaProviderAdvertisementProjector.DaemonEditorSurfaceKey));
+ }
+
+ public Task> PutDaemonEditorTuiSurfaceAsync(EveSurfaceState surface)
+ {
+ return Database.PutAsync(new CultRecordKey(AetheriaProviderAdvertisementProjector.DaemonEditorTuiSurfaceKey), surface);
+ }
+
+ public Task GetDaemonEditorTuiSurfaceAsync()
+ {
+ return Database.GetAsync(
+ new CultRecordKey(AetheriaProviderAdvertisementProjector.DaemonEditorTuiSurfaceKey));
+ }
+
public Task> PutRuntimeSessionAsync(AetheriaRuntimeSession session)
{
return Database.PutAsync(new CultRecordKey($"runtime:{session.RuntimeId}:aetheria.runtime_session.v1"), session);
@@ -284,28 +443,16 @@ public sealed class AetheriaStateNode : IAsyncDisposable, IDisposable
new CultRecordKey("global:aetheria.verse_host_settings.v1"));
}
- public Task> PutRuntimeCommitDrainStatusAsync(
- AetheriaRuntimeCommitDrainStatus status)
+ public Task> PutEveCommandAcceptanceStatusAsync(
+ AetheriaEveCommandAcceptanceStatus status)
{
- return Database.PutAsync(new CultRecordKey("global:aetheria.runtime_commit_drain_status.v1"), status);
+ return Database.PutAsync(new CultRecordKey("global:aetheria.eve_command_acceptance_status.v1"), status);
}
- public Task GetRuntimeCommitDrainStatusAsync()
+ public Task GetEveCommandAcceptanceStatusAsync()
{
- return Database.GetAsync(
- new CultRecordKey("global:aetheria.runtime_commit_drain_status.v1"));
- }
-
- public Task> PutEveCommandDrainStatusAsync(
- AetheriaEveCommandDrainStatus status)
- {
- return Database.PutAsync(new CultRecordKey("global:aetheria.eve_command_drain_status.v1"), status);
- }
-
- public Task GetEveCommandDrainStatusAsync()
- {
- return Database.GetAsync(
- new CultRecordKey("global:aetheria.eve_command_drain_status.v1"));
+ return Database.GetAsync(
+ new CultRecordKey("global:aetheria.eve_command_acceptance_status.v1"));
}
public Task FlushAsync(bool soft = false)
@@ -313,6 +460,20 @@ public sealed class AetheriaStateNode : IAsyncDisposable, IDisposable
return _node.FlushAsync(soft);
}
+ private static string StableToken(string value)
+ {
+ if (string.IsNullOrWhiteSpace(value))
+ return "empty";
+
+ var chars = value
+ .Select(character => char.IsLetterOrDigit(character) ? character : '-')
+ .ToArray();
+ var token = new string(chars).Trim('-').ToLowerInvariant();
+ while (token.Contains("--", StringComparison.Ordinal))
+ token = token.Replace("--", "-", StringComparison.Ordinal);
+ return string.IsNullOrWhiteSpace(token) ? "empty" : token;
+ }
+
public void Dispose()
{
_node.Dispose();
diff --git a/Aetheria.State/Documents/AetheriaEveCommandDrainStatus.cs b/Aetheria.State/Documents/AetheriaEveCommandAcceptanceStatus.cs
similarity index 70%
rename from Aetheria.State/Documents/AetheriaEveCommandDrainStatus.cs
rename to Aetheria.State/Documents/AetheriaEveCommandAcceptanceStatus.cs
index d8ce33e67..c6e4eac2e 100644
--- a/Aetheria.State/Documents/AetheriaEveCommandDrainStatus.cs
+++ b/Aetheria.State/Documents/AetheriaEveCommandAcceptanceStatus.cs
@@ -3,14 +3,14 @@ using MessagePack;
namespace Aetheria.State.Documents;
-[CultDocument("aetheria.eve_command_drain_status", "aetheria.eve_command_drain_status.v1")]
+[CultDocument("aetheria.eve_command_acceptance_status", "aetheria.eve_command_acceptance_status.v1")]
[CultGlobal]
[MessagePackObject]
-public sealed class AetheriaEveCommandDrainStatus
+public sealed class AetheriaEveCommandAcceptanceStatus
{
[Key(0)]
[CultName]
- public string Name { get; set; } = "Aetheria Eve command drain";
+ public string Name { get; set; } = "Aetheria Eve command acceptance";
[Key(1)]
[CultIndex("runtimeId")]
@@ -26,7 +26,7 @@ public sealed class AetheriaEveCommandDrainStatus
public string LastAcceptedAtUtc { get; set; } = "";
[Key(5)]
- public int PendingBeforeApply { get; set; }
+ public int ObservedBeforeAccept { get; set; }
[Key(6)]
public int CommandsAccepted { get; set; }
@@ -60,4 +60,13 @@ public sealed class AetheriaEveCommandDrainStatus
[Key(16)]
public int AppliedVerseHostCommands { get; set; }
+
+ [Key(17)]
+ public int AppliedInputSettingsCommands { get; set; }
+
+ [Key(18)]
+ public int AppliedLoadoutTemplateCommands { get; set; }
+
+ [Key(19)]
+ public string[] AccountedCommandIds { get; set; } = [];
}
diff --git a/Aetheria.State/Documents/AetheriaRuntimeCommitDrainStatus.cs b/Aetheria.State/Documents/AetheriaRuntimeCommitDrainStatus.cs
deleted file mode 100644
index 9cb42d16e..000000000
--- a/Aetheria.State/Documents/AetheriaRuntimeCommitDrainStatus.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using GameCult.Caching;
-using MessagePack;
-
-namespace Aetheria.State.Documents;
-
-[CultDocument("aetheria.runtime_commit_drain_status", "aetheria.runtime_commit_drain_status.v1")]
-[CultGlobal]
-[MessagePackObject]
-public sealed class AetheriaRuntimeCommitDrainStatus
-{
- [Key(0)]
- [CultName]
- public string Name { get; set; } = "Aetheria runtime commit drain";
-
- [Key(1)]
- [CultIndex("runtimeId")]
- public string RuntimeId { get; set; } = "";
-
- [Key(2)]
- public string StatePath { get; set; } = "";
-
- [Key(3)]
- public string LastPollAtUtc { get; set; } = "";
-
- [Key(4)]
- public string LastAppliedAtUtc { get; set; } = "";
-
- [Key(5)]
- public int PendingBeforeApply { get; set; }
-
- [Key(6)]
- public int CommandsApplied { get; set; }
-
- [Key(7)]
- public int AppliedPlayerSettings { get; set; }
-
- [Key(8)]
- public int AppliedLoadoutTemplates { get; set; }
-
- [Key(9)]
- public int AppliedRunCheckpoints { get; set; }
-
- [Key(10)]
- public int ConsecutiveFailures { get; set; }
-
- [Key(11)]
- public string LastError { get; set; } = "";
-
- [Key(12)]
- public string Status { get; set; } = "ok";
-}
diff --git a/Aetheria.State/README.md b/Aetheria.State/README.md
index 3b29ab614..8bb3aaf29 100644
--- a/Aetheria.State/README.md
+++ b/Aetheria.State/README.md
@@ -38,27 +38,28 @@ The Unity client no longer writes `PlayerSettings.msgpack`, `.loadout`, or
replacement for bespoke loadout files, with structured hull/equipment/cargo/
docking item slots, nested child-entity loadouts, and weapon groups.
`RuntimePlayerSettings` is the Unity session projection for menus, formatting,
-and input binding edits; menu and input-screen changes queue typed
-`.cc.pending` player-settings commits and are not portable state authority.
-Unity settings, loadout templates, and run checkpoints now queue typed
-`.cc.pending` runtime commit documents beside
-`GameData/aetheria-world.cc`. `Aetheria.State` owns applying those documents
-into canonical typed state through `AetheriaRuntimeCommitLogApplier`; the
-Unity-side command log is command-only and cannot become durable truth by
-itself.
-`AetheriaRuntimeSession` is the typed Verse signal for the running state host
-or one-shot pending drain. `Economy.Server` owns the long-running
-`cultmesh-state-host` heartbeat and publishes `starting`, `running`, and
-`stopping` states through `Aetheria.State`; drain status remains operation
-telemetry, not daemon-session ownership.
-Unity Eve surfaces also emit typed `gamecult.eve.command.v1` documents under
-`GameData/aetheria-world.cc.eve.pending`. `AetheriaEveCommandBridge` is the
-provider-owned acceptance organ for those commands: it validates the provider,
-surface, and command template before running the narrow refresh handlers for
-the catalog and operations surfaces plus the typed player-settings mutation
-handlers for gameplay/graphics Eve controls and typed Verse-host visibility
-commands. Renderer callbacks do not accept commands or mutate game state
-locally.
+and input binding display. Menu and input-screen changes send typed Eve request
+documents to the provider-owned Aetheria Verse service; they are not portable
+state authority and must not mutate daemon-owned state inside Unity.
+The old `.cc.pending` runtime commit document lane is deleted. Gameplay state,
+loadout templates, and run checkpoints are accepted by the daemon/Verse owner
+through typed state operations and daemon command documents, not by
+renderer-side commit authority.
+`AetheriaRuntimeSession` is the typed Verse signal for the running daemon.
+`Aetheria.State.Daemon` owns the long-running `aetheria-daemon` heartbeat and
+publishes `starting`, `running`, and `stopping` states through `Aetheria.State`;
+legacy outbox status remains operation telemetry, not daemon-session ownership.
+Unity Eve surfaces construct typed `gamecult.eve.command.v1` command documents.
+The neutral `AetheriaCommandPort` owns command submission for headless and
+non-Unity clients; Unity input providers reach the same records through the
+`AetheriaRuntimeCommandPort` facade. The Verse daemon uses `AetheriaStateNode`
+to observe and accept those CultNet records in the Aetheria state graph.
+`AetheriaEveCommandBridge` is the provider-owned command acceptor for those
+records: it validates the provider, surface, and command template before
+running the narrow refresh handlers for the catalog and operations surfaces
+plus the typed player-settings mutation handlers for gameplay/graphics Eve
+controls and typed Verse-host visibility commands. Renderer callbacks do not
+accept commands or mutate game state locally.
`AetheriaEveRuntimeBootstrap` mounts the `aetheria.operations` surface through a
runtime-created `UIDocument` after scene load, with environment and command-line
switches for diagnostics. UI Toolkit is now a live runtime lowering path, not
@@ -66,6 +67,15 @@ only a package sample.
The old `SavedGame`/`SavedZone` DTOs and `Galaxy` loader constructor have also
been deleted; the new document family is live Verse run/zone state, not a
bespoke save-file format.
+Daemon run frames project into Unity through the explicit
+`EntityConstructionBlueprintProjector.ProjectObservedFromBlueprint` lowering
+path; authoritative blueprint construction remains named separately as a
+migration target for code that still has to move into the daemon.
+Main-menu gameplay boot also projects the daemon run through
+`Galaxy.ProjectObservedDaemonRun` rather than constructing or generating a
+Unity-owned run. The Unity handle for this shell is
+`ActionGameManager.ObservedGalaxy` to keep the client-side object named as an
+observation.
The dead `SavedStory` JSON DTO is gone. `ZoneConstructionBlueprint` and
`RuntimeEntityBlueprint` remain in-memory construction/loadout projections for
Unity runtime code, with `RuntimeEntityBlueprintProjector` capturing and
@@ -104,13 +114,13 @@ lookup overloads and the derived behavior `AmmoType`/`Item` GUID properties
have been deleted. Action-bar consumable bindings now read the target `ItemKey`
directly from typed runtime catalog rows instead of reconstructing it from
legacy item IDs.
-Unity runtime commit DTOs carry typed `ItemKey`/`HullItemKey` fields only for
+Daemon snapshot DTOs carry typed `ItemKey`/`HullItemKey` fields only for
loadout items, action-bar targets, body resources, entity hulls, and active
-consumables; the commit applier no longer reconstructs item keys from legacy
-item GUID fields.
-Unity runtime commit DTOs now carry typed `FactionKey` only for loadout
-entities, run entity snapshots, and faction relationship state. The old
-pending-command `CorporationLegacyId` fallback fields are deleted.
+consumables; daemon command application no longer reconstructs item keys from
+legacy item GUID fields.
+Daemon snapshot DTOs now carry typed `FactionKey` only for loadout entities,
+run entity snapshots, and faction relationship state. The old command-document
+`CorporationLegacyId` fallback fields are deleted.
`EntityConstructionBlueprint` also carries `FactionKey` only. Loadout restore,
entity construction, run entity snapshots, and faction relationship commits no
longer rebuild corporation references from legacy `Faction.ID` GUIDs.
@@ -124,10 +134,10 @@ GUID link fields.
sector-map link/influence rendering, zone security ownership checks, and
runtime faction-relationship ordering now use `FactionKey`. The legacy
`Faction.ID` projection field is deleted from the temporary simulation shell.
-Run checkpoint commit DTOs carry typed `OrbitKey`, `ParentOrbitKey`, and
-`BodyKey` only for zone orbit/body snapshots. The old pending-command
+Run checkpoint snapshot DTOs carry typed `OrbitKey`, `ParentOrbitKey`, and
+`BodyKey` only for zone orbit/body snapshots. The old command-document
`OrbitLegacyId`, `ParentLegacyId`, and `BodyLegacyId` fallback fields are
-deleted. Behavior-state runtime commits and readback snapshots carry typed
+deleted. Behavior-state daemon snapshots and readback snapshots carry typed
body-key fields for resource scanner targets and mining tool asteroid belts;
the old raw body ID commit/readback field names are deleted. `ResourceScanner`
and `MiningTool` now retain typed body-key runtime state directly, while
@@ -319,8 +329,8 @@ does not write daemon-owned Verse state. Unity can use this as the first
package boundary once CultLib/Eve runtime packaging is available.
Unity `MainMenu` now lowers a typed Verse settings shell over that split:
client-target edits persist locally in `aetheria-client.cc`, while Verse-host
-visibility changes queue provider-owned Eve commands against the selected local
-Verse state file.
+visibility changes append provider-owned Eve request documents against the
+selected local Verse state file.
`Galaxy` now consumes this package-owned runtime catalog for faction selection
and name generation, so generated sectors use typed corporation v2 and
`aetheria.name_file.v2` records instead of legacy `Faction`/`NameFile`
@@ -346,13 +356,13 @@ reviving `PlayerSettings.msgpack`, `.loadout`, or `.zone` serialization.
Unity `MainMenu` now lowers that same player-settings Eve document contract
locally through UI Toolkit instead of hand-authoring separate gameplay/graphics
widgets; the menu shell keeps name entry and back-navigation while gameplay
-still owns command semantics through `ActionGameManager.CommitRuntimePlayerSettingsCommand`.
+still owns command semantics through `ActionGameManager.RequestRuntimePlayerSettingsCommand`.
The run document also carries `CurrentEntityKey`, so Continue restore binds the
saved player entity by exact typed record identity instead of reconstructing it
from a transient entity-slot index. Canonical typed run state no longer stores
`CurrentZoneEntityIndex`; older stored runs are translated through the package
-reader into `CurrentEntityKey`, and older queued runtime commits are translated
-through the pending commit reader when those compatibility seams are needed.
+reader into `CurrentEntityKey`. The older runtime commit importer has
+been removed from the first-party state host and Unity package.
`Aetheria.State.Verify` opens a materialized state file and checks that the
typed migration ledger matches the actual item, corporation, and name-file
@@ -371,38 +381,38 @@ symbols such as MessagePack, Newtonsoft, JsonKnownTypes, RethinkDB, or old
`DatabaseEntry`/`DatabaseLink` references; the remaining MessagePack usage is a
named package/import CultCache transport boundary, not gameplay state authority.
The package boundary is also fenced: MessagePack symbols may only appear in the
-runtime catalog reader, pending CultCache envelope store, and typed runtime/Eve
+runtime catalog reader, CultCache document store, and typed runtime/Eve
command document files until generated CultCache serializers replace that
temporary Unity-side codec. The verifier also checks that the Eve runtime
bootstrap exists, mounts the operations surface through the UI Toolkit presenter,
-and keeps renderer commands routed through the typed Eve command log.
+and keeps renderer commands routed through the typed Eve command inbox.
Use it after import when `GameData/aetheria-world.cc` changes.
`Aetheria.State.Unity.Smoke` opens the materialized state through the runtime
facade and proves read-only Unity-facing catalog access without the legacy
-catalog reader. It also proves runtime commit envelopes for settings and run
-zone/entity snapshots can be queued, applied through `Aetheria.State`, and
-cleared. Pending runtime state and Eve command queue files are CultCache-shaped
-`.cc` records with embedded schema catalogs; their current record payload codec
-is still temporary package code until Unity consumes generated CultCache
+catalog reader. Live Unity code uses typed Eve or daemon request documents
+instead of runtime commit outboxes. Runtime and Eve requests are typed `.cc`
+records with embedded schema catalogs; their current record payload codec is
+still temporary package code until Unity consumes generated CultCache
serializers directly.
-`Economy.Server` opens the CultMesh state host, applies pending runtime commits
-and pending Eve surface commands on startup, and polls for new pending work
-while running. For a bounded one-shot drain without leaving the host running:
+`Aetheria.State.Daemon` opens the CultMesh Verse daemon, publishes daemon-owned
+Verse identity/health/game/editor surfaces, accepts observed Eve command
+documents on startup, and executes observed daemon command records each tick.
+For a bounded one-shot daemon tick:
```powershell
-dotnet run --project .\Economy.Server\Economy.Server.csproj -- --apply-pending-once
+dotnet run --project .\Aetheria.State.Daemon\Aetheria.State.Daemon.csproj -- --once
```
-The server publishes `AetheriaRuntimeCommitDrainStatus`,
-`AetheriaEveCommandDrainStatus`, the `aetheria.operations` Eve surface, and the
-typed `aetheria.player_settings` Eve surface after drain attempts, so pending
-depth, accepted/applied/rejected counts, failures, timestamps, and player
-settings controls are typed state rather than console-only status. It also
+The daemon publishes `AetheriaEveCommandAcceptanceStatus`, the
+`aetheria.operations` Eve surface, and the
+typed `aetheria.player_settings` Eve surface after request acceptance attempts,
+so observed depth, accepted/applied/rejected counts, failures, timestamps, and
+player settings controls are typed state rather than console-only status. It also
persists daemon-owned `aetheria.verse_host_settings.v1`, with boot-time
defaults or overrides for service id, Verse id, visibility, and CultMesh
-address. When visibility is `public`, the long-running daemon also serves a
+address. When visibility is `public`, the daemon also serves a
derived CultMesh Verse catalog from that same typed host document, using the
located service name as the discoverable `cultnet://...:3075` endpoint. The
operations surface and provider advertisement project from that typed host
@@ -427,19 +437,10 @@ The Unity Verse-settings shell can also trigger the same one-shot sync through
the `Aetheria.State.Replica` bridge when the repo-local tool is available. That
keeps target selection local while the replica organ owns daemon transport.
-`Aetheria.State.ApplyPending` is the smaller local operator applicator for
-queued Unity runtime commits and Eve commands when the server host is not being
-used. It also republishes the typed drain status, operations surface,
-player-settings surface, typed `aetheria.verse_host_settings.v1`, and provider
-advertisement after applying pending files:
-
-```powershell
-dotnet run --project .\Aetheria.State.ApplyPending\Aetheria.State.ApplyPending.csproj -- .
-```
-
-Pass an explicit state path as the second argument when applying a non-default
-`.cc` file. Use `--keep` only for diagnostics; normal application deletes
-successfully applied command files.
+The old standalone `Aetheria.State.DrainCommands` applicator is deleted. Command
+acceptance is daemon behavior now; bounded operation uses `Aetheria.State.Daemon
+--once` so the same Verse member publishes the same provider, health, command
+boundary, and Eve surfaces.
Current rebuild notes:
diff --git a/Aetheria.State/docs/verse-daemon-shape.md b/Aetheria.State/docs/verse-daemon-shape.md
new file mode 100644
index 000000000..dea8af1ef
--- /dev/null
+++ b/Aetheria.State/docs/verse-daemon-shape.md
@@ -0,0 +1,52 @@
+# Aetheria Verse Daemon Shape
+
+Aetheria should follow the Odin/VoidBot daemon shape instead of growing a private Unity-shaped command system.
+
+## Authority
+
+Odin is the all-seer, not the owner. It discovers Aetheria's provider advertisement and interface bindings, indexes the schema/catalog surface, and gives agents a registry overview. Idunn keeps the daemon alive from daemon-published health and command-boundary records. Bifrost hosts the MCP crossing for Codex and other xeno agents. Eve/CultUI defines presentation shape. The Aetheria daemon remains the side-effect owner.
+
+The daemon owns Aetheria simulation state, typed command application, health publication, command boundaries, provider advertisement, and provider-owned Eve GUI/TUI surfaces. Unity is a renderer and input lowerer. A browser, a terminal, Blender, or another runtime should see the same daemon-owned Verse through the same typed publications.
+
+Unity-side entity graph creation must name the boundary it is crossing. `EntityConstructionBlueprintProjector.InstantiateAuthoritativeFromBlueprint` is for local authoritative construction paths that still need to be migrated into the daemon; daemon frames use `EntityConstructionBlueprintProjector.ProjectObservedFromBlueprint` to lower observed state into Unity objects. A Unity frame consumer must not call the authoritative construction entry point.
+
+The same rule applies at the galaxy shell. `Galaxy.ProjectObservedDaemonRun` may build a Unity navigation/rendering projection from an authoritative daemon run frame. Main menu boot must not call a `Galaxy` constructor directly or run procedural generation; the daemon owns the run and Unity lowers it. The Unity-side public handle is `ActionGameManager.ObservedGalaxy`, not `CurrentGalaxy`, because it is a projection of daemon state.
+
+VoidBot's Odin MCP shape is the useful boundary model for agents: list providers through Odin, list Verses through Odin, load a provider-owned interface context through Odin, and invoke only commands that the provider interface advertises. The MCP is not a Brokkr special case and not a raw daemon socket wrapper.
+
+Brokkr is just one daemon that happens to publish Unity editor surfaces. Aetheria should behave the same way: publish provider advertisements and Eve GUI/TUI surfaces into the local Verse, let Odin index them, and let Bifrost expose ergonomic MCP tools that lower or invoke those surfaces without taking ownership.
+
+## Publications
+
+Required Aetheria daemon publications are the live typed schemas in `AetheriaRuntimeDaemonSchemas`:
+
+- `gamecult.aetheria.daemon_provider_advertisement.v1`: Verse id, provider ids, daemon id, schema catalog, state witnesses, Eve surface keys, command boundaries, and transport profile metadata.
+- `gamecult.aetheria.daemon_health.v1`: daemon id, Verse id, state path, frame id, command acceptance status, simulation status, publication source, transport, and command-boundary path.
+- `gamecult.aetheria.daemon_command_boundary.v1`: typed command schemas accepted by the daemon, authority requirements, receipt schema, and delivery transport.
+- `gamecult.aetheria.daemon_frame.v1` plus `gamecult.aetheria.daemon_soa_view.v1`: authoritative simulation state for renderer clients.
+- `gamecult.aetheria.daemon_game_surface.v1` and `gamecult.aetheria.daemon_editor_surface.v1`: GUI/TUI views of the same provider-owned state.
+
+The provider advertisement is not a dashboard index. It is the daemon's promise about what it owns, where its witnesses live, what command boundary it accepts, and what transports can reach it.
+
+Aetheria currently has two advertisement layers during the bridge:
+
+- `gamecult.eve.provider_advertisement.v1` is the Odin-visible Eve provider card for the Aetheria Verse daemon and compatibility surfaces such as catalog, operations, and player settings.
+- `gamecult.aetheria.daemon_provider_advertisement.v1` is the daemon-owned Aetheria runtime contract for authoritative frames, SoA views, game/editor GUI surfaces, game/editor TUI surfaces, health, and command boundaries.
+
+The bridge layer must point at daemon-owned witnesses instead of becoming a second source of truth. Long term, Odin should discover the daemon-owned provider advertisement and interface bindings directly; the older state-host card should become a compatibility adapter or disappear.
+
+## Queues
+
+Queues are an implementation detail. Eve commands and daemon commands are typed `gamecult.eve.command.v1` and `gamecult.aetheria.daemon_command.v1` records in the Aetheria state graph; the old `.pending` runtime commit outbox is gone. None of those folders are the public API, daemon identity, or a substitute for CultNet/CultMesh command ports. Anything still named `Queue*`, `CommandLog`, `Inbox`, `mailbox`, `.eve.commands`, `.daemon.commands`, `.cc.pending`, or `PendingCultCacheStore` in Unity-facing daemon/Eve command code should lower to typed command documents and be demoted behind typed operation methods as the CultNet command boundaries come online.
+
+`AetheriaCommandPort` is the neutral command submission implementation for typed command records. Unity-side command lowerers may use `AetheriaRuntimeCommandPort` as a facade over that same port. They must not drain those records or mutate state in response; ownership stays with the daemon Verse member.
+
+Migration rule: do not expose string command names and payload maps as public Aetheria APIs. Compatibility adapters may decode external Eve requests at the edge, but persisted Aetheria command documents and Unity gameplay calls should use typed command bodies and typed operation methods.
+
+Daemon-published game surface buttons select typed daemon command documents by command id (`aetheria.daemon.commands.*`). They must not smuggle daemon command fields through generic Eve payload maps such as `commandKind`, `weaponGroup`, or `scalarValue`; richer commands need explicit typed body builders.
+
+Unity menu handlers should not construct Aetheria command bodies by spelunking `EveSurfaceCommandRequest.Payload`. Pass the request to the shared typed command client at the Eve edge, then submit the resulting `gamecult.eve.command.v1` or `gamecult.aetheria.daemon_command.v1` document.
+
+## Cut Line
+
+If a status/control surface matters to operators or agents, publish it as typed CultCache state or a `.cc` witness plus an Eve/CultUI CultMesh surface. Do not add a private HTTP dashboard, Unity-only inspector, JSON status blob, or agent-specific daemon wrapper as canonical truth.
diff --git a/Aetheria.sln b/Aetheria.sln
new file mode 100644
index 000000000..1e188399f
--- /dev/null
+++ b/Aetheria.sln
@@ -0,0 +1,85 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{7c9c511c-1c6f-9c1f-c455-88359f498803}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{47728ed0-fa53-fa99-9dca-8eb78b1dbfe4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameCult.Aetheria.State.Unity", "GameCult.Aetheria.State.Unity.csproj", "{d6094cfd-26d1-83d1-2366-5762cca2bc33}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniRx", "UniRx.csproj", "{99486114-c78b-e9b0-654f-710398497645}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameCult.Aetheria.EveRuntime", "GameCult.Aetheria.EveRuntime.csproj", "{a1a8b65b-ca79-2fa2-3803-5f4833778bdb}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheria.Shared.Unity", "Aetheria.Shared.Unity.csproj", "{31542707-f1f7-33c1-eef6-37982be14f82}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{b690125b-09ac-e423-4873-1648ff205166}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{6529161a-3c3e-1394-61a8-ab66047d3732}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ink", "Ink.csproj", "{6bae5155-742f-1170-f8b5-ff696c59aad8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameCult.Brokkr.Editor", "GameCult.Brokkr.Editor.csproj", "{f041e9dc-dc28-1d6c-75a3-824162b4a1ae}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CultMath", "CultMath.csproj", "{6f7a47c4-21dc-64ef-0969-96b956a000f4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameCult.Brokkr", "GameCult.Brokkr.csproj", "{fc28bcbe-9ef4-444f-c1c9-dde8a3a864ad}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substance.Platform", "Substance.Platform.csproj", "{d6a66898-22ba-8995-ccfd-eb708fdff52a}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests.csproj", "{28568750-512b-4d45-69bf-887882a23da7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameCult.Eve.UnityUIToolkit", "GameCult.Eve.UnityUIToolkit.csproj", "{5cdb0413-71d7-c6b3-4ad9-d8e730b55ffb}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameCult.Eve.Surface", "GameCult.Eve.Surface.csproj", "{037dacf0-10f4-20ed-7963-3a1e1ac15b64}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substance.EditorHelper", "Substance.EditorHelper.csproj", "{f12f044e-28bc-36bc-242c-ecd2736d345d}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MessagePack.SourceDisabled", "MessagePack.SourceDisabled.csproj", "{b916e744-81e2-a0ba-3884-e845f1c5ef88}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7c9c511c-1c6f-9c1f-c455-88359f498803}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7c9c511c-1c6f-9c1f-c455-88359f498803}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {47728ed0-fa53-fa99-9dca-8eb78b1dbfe4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {47728ed0-fa53-fa99-9dca-8eb78b1dbfe4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {d6094cfd-26d1-83d1-2366-5762cca2bc33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {d6094cfd-26d1-83d1-2366-5762cca2bc33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {99486114-c78b-e9b0-654f-710398497645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {99486114-c78b-e9b0-654f-710398497645}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {a1a8b65b-ca79-2fa2-3803-5f4833778bdb}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {a1a8b65b-ca79-2fa2-3803-5f4833778bdb}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {31542707-f1f7-33c1-eef6-37982be14f82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {31542707-f1f7-33c1-eef6-37982be14f82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {b690125b-09ac-e423-4873-1648ff205166}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {b690125b-09ac-e423-4873-1648ff205166}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6529161a-3c3e-1394-61a8-ab66047d3732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6529161a-3c3e-1394-61a8-ab66047d3732}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6bae5155-742f-1170-f8b5-ff696c59aad8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6bae5155-742f-1170-f8b5-ff696c59aad8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {f041e9dc-dc28-1d6c-75a3-824162b4a1ae}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {f041e9dc-dc28-1d6c-75a3-824162b4a1ae}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6f7a47c4-21dc-64ef-0969-96b956a000f4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6f7a47c4-21dc-64ef-0969-96b956a000f4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {fc28bcbe-9ef4-444f-c1c9-dde8a3a864ad}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {fc28bcbe-9ef4-444f-c1c9-dde8a3a864ad}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {d6a66898-22ba-8995-ccfd-eb708fdff52a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {d6a66898-22ba-8995-ccfd-eb708fdff52a}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {28568750-512b-4d45-69bf-887882a23da7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {28568750-512b-4d45-69bf-887882a23da7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5cdb0413-71d7-c6b3-4ad9-d8e730b55ffb}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5cdb0413-71d7-c6b3-4ad9-d8e730b55ffb}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {037dacf0-10f4-20ed-7963-3a1e1ac15b64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {037dacf0-10f4-20ed-7963-3a1e1ac15b64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {f12f044e-28bc-36bc-242c-ecd2736d345d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {f12f044e-28bc-36bc-242c-ecd2736d345d}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {b916e744-81e2-a0ba-3884-e845f1c5ef88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {b916e744-81e2-a0ba-3884-e845f1c5ef88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset
new file mode 100644
index 000000000..c4d0d4b63
--- /dev/null
+++ b/Assets/DefaultVolumeProfile.asset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70e9ed4656132bf185009cb47db521fdeece0b1f4d464a73cb9d0bd04fe3bda5
+size 497
diff --git a/Assets/DefaultVolumeProfile.asset.meta b/Assets/DefaultVolumeProfile.asset.meta
new file mode 100644
index 000000000..2fdac1435
--- /dev/null
+++ b/Assets/DefaultVolumeProfile.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7830976a04fc12843bb7f63ba390f142
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AetheriaInput.cs b/Assets/Scripts/AetheriaInput.cs
index 9978716ce..717b5cbcb 100644
--- a/Assets/Scripts/AetheriaInput.cs
+++ b/Assets/Scripts/AetheriaInput.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-// version 1.14.0
+// version 1.19.0
// from Assets/Resources/Aetheria.inputactions
//
// Changes to this file may cause incorrect behavior and will be lost if
@@ -85,6 +85,7 @@ public partial class @AetheriaInput: IInputActionCollection2, IDisposable
public @AetheriaInput()
{
asset = InputActionAsset.FromJson(@"{
+ ""version"": 1,
""name"": ""Aetheria"",
""maps"": [
{
diff --git a/Assets/Scripts/Editor/NameTools.cs b/Assets/Scripts/Editor/NameTools.cs
index 909b2f631..742a5aa4c 100644
--- a/Assets/Scripts/Editor/NameTools.cs
+++ b/Assets/Scripts/Editor/NameTools.cs
@@ -6,7 +6,7 @@ using UnityEditor;
using UnityEditor.UIElements;
using UnityEngine;
using UnityEngine.UIElements;
-using Random = Unity.Mathematics.Random;
+using Random = CultMath.Random;
public class NameTools : EditorWindow
{
diff --git a/Assets/Scripts/Gameplay/ActionBarSlot.cs b/Assets/Scripts/Gameplay/ActionBarSlot.cs
index 8e791ebc0..79aabbcbf 100644
--- a/Assets/Scripts/Gameplay/ActionBarSlot.cs
+++ b/Assets/Scripts/Gameplay/ActionBarSlot.cs
@@ -73,7 +73,7 @@ public class ActionBarConsumableBinding : ActionBarBinding
public override void Activate()
{
- Entity.TryActivateConsumable(Target);
+ ActionGameManager.Instance.TryRequestDaemonActionBarConsumable(TargetItemKey);
}
public override void Deactivate()
@@ -162,13 +162,13 @@ public class ActionBarGearBinding : ActionBarBinding
public override void Activate()
{
Active = true;
- Behavior.Activate();
+ ActionGameManager.Instance.TryRequestDaemonActionBarBehavior(EquipmentIndex, BehaviorIndex, true);
}
public override void Deactivate()
{
Active = false;
- Behavior.Deactivate();
+ ActionGameManager.Instance.TryRequestDaemonActionBarBehavior(EquipmentIndex, BehaviorIndex, false);
}
public override void Update()
@@ -191,18 +191,12 @@ public class ActionBarWeaponGroupBinding : ActionBarBinding
public override void Activate()
{
- foreach (var weapon in Entity.WeaponGroups[Group].weapons)
- {
- weapon.Activate();
- }
+ ActionGameManager.Instance.TryRequestDaemonActionBarWeaponGroup(Group, true);
}
public override void Deactivate()
{
- foreach (var weapon in Entity.WeaponGroups[Group].weapons)
- {
- weapon.Deactivate();
- }
+ ActionGameManager.Instance.TryRequestDaemonActionBarWeaponGroup(Group, false);
}
public override void Update()
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonIndirectRenderer.cs b/Assets/Scripts/Gameplay/AetheriaDaemonIndirectRenderer.cs
new file mode 100644
index 000000000..12d2e318d
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonIndirectRenderer.cs
@@ -0,0 +1,184 @@
+using System.Collections.Generic;
+using GameCult.Aetheria.State.Unity;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+public sealed class AetheriaDaemonIndirectRenderer : MonoBehaviour
+{
+ [SerializeField]
+ private AetheriaDaemonObserver observer;
+
+ [SerializeField]
+ private AetheriaDaemonRenderAssetCatalog assetCatalog;
+
+ [SerializeField]
+ private bool logMissingAssets;
+
+ [SerializeField]
+ private Camera targetCamera;
+
+ private MaterialPropertyBlock _properties;
+ private readonly Dictionary _batchesByGroupId =
+ new Dictionary();
+ private readonly HashSet _seenGroupIds = new HashSet();
+ private readonly List _staleGroupIds = new List();
+ private static readonly int MatrixBufferPropertyId =
+ Shader.PropertyToID(AetheriaDaemonRenderBuffer.MatrixBufferPropertyName);
+ private static readonly int InstanceCountPropertyId =
+ Shader.PropertyToID(AetheriaDaemonRenderBuffer.InstanceCountPropertyName);
+
+ public int LastDrawnCount { get; private set; }
+ public bool HasDrawTarget =>
+ observer != null &&
+ assetCatalog != null;
+
+ private void Reset()
+ {
+ observer = GetComponent();
+ }
+
+ private void LateUpdate()
+ {
+ DrawLatest();
+ }
+
+ public bool DrawLatest()
+ {
+ LastDrawnCount = 0;
+ if (!HasDrawTarget)
+ {
+ return false;
+ }
+
+ if (!observer.HasRenderNativeView)
+ {
+ return false;
+ }
+
+ _properties ??= new MaterialPropertyBlock();
+ var drewAny = false;
+ var index = observer.LastSoaIndex;
+ var view = observer.LastRenderNativeView;
+ _seenGroupIds.Clear();
+ foreach (var renderGroup in index.RenderGroups)
+ {
+ _seenGroupIds.Add(renderGroup.GroupId);
+ if (!assetCatalog.TryResolveMesh(renderGroup.MeshKey, out var mesh) ||
+ !assetCatalog.TryResolveMaterial(renderGroup.MaterialKey, out var material))
+ {
+ if (logMissingAssets)
+ {
+ Debug.LogWarning(
+ $"Could not resolve daemon render group {renderGroup.GroupId} " +
+ $"mesh='{renderGroup.MeshKey}' material='{renderGroup.MaterialKey}'.");
+ }
+
+ continue;
+ }
+
+ if (!_batchesByGroupId.TryGetValue(renderGroup.GroupId, out var batch))
+ {
+ batch = new AetheriaDaemonRenderGroupBatch();
+ _batchesByGroupId.Add(renderGroup.GroupId, batch);
+ }
+
+ if (batch.LastUploadedGeneration != view.Generation)
+ {
+ batch.UploadLatest(view, renderGroup, mesh, renderGroup.DefaultScale);
+ }
+
+ if (!batch.HasGpuBuffers)
+ {
+ continue;
+ }
+
+ _properties.Clear();
+ _properties.SetInt(InstanceCountPropertyId, batch.InstanceCount);
+ _properties.SetBuffer(MatrixBufferPropertyId, batch.MatrixBuffer);
+
+ Graphics.DrawMeshInstancedIndirect(
+ mesh,
+ renderGroup.SubMeshIndex,
+ material,
+ GetDrawBounds(renderGroup),
+ batch.IndirectArgsBuffer,
+ 0,
+ _properties,
+ GetShadowCastingMode(renderGroup),
+ renderGroup.ReceiveShadows,
+ renderGroup.Layer,
+ targetCamera);
+
+ LastDrawnCount += batch.InstanceCount;
+ drewAny = true;
+ }
+
+ ReleaseStaleBatches();
+ return drewAny;
+ }
+
+ private Bounds GetDrawBounds(AetheriaRuntimeDaemonRenderGroupDocument renderGroup)
+ {
+ return new Bounds(
+ new Vector3(
+ renderGroup.BoundsCenterX,
+ renderGroup.BoundsCenterY,
+ renderGroup.BoundsCenterZ),
+ new Vector3(
+ renderGroup.BoundsSizeX,
+ renderGroup.BoundsSizeY,
+ renderGroup.BoundsSizeZ));
+ }
+
+ private static ShadowCastingMode GetShadowCastingMode(AetheriaRuntimeDaemonRenderGroupDocument renderGroup)
+ {
+ switch (renderGroup.ShadowMode)
+ {
+ case AetheriaRuntimeDaemonRenderShadowModes.Off:
+ return ShadowCastingMode.Off;
+ case AetheriaRuntimeDaemonRenderShadowModes.TwoSided:
+ return ShadowCastingMode.TwoSided;
+ case AetheriaRuntimeDaemonRenderShadowModes.ShadowsOnly:
+ return ShadowCastingMode.ShadowsOnly;
+ default:
+ return ShadowCastingMode.On;
+ }
+ }
+
+ private void OnDisable()
+ {
+ foreach (var batch in _batchesByGroupId.Values)
+ {
+ batch.Dispose();
+ }
+
+ _batchesByGroupId.Clear();
+ _seenGroupIds.Clear();
+ }
+
+ private void ReleaseStaleBatches()
+ {
+ if (_batchesByGroupId.Count == _seenGroupIds.Count)
+ {
+ return;
+ }
+
+ _staleGroupIds.Clear();
+ foreach (var groupId in _batchesByGroupId.Keys)
+ {
+ if (!_seenGroupIds.Contains(groupId))
+ {
+ _staleGroupIds.Add(groupId);
+ }
+ }
+
+ for (var i = 0; i < _staleGroupIds.Count; i++)
+ {
+ var groupId = _staleGroupIds[i];
+ _batchesByGroupId[groupId].Dispose();
+ _batchesByGroupId.Remove(groupId);
+ }
+
+ _staleGroupIds.Clear();
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonIndirectRenderer.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonIndirectRenderer.cs.meta
new file mode 100644
index 000000000..325f42abb
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonIndirectRenderer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 66b38a2f45120a041941eae4412f7da1
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs b/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs
new file mode 100644
index 000000000..8f1135717
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs
@@ -0,0 +1,158 @@
+using System;
+using GameCult.Aetheria.State.Unity;
+using UnityEngine;
+
+public sealed class AetheriaDaemonObserver : MonoBehaviour
+{
+ [SerializeField]
+ private bool pollInUpdate = true;
+
+ [SerializeField]
+ private float pollIntervalSeconds = 0.05f;
+
+ [SerializeField]
+ private bool logChanges;
+
+ [SerializeField]
+ private string clientId = "unity-observer";
+
+ private readonly AetheriaRuntimeDaemonObservationCursor _cursor = new AetheriaRuntimeDaemonObservationCursor();
+ private float _nextPollTime;
+ private AetheriaRuntimeDaemonOperationClient _operationClient;
+ private AetheriaDaemonOperations _operations;
+ private AetheriaDaemonSoaMemoryMap _soaMemoryMap;
+ private AetheriaDaemonRenderNativeView _renderNativeView;
+
+ public AetheriaRuntimeObservedDaemonState LastObservedState { get; private set; }
+ public AetheriaRuntimeDaemonObservationResult LastObservation { get; private set; }
+ public long LastFrameId => _cursor.LastFrameId;
+ public long LastSoaGeneration => _cursor.LastSoaGeneration;
+ public bool HasAuthoritativeState => LastObservedState != null && LastObservedState.IsAuthoritative;
+ public bool HasSoaView => LastObservedState != null && LastObservedState.HasSoaView;
+ public AetheriaRuntimeDaemonSoaViewIndex LastSoaIndex =>
+ LastObservedState?.SoaIndex ?? AetheriaRuntimeDaemonSoaViewIndex.Empty;
+ public AetheriaDaemonSoaMemoryMap LastSoaMemoryMap => _soaMemoryMap;
+ public AetheriaDaemonRenderNativeView LastRenderNativeView => _renderNativeView;
+ public bool HasRenderNativeView => _renderNativeView.IsCreated;
+ public AetheriaDaemonOperations Operations => _operations ??= new AetheriaDaemonOperations(this);
+
+ public event Action ObservedDaemonStateChanged;
+
+ internal AetheriaRuntimeDaemonCommandEnvelope SendOperation(
+ AetheriaRuntimeDaemonCommandKinds kind,
+ Action configure = null)
+ {
+ _operationClient ??= new AetheriaRuntimeDaemonOperationClient(
+ ActionGameManager.RuntimeStateFilePath,
+ clientId,
+ LastObservedState?.Frame.SessionId ?? "local");
+
+ var command = _operationClient.Create(kind, LastObservedState);
+ configure?.Invoke(command);
+ if (!_operationClient.TrySend(command, out var envelope, out var error))
+ {
+ throw new InvalidOperationException(
+ $"Failed to submit Aetheria daemon operation {kind}: {error}");
+ }
+
+ if (logChanges)
+ {
+ Debug.Log($"Submitted Aetheria daemon operation {envelope!.Kind}: {envelope.CommandId}");
+ }
+
+ return envelope!;
+ }
+
+ private void Update()
+ {
+ if (!pollInUpdate || Time.unscaledTime < _nextPollTime)
+ {
+ return;
+ }
+
+ _nextPollTime = Time.unscaledTime + Mathf.Max(0.001f, pollIntervalSeconds);
+ Poll();
+ }
+
+ public bool Poll()
+ {
+ if (!AetheriaRuntimeStateReader.TryReadObservedDaemonState(
+ ActionGameManager.RuntimeStateFilePath,
+ out var observed))
+ {
+ LastObservation = _cursor.Observe(null);
+ return false;
+ }
+
+ var result = _cursor.Observe(observed);
+ LastObservedState = observed;
+ LastObservation = result;
+
+ if (result.SoaViewChanged)
+ {
+ RemapSoaView(observed);
+ }
+
+ if (result.Changed)
+ {
+ ObservedDaemonStateChanged?.Invoke(observed, result);
+ if (logChanges)
+ {
+ Debug.Log(
+ $"Observed Aetheria daemon frame {result.FrameId} " +
+ $"soa generation {result.SoaGeneration} authoritative={result.IsAuthoritative}");
+ }
+ }
+
+ return true;
+ }
+
+ public void ResetObservation()
+ {
+ _cursor.Reset();
+ DisposeSoaMemoryMap();
+ LastObservedState = null;
+ LastObservation = null;
+ }
+
+ private void OnDisable()
+ {
+ DisposeSoaMemoryMap();
+ }
+
+ private void RemapSoaView(AetheriaRuntimeObservedDaemonState observed)
+ {
+ DisposeSoaMemoryMap();
+ if (observed == null || !observed.HasSoaView)
+ {
+ return;
+ }
+
+ if (AetheriaDaemonSoaMemoryMap.TryOpen(observed.SoaIndex, out var map, out var error))
+ {
+ _soaMemoryMap = map;
+ if (!AetheriaDaemonRenderNativeView.TryCreate(observed.SoaIndex, map, out _renderNativeView))
+ {
+ _renderNativeView = default;
+ if (logChanges)
+ {
+ Debug.LogWarning("Mapped Aetheria daemon SoA memory, but no complete render native view was published.");
+ }
+ }
+
+ return;
+ }
+
+ if (logChanges)
+ {
+ Debug.LogWarning($"Could not map Aetheria daemon SoA view read-only: {error}");
+ }
+ }
+
+ private void DisposeSoaMemoryMap()
+ {
+ _renderNativeView = default;
+ _soaMemoryMap?.Dispose();
+ _soaMemoryMap = null;
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs.meta
new file mode 100644
index 000000000..f73ced863
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 4f5008a2876ee014fb9e442f1f6103e0
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderAssetCatalog.cs b/Assets/Scripts/Gameplay/AetheriaDaemonRenderAssetCatalog.cs
new file mode 100644
index 000000000..0fb885cfb
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderAssetCatalog.cs
@@ -0,0 +1,81 @@
+using System;
+using UnityEngine;
+
+[CreateAssetMenu(
+ fileName = "AetheriaDaemonRenderAssetCatalog",
+ menuName = "Aetheria/Daemon Render Asset Catalog")]
+public sealed class AetheriaDaemonRenderAssetCatalog : ScriptableObject
+{
+ [SerializeField]
+ private MeshEntry[] meshes = Array.Empty();
+
+ [SerializeField]
+ private MaterialEntry[] materials = Array.Empty();
+
+ public bool TryResolveMesh(string key, out Mesh mesh)
+ {
+ mesh = null;
+ if (string.IsNullOrWhiteSpace(key))
+ {
+ return false;
+ }
+
+ for (var i = 0; i < meshes.Length; i++)
+ {
+ if (string.Equals(meshes[i].Key, key, StringComparison.Ordinal))
+ {
+ mesh = meshes[i].Mesh;
+ return mesh != null;
+ }
+ }
+
+ mesh = Resources.Load(NormalizeResourceKey(key));
+ return mesh != null;
+ }
+
+ public bool TryResolveMaterial(string key, out Material material)
+ {
+ material = null;
+ if (string.IsNullOrWhiteSpace(key))
+ {
+ return false;
+ }
+
+ for (var i = 0; i < materials.Length; i++)
+ {
+ if (string.Equals(materials[i].Key, key, StringComparison.Ordinal))
+ {
+ material = materials[i].Material;
+ return material != null;
+ }
+ }
+
+ material = Resources.Load(NormalizeResourceKey(key));
+ return material != null;
+ }
+
+ private static string NormalizeResourceKey(string key)
+ {
+ const string resourcesPrefix = "resources://";
+ if (key.StartsWith(resourcesPrefix, StringComparison.OrdinalIgnoreCase))
+ {
+ return key.Substring(resourcesPrefix.Length);
+ }
+
+ return key;
+ }
+
+ [Serializable]
+ private struct MeshEntry
+ {
+ public string Key;
+ public Mesh Mesh;
+ }
+
+ [Serializable]
+ private struct MaterialEntry
+ {
+ public string Key;
+ public Material Material;
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderAssetCatalog.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonRenderAssetCatalog.cs.meta
new file mode 100644
index 000000000..f5da0d4cf
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderAssetCatalog.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8fa370b1ea2904d40ae295007ac76b48
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderBuffer.cs b/Assets/Scripts/Gameplay/AetheriaDaemonRenderBuffer.cs
new file mode 100644
index 000000000..b8a5a1150
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderBuffer.cs
@@ -0,0 +1,294 @@
+using GameCult.Aetheria.State.Unity;
+using Unity.Collections;
+using Unity.Jobs;
+using Unity.Mathematics;
+using UnityEngine;
+
+public sealed class AetheriaDaemonRenderBuffer : MonoBehaviour
+{
+ public const string MatrixBufferPropertyName = "_AetheriaObjectToWorld";
+ public const string InstanceCountPropertyName = "_AetheriaInstanceCount";
+
+ private const int MatrixStrideBytes = 64;
+ private const int DrawMeshInstancedIndirectArgsCount = 5;
+
+ [SerializeField]
+ private AetheriaDaemonObserver observer;
+
+ [SerializeField]
+ private Mesh indirectArgsMesh;
+
+ [SerializeField]
+ private int innerLoopBatchCount = 64;
+
+ [SerializeField]
+ private bool updateInLateUpdate;
+
+ private readonly uint[] _indirectArgs = new uint[DrawMeshInstancedIndirectArgsCount];
+ private NativeArray _nativeMatrices;
+ private GraphicsBuffer _matrixBuffer;
+ private GraphicsBuffer _indirectArgsBuffer;
+ private long _allocatedGeneration = long.MinValue;
+ private int _allocatedCount;
+
+ public GraphicsBuffer MatrixBuffer => _matrixBuffer;
+ public GraphicsBuffer IndirectArgsBuffer => _indirectArgsBuffer;
+ public int InstanceCount { get; private set; }
+ public long LastUploadedFrameId { get; private set; }
+ public long LastUploadedGeneration { get; private set; }
+ public bool HasRenderableView => observer != null && observer.HasRenderNativeView;
+ public bool HasGpuBuffers =>
+ _matrixBuffer != null &&
+ _matrixBuffer.IsValid() &&
+ InstanceCount > 0;
+
+ private static readonly int MatrixBufferPropertyId = Shader.PropertyToID(MatrixBufferPropertyName);
+ private static readonly int InstanceCountPropertyId = Shader.PropertyToID(InstanceCountPropertyName);
+
+ private void Reset()
+ {
+ observer = GetComponent();
+ }
+
+ private void LateUpdate()
+ {
+ if (updateInLateUpdate)
+ {
+ UploadLatest();
+ }
+ }
+
+ public bool UploadLatest()
+ {
+ return UploadLatest(indirectArgsMesh);
+ }
+
+ public bool UploadLatest(Mesh argsMesh)
+ {
+ return UploadLatest(argsMesh, -1);
+ }
+
+ public bool UploadLatest(Mesh argsMesh, int renderGroupId)
+ {
+ return UploadLatest(argsMesh, renderGroupId, 0);
+ }
+
+ public bool UploadLatest(Mesh argsMesh, int renderGroupId, int subMeshIndex)
+ {
+ if (!HasRenderableView)
+ {
+ InstanceCount = 0;
+ UpdateIndirectArgs(null, 0);
+ return false;
+ }
+
+ var view = observer.LastRenderNativeView;
+ EnsureCapacity(view);
+ if (!_nativeMatrices.IsCreated || _nativeMatrices.Length == 0)
+ {
+ InstanceCount = 0;
+ UpdateIndirectArgs(argsMesh, 0);
+ return false;
+ }
+
+ var index = observer.LastSoaIndex;
+ var defaultScale = ResolveDefaultScale(index, renderGroupId);
+ var renderLod = ResolveRenderLod(index, renderGroupId);
+ var count = renderGroupId >= 0 && view.HasRenderGroupId
+ ? BuildRenderGroupMatrices(view, renderGroupId, renderLod, defaultScale)
+ : BuildAllMatrices(view, renderLod, defaultScale);
+
+ _matrixBuffer.SetData(_nativeMatrices, 0, 0, count);
+ InstanceCount = count;
+ LastUploadedFrameId = view.FrameId;
+ LastUploadedGeneration = view.Generation;
+ UpdateIndirectArgs(argsMesh, count, subMeshIndex);
+ return true;
+ }
+
+ private int BuildAllMatrices(AetheriaDaemonRenderNativeView view, int renderLod, float defaultScale)
+ {
+ if (view.HasRenderVisibility || renderLod >= 0)
+ {
+ return BuildCompactedMatrices(view, -1, renderLod, defaultScale);
+ }
+
+ var count = math.min(view.Count, _nativeMatrices.Length);
+ var handle = view.ScheduleBuildRenderMatrices(
+ _nativeMatrices,
+ defaultScale,
+ innerLoopBatchCount);
+ handle.Complete();
+ return count;
+ }
+
+ private int BuildRenderGroupMatrices(
+ AetheriaDaemonRenderNativeView view,
+ int renderGroupId,
+ int renderLod,
+ float defaultScale)
+ {
+ return BuildCompactedMatrices(view, renderGroupId, renderLod, defaultScale);
+ }
+
+ private int BuildCompactedMatrices(
+ AetheriaDaemonRenderNativeView view,
+ int renderGroupId,
+ int renderLod,
+ float defaultScale)
+ {
+ using var writtenCount = new NativeArray(1, Allocator.TempJob);
+ var job = new AetheriaDaemonRenderGroupMatrixJob
+ {
+ PositionX = view.PositionX,
+ PositionY = view.PositionY,
+ PositionZ = view.PositionZ,
+ RotationRadians = view.RotationRadians,
+ PhysicsBodyRadius = view.PhysicsBodyRadius,
+ RenderScale = view.RenderScale,
+ RenderVisibility = view.RenderVisibility,
+ RenderLod = view.RenderLod,
+ RenderGroupId = view.RenderGroupId,
+ Matrices = _nativeMatrices,
+ WrittenCount = writtenCount,
+ TargetRenderGroupId = renderGroupId >= 0 ? (uint)renderGroupId : 0,
+ TargetRenderLod = renderLod,
+ HasRotation = view.HasRotation,
+ HasPhysicsRadius = view.HasPhysicsRadius,
+ HasRenderScale = view.HasRenderScale,
+ HasRenderVisibility = view.HasRenderVisibility,
+ HasRenderLod = view.HasRenderLod,
+ HasRenderGroupFilter = renderGroupId >= 0,
+ HasRenderLodFilter = renderLod >= 0,
+ UniformScale = defaultScale
+ };
+
+ job.Schedule().Complete();
+ return math.clamp(writtenCount[0], 0, _nativeMatrices.Length);
+ }
+
+ private static float ResolveDefaultScale(AetheriaRuntimeDaemonSoaViewIndex index, int renderGroupId)
+ {
+ if (index != null &&
+ renderGroupId >= 0 &&
+ index.TryGetRenderGroup(renderGroupId, out var renderGroup))
+ {
+ return math.max(renderGroup.DefaultScale, 0.0001f);
+ }
+
+ var renderGroups = index?.RenderGroups;
+ if (renderGroups != null && renderGroups.Count == 1)
+ {
+ return math.max(renderGroups[0].DefaultScale, 0.0001f);
+ }
+
+ return 1.0f;
+ }
+
+ private static int ResolveRenderLod(AetheriaRuntimeDaemonSoaViewIndex index, int renderGroupId)
+ {
+ if (index != null &&
+ renderGroupId >= 0 &&
+ index.TryGetRenderGroup(renderGroupId, out var renderGroup))
+ {
+ return renderGroup.Lod;
+ }
+
+ var renderGroups = index?.RenderGroups;
+ if (renderGroups != null && renderGroups.Count == 1)
+ {
+ return renderGroups[0].Lod;
+ }
+
+ return -1;
+ }
+
+ public void ApplyTo(MaterialPropertyBlock properties)
+ {
+ if (properties == null)
+ {
+ return;
+ }
+
+ properties.SetInt(InstanceCountPropertyId, InstanceCount);
+ if (HasGpuBuffers)
+ {
+ properties.SetBuffer(MatrixBufferPropertyId, _matrixBuffer);
+ }
+ }
+
+ private void OnDisable()
+ {
+ ReleaseBuffers();
+ InstanceCount = 0;
+ LastUploadedFrameId = 0;
+ LastUploadedGeneration = 0;
+ }
+
+ private void EnsureCapacity(AetheriaDaemonRenderNativeView view)
+ {
+ var count = math.max(0, view.Count);
+ if (_nativeMatrices.IsCreated &&
+ _allocatedGeneration == view.Generation &&
+ _allocatedCount == count)
+ {
+ return;
+ }
+
+ ReleaseBuffers();
+ _allocatedGeneration = view.Generation;
+ _allocatedCount = count;
+ if (count <= 0)
+ {
+ return;
+ }
+
+ _nativeMatrices = new NativeArray(
+ count,
+ Allocator.Persistent,
+ NativeArrayOptions.UninitializedMemory);
+ _matrixBuffer = new GraphicsBuffer(GraphicsBuffer.Target.Structured, count, MatrixStrideBytes);
+ _indirectArgsBuffer = new GraphicsBuffer(
+ GraphicsBuffer.Target.IndirectArguments,
+ DrawMeshInstancedIndirectArgsCount,
+ sizeof(uint));
+ }
+
+ private void UpdateIndirectArgs(Mesh mesh, int instanceCount)
+ {
+ UpdateIndirectArgs(mesh, instanceCount, 0);
+ }
+
+ private void UpdateIndirectArgs(Mesh mesh, int instanceCount, int subMeshIndex)
+ {
+ if (_indirectArgsBuffer == null || !_indirectArgsBuffer.IsValid())
+ {
+ return;
+ }
+
+ var safeSubMeshIndex = mesh != null
+ ? math.clamp(subMeshIndex, 0, math.max(0, mesh.subMeshCount - 1))
+ : 0;
+ _indirectArgs[0] = mesh != null ? mesh.GetIndexCount(safeSubMeshIndex) : 0;
+ _indirectArgs[1] = (uint)math.max(0, instanceCount);
+ _indirectArgs[2] = mesh != null ? mesh.GetIndexStart(safeSubMeshIndex) : 0;
+ _indirectArgs[3] = mesh != null ? mesh.GetBaseVertex(safeSubMeshIndex) : 0;
+ _indirectArgs[4] = 0;
+ _indirectArgsBuffer.SetData(_indirectArgs);
+ }
+
+ private void ReleaseBuffers()
+ {
+ if (_nativeMatrices.IsCreated)
+ {
+ _nativeMatrices.Dispose();
+ }
+
+ _matrixBuffer?.Release();
+ _matrixBuffer = null;
+ _indirectArgsBuffer?.Release();
+ _indirectArgsBuffer = null;
+ _allocatedGeneration = long.MinValue;
+ _allocatedCount = 0;
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderBuffer.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonRenderBuffer.cs.meta
new file mode 100644
index 000000000..5fe14c6d3
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderBuffer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9cba277ef259bee438796ab4c0f3df64
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupBatch.cs b/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupBatch.cs
new file mode 100644
index 000000000..37709c7da
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupBatch.cs
@@ -0,0 +1,177 @@
+using System;
+using GameCult.Aetheria.State.Unity;
+using Unity.Collections;
+using Unity.Jobs;
+using Unity.Mathematics;
+using UnityEngine;
+
+public sealed class AetheriaDaemonRenderGroupBatch : IDisposable
+{
+ private const int MatrixStrideBytes = 64;
+ private const int DrawMeshInstancedIndirectArgsCount = 5;
+
+ private readonly uint[] _indirectArgs = new uint[DrawMeshInstancedIndirectArgsCount];
+ private NativeArray _nativeMatrices;
+ private GraphicsBuffer _matrixBuffer;
+ private GraphicsBuffer _indirectArgsBuffer;
+ private int _capacity;
+
+ public int GroupId { get; private set; }
+ public int InstanceCount { get; private set; }
+ public long LastUploadedFrameId { get; private set; }
+ public long LastUploadedGeneration { get; private set; }
+ public GraphicsBuffer MatrixBuffer => _matrixBuffer;
+ public GraphicsBuffer IndirectArgsBuffer => _indirectArgsBuffer;
+ public bool HasGpuBuffers =>
+ _matrixBuffer != null &&
+ _matrixBuffer.IsValid() &&
+ _indirectArgsBuffer != null &&
+ _indirectArgsBuffer.IsValid() &&
+ InstanceCount > 0;
+
+ public bool UploadLatest(
+ AetheriaDaemonRenderNativeView view,
+ AetheriaRuntimeDaemonRenderGroupDocument renderGroup,
+ Mesh mesh,
+ float uniformScale)
+ {
+ if (!view.IsCreated || mesh == null)
+ {
+ InstanceCount = 0;
+ UpdateIndirectArgs(mesh, 0, renderGroup?.SubMeshIndex ?? 0);
+ return false;
+ }
+
+ var targetCapacity = renderGroup.InstanceCount >= 0
+ ? math.min(renderGroup.InstanceCount, view.Count)
+ : view.Count;
+ EnsureCapacity(targetCapacity);
+ if (!_nativeMatrices.IsCreated || _nativeMatrices.Length == 0)
+ {
+ InstanceCount = 0;
+ UpdateIndirectArgs(mesh, 0, renderGroup.SubMeshIndex);
+ return false;
+ }
+
+ var count = view.HasRenderGroupId
+ ? BuildRenderGroupMatrices(view, renderGroup.GroupId, renderGroup.Lod, uniformScale)
+ : BuildAllMatrices(view, renderGroup.Lod, uniformScale);
+
+ _matrixBuffer.SetData(_nativeMatrices, 0, 0, count);
+ GroupId = renderGroup.GroupId;
+ InstanceCount = count;
+ LastUploadedFrameId = view.FrameId;
+ LastUploadedGeneration = view.Generation;
+ UpdateIndirectArgs(mesh, count, renderGroup.SubMeshIndex);
+ return count > 0;
+ }
+
+ public void Dispose()
+ {
+ if (_nativeMatrices.IsCreated)
+ {
+ _nativeMatrices.Dispose();
+ }
+
+ _matrixBuffer?.Release();
+ _matrixBuffer = null;
+ _indirectArgsBuffer?.Release();
+ _indirectArgsBuffer = null;
+ _capacity = 0;
+ InstanceCount = 0;
+ }
+
+ private int BuildAllMatrices(AetheriaDaemonRenderNativeView view, int renderLod, float uniformScale)
+ {
+ return BuildCompactedMatrices(view, -1, renderLod, uniformScale);
+ }
+
+ private int BuildRenderGroupMatrices(
+ AetheriaDaemonRenderNativeView view,
+ int renderGroupId,
+ int renderLod,
+ float uniformScale)
+ {
+ return BuildCompactedMatrices(view, renderGroupId, renderLod, uniformScale);
+ }
+
+ private int BuildCompactedMatrices(
+ AetheriaDaemonRenderNativeView view,
+ int renderGroupId,
+ int renderLod,
+ float uniformScale)
+ {
+ using var writtenCount = new NativeArray(1, Allocator.TempJob);
+ var job = new AetheriaDaemonRenderGroupMatrixJob
+ {
+ PositionX = view.PositionX,
+ PositionY = view.PositionY,
+ PositionZ = view.PositionZ,
+ RotationRadians = view.RotationRadians,
+ PhysicsBodyRadius = view.PhysicsBodyRadius,
+ RenderScale = view.RenderScale,
+ RenderVisibility = view.RenderVisibility,
+ RenderLod = view.RenderLod,
+ RenderGroupId = view.RenderGroupId,
+ Matrices = _nativeMatrices,
+ WrittenCount = writtenCount,
+ TargetRenderGroupId = renderGroupId >= 0 ? (uint)renderGroupId : 0,
+ TargetRenderLod = renderLod,
+ HasRotation = view.HasRotation,
+ HasPhysicsRadius = view.HasPhysicsRadius,
+ HasRenderScale = view.HasRenderScale,
+ HasRenderVisibility = view.HasRenderVisibility,
+ HasRenderLod = view.HasRenderLod,
+ HasRenderGroupFilter = renderGroupId >= 0,
+ HasRenderLodFilter = renderLod >= 0,
+ UniformScale = uniformScale
+ };
+
+ job.Schedule().Complete();
+ return math.clamp(writtenCount[0], 0, _nativeMatrices.Length);
+ }
+
+ private void EnsureCapacity(int capacity)
+ {
+ capacity = math.max(0, capacity);
+ if (_nativeMatrices.IsCreated && _capacity == capacity)
+ {
+ return;
+ }
+
+ Dispose();
+ _capacity = capacity;
+ if (capacity <= 0)
+ {
+ return;
+ }
+
+ _nativeMatrices = new NativeArray(
+ capacity,
+ Allocator.Persistent,
+ NativeArrayOptions.UninitializedMemory);
+ _matrixBuffer = new GraphicsBuffer(GraphicsBuffer.Target.Structured, capacity, MatrixStrideBytes);
+ _indirectArgsBuffer = new GraphicsBuffer(
+ GraphicsBuffer.Target.IndirectArguments,
+ DrawMeshInstancedIndirectArgsCount,
+ sizeof(uint));
+ }
+
+ private void UpdateIndirectArgs(Mesh mesh, int instanceCount, int subMeshIndex)
+ {
+ if (_indirectArgsBuffer == null || !_indirectArgsBuffer.IsValid())
+ {
+ return;
+ }
+
+ var safeSubMeshIndex = mesh != null
+ ? math.clamp(subMeshIndex, 0, math.max(0, mesh.subMeshCount - 1))
+ : 0;
+ _indirectArgs[0] = mesh != null ? mesh.GetIndexCount(safeSubMeshIndex) : 0;
+ _indirectArgs[1] = (uint)math.max(0, instanceCount);
+ _indirectArgs[2] = mesh != null ? mesh.GetIndexStart(safeSubMeshIndex) : 0;
+ _indirectArgs[3] = mesh != null ? mesh.GetBaseVertex(safeSubMeshIndex) : 0;
+ _indirectArgs[4] = 0;
+ _indirectArgsBuffer.SetData(_indirectArgs);
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupBatch.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupBatch.cs.meta
new file mode 100644
index 000000000..315a65f8d
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupBatch.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0038a222765ff82468c22a516cfcdbc1
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupMatrixJob.cs b/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupMatrixJob.cs
new file mode 100644
index 000000000..7f93630f1
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupMatrixJob.cs
@@ -0,0 +1,92 @@
+using Unity.Burst;
+using Unity.Collections;
+using Unity.Jobs;
+using Unity.Mathematics;
+
+[BurstCompile]
+public struct AetheriaDaemonRenderGroupMatrixJob : IJob
+{
+ [ReadOnly]
+ public NativeArray PositionX;
+
+ [ReadOnly]
+ public NativeArray PositionY;
+
+ [ReadOnly]
+ public NativeArray PositionZ;
+
+ [ReadOnly]
+ public NativeArray RotationRadians;
+
+ [ReadOnly]
+ public NativeArray PhysicsBodyRadius;
+
+ [ReadOnly]
+ public NativeArray RenderScale;
+
+ [ReadOnly]
+ public NativeArray RenderVisibility;
+
+ [ReadOnly]
+ public NativeArray RenderLod;
+
+ [ReadOnly]
+ public NativeArray RenderGroupId;
+
+ [WriteOnly]
+ public NativeArray Matrices;
+
+ public NativeArray WrittenCount;
+ public uint TargetRenderGroupId;
+ public int TargetRenderLod;
+ public bool HasRotation;
+ public bool HasPhysicsRadius;
+ public bool HasRenderScale;
+ public bool HasRenderVisibility;
+ public bool HasRenderLod;
+ public bool HasRenderGroupFilter;
+ public bool HasRenderLodFilter;
+ public float UniformScale;
+
+ public void Execute()
+ {
+ var written = 0;
+ for (var index = 0; index < PositionX.Length; index++)
+ {
+ if (HasRenderGroupFilter && RenderGroupId[index] != TargetRenderGroupId)
+ {
+ continue;
+ }
+
+ if (HasRenderVisibility && RenderVisibility[index] == 0)
+ {
+ continue;
+ }
+
+ if (HasRenderLodFilter && (!HasRenderLod || RenderLod[index] != TargetRenderLod))
+ {
+ continue;
+ }
+
+ if (written >= Matrices.Length)
+ {
+ break;
+ }
+
+ var position = new float3(PositionX[index], PositionY[index], PositionZ[index]);
+ var rotation = HasRotation
+ ? quaternion.RotateY(RotationRadians[index])
+ : quaternion.identity;
+ var scaleValue = HasRenderScale
+ ? math.max(RenderScale[index], 0.0001f)
+ : HasPhysicsRadius
+ ? math.max(PhysicsBodyRadius[index] * 2.0f, 0.0001f)
+ : math.max(UniformScale, 0.0001f);
+
+ Matrices[written] = float4x4.TRS(position, rotation, new float3(scaleValue));
+ written++;
+ }
+
+ WrittenCount[0] = written;
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupMatrixJob.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupMatrixJob.cs.meta
new file mode 100644
index 000000000..eb679bf07
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderGroupMatrixJob.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 146aa8d6d00cc1a44b44a5f83d69edea
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderMatrixJob.cs b/Assets/Scripts/Gameplay/AetheriaDaemonRenderMatrixJob.cs
new file mode 100644
index 000000000..4f55a4652
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderMatrixJob.cs
@@ -0,0 +1,49 @@
+using Unity.Burst;
+using Unity.Collections;
+using Unity.Jobs;
+using Unity.Mathematics;
+
+[BurstCompile]
+public struct AetheriaDaemonRenderMatrixJob : IJobParallelFor
+{
+ [ReadOnly]
+ public NativeArray PositionX;
+
+ [ReadOnly]
+ public NativeArray PositionY;
+
+ [ReadOnly]
+ public NativeArray PositionZ;
+
+ [ReadOnly]
+ public NativeArray RotationRadians;
+
+ [ReadOnly]
+ public NativeArray PhysicsBodyRadius;
+
+ [ReadOnly]
+ public NativeArray RenderScale;
+
+ [WriteOnly]
+ public NativeArray Matrices;
+
+ public bool HasRotation;
+ public bool HasPhysicsRadius;
+ public bool HasRenderScale;
+ public float UniformScale;
+
+ public void Execute(int index)
+ {
+ var position = new float3(PositionX[index], PositionY[index], PositionZ[index]);
+ var rotation = HasRotation
+ ? quaternion.RotateY(RotationRadians[index])
+ : quaternion.identity;
+ var scaleValue = HasRenderScale
+ ? math.max(RenderScale[index], 0.0001f)
+ : HasPhysicsRadius
+ ? math.max(PhysicsBodyRadius[index] * 2.0f, 0.0001f)
+ : math.max(UniformScale, 0.0001f);
+
+ Matrices[index] = float4x4.TRS(position, rotation, new float3(scaleValue));
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderMatrixJob.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonRenderMatrixJob.cs.meta
new file mode 100644
index 000000000..d1f3e8d30
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderMatrixJob.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f6b3b3dc2e2a29245a24b772e2cb87b4
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderNativeView.cs b/Assets/Scripts/Gameplay/AetheriaDaemonRenderNativeView.cs
new file mode 100644
index 000000000..64ce7fad2
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderNativeView.cs
@@ -0,0 +1,248 @@
+using GameCult.Aetheria.State.Unity;
+using Unity.Collections;
+using Unity.Jobs;
+using Unity.Mathematics;
+
+public struct AetheriaDaemonRenderNativeView
+{
+ public long FrameId;
+ public long Generation;
+ public int Count;
+ public NativeArray PositionX;
+ public NativeArray PositionY;
+ public NativeArray PositionZ;
+ public NativeArray RotationRadians;
+ public NativeArray VelocityX;
+ public NativeArray VelocityY;
+ public NativeArray VelocityZ;
+ public NativeArray PhysicsBodyRadius;
+ public NativeArray PhysicsBodyMass;
+ public NativeArray PhysicsBodyInverseMass;
+ public NativeArray RenderScale;
+ public NativeArray RenderVisibility;
+ public NativeArray RenderLod;
+ public NativeArray RenderGroupId;
+
+ public bool IsCreated =>
+ Count > 0 &&
+ PositionX.IsCreated &&
+ PositionY.IsCreated &&
+ PositionZ.IsCreated;
+
+ public bool HasRotation => RotationRadians.IsCreated;
+ public bool HasVelocity => VelocityX.IsCreated && VelocityY.IsCreated && VelocityZ.IsCreated;
+ public bool HasPhysicsRadius => PhysicsBodyRadius.IsCreated;
+ public bool HasPhysicsMass => PhysicsBodyMass.IsCreated;
+ public bool HasPhysicsInverseMass => PhysicsBodyInverseMass.IsCreated;
+ public bool HasRenderScale => RenderScale.IsCreated;
+ public bool HasRenderVisibility => RenderVisibility.IsCreated;
+ public bool HasRenderLod => RenderLod.IsCreated;
+ public bool HasRenderGroupId => RenderGroupId.IsCreated;
+
+ public JobHandle ScheduleBuildRenderMatrices(
+ NativeArray matrices,
+ float uniformScale = 1.0f,
+ int innerLoopBatchCount = 64,
+ JobHandle dependsOn = default)
+ {
+ if (!IsCreated)
+ {
+ return dependsOn;
+ }
+
+ var count = math.min(Count, matrices.IsCreated ? matrices.Length : 0);
+ if (count <= 0)
+ {
+ return dependsOn;
+ }
+
+ var job = new AetheriaDaemonRenderMatrixJob
+ {
+ PositionX = PositionX,
+ PositionY = PositionY,
+ PositionZ = PositionZ,
+ RotationRadians = RotationRadians,
+ PhysicsBodyRadius = PhysicsBodyRadius,
+ RenderScale = RenderScale,
+ Matrices = matrices,
+ HasRotation = HasRotation,
+ HasPhysicsRadius = HasPhysicsRadius,
+ HasRenderScale = HasRenderScale,
+ UniformScale = uniformScale
+ };
+
+ return job.Schedule(count, math.max(1, innerLoopBatchCount), dependsOn);
+ }
+
+ public static bool TryCreate(
+ AetheriaRuntimeDaemonSoaViewIndex index,
+ AetheriaDaemonSoaMemoryMap map,
+ out AetheriaDaemonRenderNativeView view)
+ {
+ view = default;
+ if (index == null || map == null)
+ {
+ return false;
+ }
+
+ if (!map.TryCreateFirstNativeArrayOfKind(
+ index,
+ AetheriaRuntimeDaemonSoaColumnKinds.PositionX,
+ out view.PositionX) ||
+ !map.TryCreateFirstNativeArrayOfKind(
+ index,
+ AetheriaRuntimeDaemonSoaColumnKinds.PositionY,
+ out view.PositionY) ||
+ !map.TryCreateFirstNativeArrayOfKind(
+ index,
+ AetheriaRuntimeDaemonSoaColumnKinds.PositionZ,
+ out view.PositionZ))
+ {
+ view = default;
+ return false;
+ }
+
+ view.Count = view.PositionX.Length;
+ if (view.PositionY.Length != view.Count || view.PositionZ.Length != view.Count)
+ {
+ view = default;
+ return false;
+ }
+
+ TryAssignOptionalColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.RotationRadians, view.Count, out view.RotationRadians);
+ TryAssignOptionalColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.VelocityX, view.Count, out view.VelocityX);
+ TryAssignOptionalColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.VelocityY, view.Count, out view.VelocityY);
+ TryAssignOptionalColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.VelocityZ, view.Count, out view.VelocityZ);
+ TryAssignOptionalColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.PhysicsBodyRadius, view.Count, out view.PhysicsBodyRadius);
+ TryAssignOptionalColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.PhysicsBodyMass, view.Count, out view.PhysicsBodyMass);
+ TryAssignOptionalColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.PhysicsBodyInverseMass, view.Count, out view.PhysicsBodyInverseMass);
+ TryAssignOptionalColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.RenderScale, view.Count, out view.RenderScale);
+ TryAssignOptionalByteColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.RenderVisibility, view.Count, out view.RenderVisibility);
+ TryAssignOptionalIntColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.RenderLod, view.Count, out view.RenderLod);
+ TryAssignOptionalUIntColumn(index, map, AetheriaRuntimeDaemonSoaColumnKinds.RenderGroupId, view.Count, out view.RenderGroupId);
+
+ if ((view.VelocityX.IsCreated || view.VelocityY.IsCreated || view.VelocityZ.IsCreated) &&
+ !view.HasVelocity)
+ {
+ view.VelocityX = default;
+ view.VelocityY = default;
+ view.VelocityZ = default;
+ }
+
+ view.FrameId = index.View.FrameId;
+ view.Generation = index.View.Generation;
+ return true;
+ }
+
+ private static bool TryAssignOptionalColumn(
+ AetheriaRuntimeDaemonSoaViewIndex index,
+ AetheriaDaemonSoaMemoryMap map,
+ string kind,
+ int expectedCount,
+ out NativeArray array)
+ {
+ array = default;
+ if (!index.TryGetFirstColumnOfKind(kind, out _))
+ {
+ return false;
+ }
+
+ if (!map.TryCreateFirstNativeArrayOfKind(index, kind, out array))
+ {
+ array = default;
+ return false;
+ }
+
+ if (array.Length == expectedCount)
+ {
+ return true;
+ }
+
+ array = default;
+ return false;
+ }
+
+ private static bool TryAssignOptionalUIntColumn(
+ AetheriaRuntimeDaemonSoaViewIndex index,
+ AetheriaDaemonSoaMemoryMap map,
+ string kind,
+ int expectedCount,
+ out NativeArray array)
+ {
+ array = default;
+ if (!index.TryGetFirstColumnOfKind(kind, out _))
+ {
+ return false;
+ }
+
+ if (!map.TryCreateFirstNativeArrayOfKind(index, kind, out array))
+ {
+ array = default;
+ return false;
+ }
+
+ if (array.Length == expectedCount)
+ {
+ return true;
+ }
+
+ array = default;
+ return false;
+ }
+
+ private static bool TryAssignOptionalIntColumn(
+ AetheriaRuntimeDaemonSoaViewIndex index,
+ AetheriaDaemonSoaMemoryMap map,
+ string kind,
+ int expectedCount,
+ out NativeArray array)
+ {
+ array = default;
+ if (!index.TryGetFirstColumnOfKind(kind, out _))
+ {
+ return false;
+ }
+
+ if (!map.TryCreateFirstNativeArrayOfKind(index, kind, out array))
+ {
+ array = default;
+ return false;
+ }
+
+ if (array.Length == expectedCount)
+ {
+ return true;
+ }
+
+ array = default;
+ return false;
+ }
+
+ private static bool TryAssignOptionalByteColumn(
+ AetheriaRuntimeDaemonSoaViewIndex index,
+ AetheriaDaemonSoaMemoryMap map,
+ string kind,
+ int expectedCount,
+ out NativeArray array)
+ {
+ array = default;
+ if (!index.TryGetFirstColumnOfKind(kind, out _))
+ {
+ return false;
+ }
+
+ if (!map.TryCreateFirstNativeArrayOfKind(index, kind, out array))
+ {
+ array = default;
+ return false;
+ }
+
+ if (array.Length == expectedCount)
+ {
+ return true;
+ }
+
+ array = default;
+ return false;
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonRenderNativeView.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonRenderNativeView.cs.meta
new file mode 100644
index 000000000..70217db9e
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonRenderNativeView.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 48740dbd37e79954ca00a3f6bd7ccef1
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonSoaMemoryMap.cs b/Assets/Scripts/Gameplay/AetheriaDaemonSoaMemoryMap.cs
new file mode 100644
index 000000000..e84b14bdf
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonSoaMemoryMap.cs
@@ -0,0 +1,220 @@
+using System;
+using System.Collections.Generic;
+using System.IO.MemoryMappedFiles;
+using GameCult.Aetheria.State.Unity;
+using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
+
+public unsafe sealed class AetheriaDaemonSoaMemoryMap : IDisposable
+{
+ private readonly Dictionary _buffersById =
+ new Dictionary(StringComparer.Ordinal);
+
+#if ENABLE_UNITY_COLLECTIONS_CHECKS
+ private readonly List _safetyHandles = new List();
+#endif
+
+ private bool _disposed;
+
+ private AetheriaDaemonSoaMemoryMap()
+ {
+ }
+
+ public static bool TryOpen(
+ AetheriaRuntimeDaemonSoaViewIndex index,
+ out AetheriaDaemonSoaMemoryMap map,
+ out string error)
+ {
+ map = null;
+ error = "";
+
+ if (index == null)
+ {
+ error = "No daemon SoA view index was provided.";
+ return false;
+ }
+
+ if (!index.IsValid)
+ {
+ error = index.ValidationErrors.Count > 0
+ ? index.ValidationErrors[0]
+ : "Daemon SoA view index is invalid.";
+ return false;
+ }
+
+ var opened = new AetheriaDaemonSoaMemoryMap();
+ try
+ {
+ foreach (var buffer in index.View.Buffers)
+ {
+ if (!IsMappableReadOnlyBuffer(buffer))
+ {
+ continue;
+ }
+
+ opened.OpenBuffer(buffer);
+ }
+
+ map = opened;
+ return true;
+ }
+ catch (Exception exception)
+ {
+ opened.Dispose();
+ error = exception.Message;
+ return false;
+ }
+ }
+
+ public bool TryCreateNativeArray(
+ AetheriaRuntimeDaemonSoaColumnBinding binding,
+ out NativeArray array)
+ where T : struct
+ {
+ ThrowIfDisposed();
+ array = default;
+
+ if (binding == null ||
+ !binding.DirectMemoryCompatible ||
+ !_buffersById.TryGetValue(binding.Buffer.BufferId, out var buffer))
+ {
+ return false;
+ }
+
+ var byteOffset = checked((ulong)binding.AbsoluteByteOffset);
+ var byteLength = checked((ulong)Math.Max(0, binding.ByteLength));
+ if (byteOffset + byteLength > buffer.ByteLength)
+ {
+ return false;
+ }
+
+ var pointer = buffer.Pointer + byteOffset;
+ array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray(
+ pointer,
+ binding.Column.ElementCount,
+ Allocator.None);
+
+#if ENABLE_UNITY_COLLECTIONS_CHECKS
+ var safetyHandle = AtomicSafetyHandle.Create();
+ _safetyHandles.Add(safetyHandle);
+ NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, safetyHandle);
+#endif
+
+ return true;
+ }
+
+ public bool TryCreateFirstNativeArrayOfKind(
+ AetheriaRuntimeDaemonSoaViewIndex index,
+ string kind,
+ out NativeArray array)
+ where T : struct
+ {
+ ThrowIfDisposed();
+ array = default;
+
+ if (index == null || !index.TryGetFirstColumnOfKind(kind, out var binding))
+ {
+ return false;
+ }
+
+ return TryCreateNativeArray(binding, out array);
+ }
+
+ public void Dispose()
+ {
+ if (_disposed)
+ {
+ return;
+ }
+
+#if ENABLE_UNITY_COLLECTIONS_CHECKS
+ for (var i = 0; i < _safetyHandles.Count; i++)
+ {
+ AtomicSafetyHandle.Release(_safetyHandles[i]);
+ }
+
+ _safetyHandles.Clear();
+#endif
+
+ foreach (var buffer in _buffersById.Values)
+ {
+ buffer.Dispose();
+ }
+
+ _buffersById.Clear();
+ _disposed = true;
+ }
+
+ private void OpenBuffer(AetheriaRuntimeDaemonSoaBufferDocument buffer)
+ {
+ if (string.IsNullOrWhiteSpace(buffer.BufferId) ||
+ _buffersById.ContainsKey(buffer.BufferId))
+ {
+ return;
+ }
+
+ var byteLength = checked((ulong)(buffer.ByteOffset + buffer.ByteLength));
+ var memoryMappedFile = MemoryMappedFile.OpenExisting(
+ buffer.Location,
+ MemoryMappedFileRights.Read);
+ var accessor = memoryMappedFile.CreateViewAccessor(0, (long)byteLength, MemoryMappedFileAccess.Read);
+
+ byte* pointer = null;
+ accessor.SafeMemoryMappedViewHandle.AcquirePointer(ref pointer);
+
+ _buffersById.Add(
+ buffer.BufferId,
+ new MappedBuffer(memoryMappedFile, accessor, pointer, byteLength));
+ }
+
+ private static bool IsMappableReadOnlyBuffer(AetheriaRuntimeDaemonSoaBufferDocument buffer)
+ {
+ return buffer != null &&
+ !buffer.ObserverWritable &&
+ !string.IsNullOrWhiteSpace(buffer.Location) &&
+ string.Equals(buffer.Backend, AetheriaRuntimeDaemonSoaBackends.MemoryMappedFile, StringComparison.Ordinal);
+ }
+
+ private void ThrowIfDisposed()
+ {
+ if (_disposed)
+ {
+ throw new ObjectDisposedException(nameof(AetheriaDaemonSoaMemoryMap));
+ }
+ }
+
+ private sealed class MappedBuffer : IDisposable
+ {
+ private readonly MemoryMappedFile _memoryMappedFile;
+ private readonly MemoryMappedViewAccessor _accessor;
+ private bool _disposed;
+
+ public MappedBuffer(
+ MemoryMappedFile memoryMappedFile,
+ MemoryMappedViewAccessor accessor,
+ byte* pointer,
+ ulong byteLength)
+ {
+ _memoryMappedFile = memoryMappedFile;
+ _accessor = accessor;
+ Pointer = pointer;
+ ByteLength = byteLength;
+ }
+
+ public byte* Pointer { get; }
+ public ulong ByteLength { get; }
+
+ public void Dispose()
+ {
+ if (_disposed)
+ {
+ return;
+ }
+
+ _accessor.SafeMemoryMappedViewHandle.ReleasePointer();
+ _accessor.Dispose();
+ _memoryMappedFile.Dispose();
+ _disposed = true;
+ }
+ }
+}
diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonSoaMemoryMap.cs.meta b/Assets/Scripts/Gameplay/AetheriaDaemonSoaMemoryMap.cs.meta
new file mode 100644
index 000000000..83080b339
--- /dev/null
+++ b/Assets/Scripts/Gameplay/AetheriaDaemonSoaMemoryMap.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d8988c7d796df504dab64fd2c64eb868
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/ArticulationPoint.cs b/Assets/Scripts/Gameplay/ArticulationPoint.cs
index ba9b43c07..f922ef760 100644
--- a/Assets/Scripts/Gameplay/ArticulationPoint.cs
+++ b/Assets/Scripts/Gameplay/ArticulationPoint.cs
@@ -1,15 +1,11 @@
-using System.Collections;
-using System.Collections.Generic;
using UnityEngine;
-using Unity.Mathematics;
-using static Unity.Mathematics.math;
public class ArticulationPoint : MonoBehaviour
{
public Transform Target;
public int Group;
-
+
public float YawMin;
public float YawMax;
@@ -26,26 +22,26 @@ public class ArticulationPoint : MonoBehaviour
if (Target)
{
var targetLocal = transform.InverseTransformPoint(Target.position);
-
+
var yaw = Vector2.SignedAngle(new Vector2(0, 1), new Vector2(targetLocal.x, targetLocal.z));
var pitch = Vector2.SignedAngle(new Vector2(1, 0), new Vector2(targetLocal.z, targetLocal.y));
- var targetYaw = clamp(_yaw - yaw, YawMin, YawMax);
- var targetPitch = clamp(_pitch - pitch, PitchMin, PitchMax);
+ var targetYaw = Mathf.Clamp(_yaw - yaw, YawMin, YawMax);
+ var targetPitch = Mathf.Clamp(_pitch - pitch, PitchMin, PitchMax);
- if (abs(targetYaw - _yaw) < Speed * Time.deltaTime)
+ if (Mathf.Abs(targetYaw - _yaw) < Speed * Time.deltaTime)
_yaw = targetYaw;
- else _yaw = _yaw + sign(targetYaw - _yaw) * Speed * Time.deltaTime;
+ else _yaw = _yaw + Mathf.Sign(targetYaw - _yaw) * Speed * Time.deltaTime;
- if(_yaw < -360)
+ if (_yaw < -360)
_yaw += 360;
- if(_yaw > 360)
+ if (_yaw > 360)
_yaw -= 360;
- if (abs(targetPitch - _pitch) < Speed * Time.deltaTime)
+ if (Mathf.Abs(targetPitch - _pitch) < Speed * Time.deltaTime)
_pitch = targetPitch;
- else _pitch = _pitch + sign(targetPitch - _pitch) * Speed * Time.deltaTime;
-
+ else _pitch = _pitch + Mathf.Sign(targetPitch - _pitch) * Speed * Time.deltaTime;
+
transform.localRotation = Quaternion.Euler(_pitch, _yaw, 0);
}
}
diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs
index 950dae92e..23c0b346b 100644
--- a/Assets/Scripts/Gameplay/EntityInstance.cs
+++ b/Assets/Scripts/Gameplay/EntityInstance.cs
@@ -5,17 +5,13 @@ using System.Linq;
using GameCult.Aetheria.State.Unity;
using UniRx;
using UnityEngine;
-using Unity.Mathematics;
-using static Unity.Mathematics.math;
-using float2 = Unity.Mathematics.float2;
+using cfloat3 = CultMath.float3;
public class EntityInstance : MonoBehaviour
{
public MeshRenderer MapIcon;
public Transform InfluencePrefab;
- public Transform PingPrefab;
public Material InvisibleMaterial;
- public static Transform EffectManagerParent;
public ShieldManager Shield;
public HullCollider[] HullColliders;
@@ -25,7 +21,6 @@ public class EntityInstance : MonoBehaviour
public WeaponHardpoint[] WeaponHardpoints;
public ArticulationPoint[] ArticulationPoints;
- public GameObject DestroyEffect;
public event Action OnFadedOut;
public event Action OnFadedIn;
@@ -40,41 +35,21 @@ public class EntityInstance : MonoBehaviour
private bool _fadedElementsVisible = false;
private bool _unfadedElementsVisible = false;
private float _fadeTime;
- private bool _destroyed;
- private (Transform transform, MeshRenderer meshRenderer) _currentPing;
- private float _pingBrightness;
- private Sensor _sensor;
private Transform _influenceInstance;
//private List<(GameObject source, EquippedItem item)> _audioSources = new List<(GameObject source, EquippedItem item)>();
// private (Reactor reactor, GameObject sfxSource) _reactor;
// private Dictionary _radiatorSfx = new Dictionary();
- private static Dictionary _instantWeaponManagers = new Dictionary();
- private static Dictionary _constantWeaponManagers = new Dictionary();
-
- public static void ClearWeaponManagers()
- {
- _instantWeaponManagers.Clear();
- _constantWeaponManagers.Clear();
- }
-
private static AetheriaRuntimeCatalogItem FindTypedHull(ItemInstance hull)
{
return ActionGameManager.RuntimeCatalog?.FindItem(hull?.ItemKey ?? "");
}
- private static Shape ToShape(int width, int height, IReadOnlyList cells)
- {
- var shape = new Shape(width, height);
- foreach (var cell in cells)
- {
- if (cell.X >= 0 && cell.Y >= 0 && cell.X < width && cell.Y < height)
- shape[int2(cell.X, cell.Y)] = true;
- }
+ private static Vector2 ToVector2(CultMath.float2 value) => new Vector2(value.x, value.y);
+ private static Vector2 ToVector2(Unity.Mathematics.float2 value) => new Vector2(value.x, value.y);
- return shape;
- }
+ private static cfloat3 ToCult(Vector3 value) => new cfloat3(value.x, value.y, value.z);
public CompassIcon CompassIcon { get; set; }
public Dictionary Barrels { get; private set; }
@@ -186,81 +161,10 @@ public class EntityInstance : MonoBehaviour
return;
}
- var hullShape = ToShape(typedHull.ShapeWidth, typedHull.ShapeHeight, typedHull.ShapeCells);
- var typedHardpoints = typedHull.Hardpoints.ToArray();
-
if(Shield)
Shield.Entity = entity;
foreach (var hullCollider in HullColliders) hullCollider.Entity = entity;
- foreach (var item in entity.Equipment)
- {
- foreach (var behavior in item.Behaviors)
- {
- if (behavior is Sensor sensor)
- {
- _sensor = sensor;
- sensor.OnPingStart += () =>
- {
- var pingInstance = Instantiate(PingPrefab);
- var pingMesh = pingInstance.GetComponent();
- pingInstance.position = entity.Position;
- _pingBrightness = pingMesh.material.GetFloat("_Depth");
- _currentPing = (pingInstance, pingMesh);
- };
- sensor.OnPingEnd += OnSensorPingEnd;
- }
-
- if (behavior is InstantWeapon instantWeapon)
- {
- var effectPrefab = instantWeapon.EffectPrefab;
- if (!_instantWeaponManagers.ContainsKey(effectPrefab))
- {
- var managerPrefab = UnityHelpers.LoadAsset(effectPrefab);
- if(managerPrefab)
- {
- _instantWeaponManagers.Add(effectPrefab, Instantiate(managerPrefab, EffectManagerParent));
- }
- else Debug.LogError($"No InstantWeaponEffectManager prefab found at path {effectPrefab}");
- }
-
- instantWeapon.OnFire += () =>
- _instantWeaponManagers[effectPrefab].Fire(instantWeapon, item, this, entity.Target.Value != null && ZoneRenderer.EntityInstances.ContainsKey(entity.Target.Value) ? ZoneRenderer.EntityInstances[entity.Target.Value] : null);
-
- if (behavior is ChargedWeapon chargedWeapon)
- {
- var chargeManager = _instantWeaponManagers[effectPrefab].GetComponent();
- if (chargeManager)
- {
- chargedWeapon.OnStartCharging += () => chargeManager.StartCharging(chargedWeapon, item, this);
- chargedWeapon.OnStopCharging += () => chargeManager.StopCharging(chargedWeapon);
- chargedWeapon.OnCharged += () => chargeManager.Charged(chargedWeapon);
- chargedWeapon.OnFailed += () => chargeManager.Failed(chargedWeapon);
- }
- }
- }
-
- if (behavior is ConstantWeapon constantWeapon)
- {
- var effectPrefab = constantWeapon.EffectPrefab;
- if (!_constantWeaponManagers.ContainsKey(effectPrefab))
- {
- var managerPrefab = UnityHelpers.LoadAsset(effectPrefab);
- if(managerPrefab)
- {
- _constantWeaponManagers.Add(effectPrefab, Instantiate(managerPrefab, EffectManagerParent));
- }
- else Debug.LogError($"No ConstantWeaponEffectManager prefab found at path {effectPrefab}");
- }
-
- constantWeapon.OnStartFiring += () =>
- _constantWeaponManagers[effectPrefab].StartFiring(constantWeapon, item, this, entity.Target.Value != null ? ZoneRenderer.EntityInstances[entity.Target.Value] : null);
- constantWeapon.OnStopFiring += () =>
- _constantWeaponManagers[effectPrefab].StopFiring(item);
- }
- }
-
- }
RadiatorMeshes = new Dictionary();
Barrels = new Dictionary();
BarrelIndices = new Dictionary();
@@ -289,128 +193,6 @@ public class EntityInstance : MonoBehaviour
}
}
- void DamageSchematic(float damage, Shape hitShape)
- {
- foreach (var v in hitShape.Coordinates)
- hitShape[v] = hitShape[v] && hullShape[v];
-
- float hullDamage = 0;
- var damagePerCell = damage / hitShape.Coordinates.Length;
- foreach (var v in hitShape.Coordinates)
- {
- var d = damagePerCell;
-
- // Subtract surface damage from armor, passing on the remainder to the item and then to the hull
- var prev = entity.Armor[v.x, v.y];
- entity.Armor[v.x, v.y] = max(prev - d, 0);
- entity.ArmorDamage.OnNext((v, d));
- d = max(d - prev, 0);
-
- if (d > 0.1f)
- {
- var item = entity.GearOccupancy[v.x, v.y];
- if (item != null)
- {
- prev = item.EquippableItem.Durability;
- item.EquippableItem.Durability = max(prev - d, 0);
- entity.ItemDamage.OnNext((item, d));
- d = max(d - prev, 0);
- }
- }
-
- hullDamage += d;
- }
-
- if(hullDamage > .1f)
- {
- entity.Hull.Durability -= hullDamage;
- entity.HullDamage.OnNext(hullDamage);
- }
- }
-
- foreach (var collider in HullColliders)
- {
- collider.Splash.Subscribe(splash =>
- {
- var hitShape = new Shape(hullShape.Width, hullShape.Height);
- foreach (var v in hullShape.Coordinates)
- {
- var localHitDirection = transform.InverseTransformDirection(splash.Direction);
- var direction = normalize(float2(localHitDirection.x, localHitDirection.z));
- var cellDot = dot(normalize(v - hullShape.CenterOfMass), direction);
- if (cellDot < 0) hitShape[v] = true;
- }
- DamageSchematic(splash.Damage, hitShape);
- });
-
- collider.Hit.Subscribe(hit =>
- {
- Entity.IncomingHit.OnNext(hit.Source);
- var hardpointIndex = (int) hit.TexCoord.x - 1;
-
- var hitShape = new Shape(hullShape.Width, hullShape.Height);
-
- // U coordinate between 0-1 indicates a hit that didn't land directly on a hardpoint
- // Find the 2D position of the hit scaled to the schematic
- float2 hitPos = float2.zero;
- if (hardpointIndex < 0 || hardpointIndex >= typedHardpoints.Length)
- {
- hitPos = float2(hit.TexCoord.x * hullShape.Width, hit.TexCoord.y * hullShape.Height);
- // Search all schematic border cells for the cell which is closest to the hit position
- var hitCell = int2(-1);
- var distance = float.MaxValue;
- foreach (var v in hullShape.Coordinates)
- {
- var cellDist = lengthsq(hitPos - v);
- if (cellDist < distance)
- {
- distance = cellDist;
- hitCell = v;
- hitPos = v + float2(.5f);
- }
- }
-
- hitShape[hitCell] = true;
- }
- else
- {
- // Collider UV coordinates starting with 1 correspond to hardpoint index
- var hardpoint = typedHardpoints[hardpointIndex];
-
- // Obtain the hull coordinates of all cells occupied by the hardpoint
- var hardpointShape = ToShape(hardpoint.ShapeWidth, hardpoint.ShapeHeight, hardpoint.ShapeCells);
- var hardpointCells = hullShape.Inset(hardpointShape, int2(hardpoint.PositionX, hardpoint.PositionY));
- hitPos = hardpointCells.CenterOfMass;
- foreach (var v in hardpointCells.Coordinates)
- hitShape[v] = true;
- }
-
- for (int i = 0; i < Mathf.RoundToInt(hit.Spread); i++)
- {
- hitShape = hitShape.Expand();
- }
-
- if (hit.Penetration > .5f)
- {
- // Find the local 2D vector corresponding to the direction of the incoming hit
- var localHitDirection = transform.InverseTransformDirection(hit.Direction);
- var penetrationVector = normalize(float2(localHitDirection.x, localHitDirection.z));
- // TODO: Bresenham's line algorithm
- // March a ray through the ship from the hit position
- var penetrationPoint = hitPos;
- var penetrationDistance = 0f;
- while (penetrationDistance < hit.Penetration && hullShape[int2(penetrationPoint)])
- {
- penetrationDistance += .5f;
- hitShape[int2(penetrationPoint)] = true;
- penetrationPoint += penetrationVector * .5f;
- }
- }
-
- DamageSchematic(hit.Damage, hitShape);
- });
- }
-
LookAtPoint = new GameObject($"{entity.Name} Look Point").transform;
foreach (var articulationPoint in ArticulationPoints)
@@ -418,23 +200,6 @@ public class EntityInstance : MonoBehaviour
articulationPoint.Target = LookAtPoint;
}
- _subscriptions.Add(Entity.HullDamage.Subscribe(_ =>
- {
- if (!_destroyed && Entity.Hull.Durability < .01f)
- {
- if (!this) return;
- if (ActionGameManager.Instance?.CommitEntityDestroyed(entity, ZoneRenderer) != true)
- return;
-
- _destroyed = true;
- if (DestroyEffect != null)
- {
- var t = Instantiate(DestroyEffect).transform;
- t.position = transform.position;
- }
- }
- }));
-
if (entity is OrbitalEntity orbital && orbital.IsSecureArea)
{
_influenceInstance = Instantiate(InfluencePrefab);
@@ -442,11 +207,6 @@ public class EntityInstance : MonoBehaviour
}
}
- private void OnSensorPingEnd()
- {
- Destroy(_currentPing.transform.gameObject);
- }
-
public Transform GetBarrel(HardpointData hardpoint)
{
if (Barrels.ContainsKey(hardpoint))
@@ -461,11 +221,6 @@ public class EntityInstance : MonoBehaviour
public virtual void Update()
{
- if (_currentPing.transform)
- {
- _currentPing.transform.localScale = _sensor.PingRadius * Vector3.one;
- _currentPing.meshRenderer.material.SetFloat("_Depth", _pingBrightness * _sensor.PingBrightness);
- }
if (_fading)
{
if (_fadingIn)
@@ -510,20 +265,23 @@ public class EntityInstance : MonoBehaviour
foreach (var x in Barrels)
{
- Entity.HardpointTransforms[x.Key] = (x.Value[0].position, x.Value[0].forward);
+ Entity.HardpointTransforms[x.Key] = (
+ ToCult(x.Value[0].position),
+ ToCult(x.Value[0].forward));
}
- LookAtPoint.position = transform.position + (Vector3) Entity.LookDirection *
- (Entity.Target.Value != null ? max(Entity.TargetRange,Entity.ItemManager.GameplaySettings.ConvergenceMinimumDistance) : 10000);
- LocalSpace.localPosition = transform.position = Entity.Position;
+ var entityPosition = (Vector3)AetheriaMath.ToUnity(Entity.CultPosition);
+ var entityLookDirection = (Vector3)AetheriaMath.ToUnity(Entity.CultLookDirection);
+
+ LookAtPoint.position = transform.position + entityLookDirection *
+ (Entity.Target.Value != null ? Mathf.Max(Entity.TargetRange, Entity.ItemManager.GameplaySettings.ConvergenceMinimumDistance) : 10000);
+ LocalSpace.localPosition = transform.position = entityPosition;
if (_influenceInstance)
- _influenceInstance.position = new Vector3(Entity.Position.x, 0, Entity.Position.z);
+ _influenceInstance.position = new Vector3(entityPosition.x, 0, entityPosition.z);
}
public virtual void OnDestroy()
{
- if(_sensor!=null)
- _sensor.OnPingEnd -= OnSensorPingEnd;
if (_influenceInstance) Destroy(_influenceInstance.gameObject);
Destroy(LocalSpace.gameObject);
foreach(var x in _subscriptions)
diff --git a/Assets/Scripts/Gameplay/FieldDriver.cs b/Assets/Scripts/Gameplay/FieldDriver.cs
index 7bbf78ee7..eba82d862 100644
--- a/Assets/Scripts/Gameplay/FieldDriver.cs
+++ b/Assets/Scripts/Gameplay/FieldDriver.cs
@@ -1,15 +1,11 @@
using System;
-using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-using UnityEngine.InputSystem;
-using Unity.Mathematics;
-using static Unity.Mathematics.math;
public class FieldDriver : MonoBehaviour
{
public Camera Camera;
- public float2 Push;
+ public Vector2 Push;
public float FrontTwist;
public float RearTwist;
public float TestMagnitude;
@@ -28,19 +24,6 @@ public class FieldDriver : MonoBehaviour
public float MeleeAngle;
public float MeleeAngleExponent;
- public float TendrilBaseRadius = 3;
- public float TendrilTipRadius = .1f;
- public float TendrilExtensionExponent = .75f;
- public float TendrilExtendBaseAnimationExponent = .5f;
- public float TendrilBaseDamping = 2;
- public float TendrilTipRadiusAnimationExponent = 2f;
- public float TendrilFadeExponent = 2;
- // public float GrabScaleAnimationExponent = .5f;
-
- public float GrabExtendTime;
- public float GrabEnvelopTime;
- public float GrabPullTime;
-
public RectTransform.Axis RefractionAxis = RectTransform.Axis.Horizontal;
private Material _field;
@@ -49,57 +32,36 @@ public class FieldDriver : MonoBehaviour
private float _waveOffset;
private float _meleeTime;
private bool _meleeActive;
- private MeshCollider _collider;
- private Transform _grabObject;
- private Vector3 _grabObjectStartPos;
- private Vector3 _grabObjectStartTendrilBasePos;
- private Vector3 _grabObjectEndPos;
- private Vector3 _grabObjectVelocity;
- private float _grabObjectScale;
- private float _grabTime;
- private GrabPhase _grabPhase;
- private Vector3 _tendrilBasePos;
- private Vector3 _tendrilBendTarget;
- private Vector3 _tendrilTargetPos;
- private float _fadePoint;
-
- private enum GrabPhase
- {
- Extend,
- Envelop,
- Pull
- }
private struct FieldHit
{
- public float3 Position;
- public float3 Direction;
+ public Vector3 Position;
+ public Vector3 Direction;
public float Magnitude;
public float Time;
}
void Start()
{
- _collider = GetComponent();
_field = GetComponent().material;
var clickableCollider = GetComponent();
if(clickableCollider!=null)
{
clickableCollider.OnClick += (_, _, ray, hit) =>
{
- AddHit(hit.point, ray.direction, TestMagnitude);
+ AddHit(hit.Point, ray.direction, TestMagnitude);
};
}
_hitBuffer = new ComputeBuffer(MaxHits, 32);
}
- public void AddHit(float3 position, float3 direction, float magnitude)
+ public void AddHit(Vector3 position, Vector3 direction, float magnitude)
{
if (_hits.Count >= MaxHits) return;
var hit = new FieldHit
{
- Position = Vector3.Scale(normalize(transform.InverseTransformPoint(position)), transform.localScale),
- Direction = normalize(transform.rotation * direction),
+ Position = Vector3.Scale(transform.InverseTransformPoint(position).normalized, transform.localScale),
+ Direction = (transform.rotation * direction).normalized,
Magnitude = magnitude,
Time = 0
};
@@ -115,31 +77,21 @@ public class FieldDriver : MonoBehaviour
_meleeTime = 0;
}
- public bool CanGrab => _grabObject == null;
-
- public void GrabObject(Transform t, Vector3 v)
- {
- _grabPhase = GrabPhase.Extend;
- _grabObject = t;
- _grabObjectStartPos = t.position;
- _grabObjectVelocity = v;
- _grabObjectScale = t.localScale.x;
- _tendrilBasePos = _grabObjectStartTendrilBasePos = _collider.ClosestPoint(_grabObjectStartPos);
- _fadePoint = .999f;
- }
-
void Update()
{
- var pushMag = min(length(Push), 1);
+ var pushMag = Mathf.Min(Push.magnitude, 1);
- _waveOffset = frac(_waveOffset + Time.deltaTime * FlowSpeed * pow(max(pushMag, max(abs(FrontTwist), abs(RearTwist))), FlowSpeedThrottleExponent));
+ _waveOffset = Mathf.Repeat(
+ _waveOffset + Time.deltaTime * FlowSpeed *
+ Mathf.Pow(Mathf.Max(pushMag, Mathf.Max(Mathf.Abs(FrontTwist), Mathf.Abs(RearTwist))), FlowSpeedThrottleExponent),
+ 1);
var refractionRotation = Matrix4x4.Rotate(Camera.transform.rotation).inverse;
if (RefractionAxis == RectTransform.Axis.Vertical) refractionRotation =
Matrix4x4.Rotate(Quaternion.Euler(90, 0, 0)) * refractionRotation;
- _field.SetFloat("_WaveOffset", _waveOffset * PI * 2);
+ _field.SetFloat("_WaveOffset", _waveOffset * Mathf.PI * 2);
_field.SetFloat("_Push", pushMag);
_field.SetVector("_PushDirection", new Vector4(-Push.x, 0, -Push.y));
_field.SetFloat("_TwistFront", FrontTwist);
@@ -168,8 +120,8 @@ public class FieldDriver : MonoBehaviour
_meleeTime += Time.deltaTime / MeleeDuration;
if (_meleeTime < 1)
{
- _field.SetVector("_MeleeDirection", Quaternion.AngleAxis(sign(_meleeTime*2-1) * MeleeAngle * pow(abs(_meleeTime * 2 - 1), MeleeAngleExponent), Vector3.up) * -Vector3.forward);
- _field.SetFloat("_MeleeDisplacement", pow(1 - 2 * abs(_meleeTime - .5f), MeleeRangeExponent) * MeleeRange);
+ _field.SetVector("_MeleeDirection", Quaternion.AngleAxis(Mathf.Sign(_meleeTime * 2 - 1) * MeleeAngle * Mathf.Pow(Mathf.Abs(_meleeTime * 2 - 1), MeleeAngleExponent), Vector3.up) * -Vector3.forward);
+ _field.SetFloat("_MeleeDisplacement", Mathf.Pow(1 - 2 * Mathf.Abs(_meleeTime - .5f), MeleeRangeExponent) * MeleeRange);
_field.SetFloat("_MeleeShape", MeleeShaping);
_field.SetFloat("_MeleeFlattening", MeleeFlatness);
}
@@ -179,73 +131,6 @@ public class FieldDriver : MonoBehaviour
_field.SetFloat("_MeleeDisplacement", 0);
}
}
-
-
- if(_grabObject != null)
- {
- _grabTime += Time.deltaTime / _grabPhase switch
- {
- GrabPhase.Extend => GrabExtendTime,
- GrabPhase.Envelop => GrabEnvelopTime,
- GrabPhase.Pull => GrabPullTime,
- _ => throw new ArgumentOutOfRangeException()
- };
- if (_grabTime > 1)
- {
- _grabTime = 0;
- if (_grabPhase == GrabPhase.Envelop)
- {
- _grabObjectEndPos = _grabObject.position;
- }
- if (_grabPhase == GrabPhase.Pull)
- {
- Destroy(_grabObject.gameObject);
- _grabObject = null;
- _field.SetFloat("_TendrilInfluence", 0);
- }
- else _grabPhase++;
- }
-
- if (_grabObject != null)
- {
- _tendrilBasePos = AetheriaMath.Damp(_tendrilBasePos, _grabObject.position, TendrilBaseDamping, Time.deltaTime);
- switch (_grabPhase)
- {
- case GrabPhase.Extend:
- _tendrilBendTarget = _grabObjectStartPos;
- _grabObject.position += _grabObjectVelocity * Time.deltaTime;
- _tendrilTargetPos = lerp(
- lerp(_grabObjectStartTendrilBasePos, _grabObjectStartPos, _grabTime),
- lerp(_grabObjectStartPos, _grabObject.position, _grabTime),
- pow(_grabTime, TendrilExtensionExponent));
- _field.SetFloat("_TendrilInfluence", pow(_grabTime, TendrilExtendBaseAnimationExponent));
- _field.SetFloat("_TendrilSize", lerp(TendrilBaseRadius/2,TendrilBaseRadius,pow(_grabTime, TendrilExtendBaseAnimationExponent)));
- _field.SetFloat("_TendrilRadius", _grabObjectScale * pow(_grabTime, TendrilTipRadiusAnimationExponent) * TendrilTipRadius);
- break;
- case GrabPhase.Envelop:
- _tendrilBendTarget = _grabObjectStartPos;
- _tendrilTargetPos = _grabObject.position += _grabObjectVelocity * Time.deltaTime * (1-_grabTime);
- _field.SetFloat("_TendrilInfluence", 1);
- _field.SetFloat("_TendrilSize", TendrilBaseRadius);
- _field.SetFloat("_TendrilRadius", _grabObjectScale * TendrilTipRadius);
- break;
- case GrabPhase.Pull:
- _tendrilTargetPos = _grabObject.position = lerp(_grabObjectEndPos, transform.position, _grabTime*_grabTime);
- _tendrilBendTarget = lerp(_grabObjectStartPos, _grabObjectEndPos, _grabTime*_grabTime);
- if (_fadePoint > .99 && transform.InverseTransformPoint(_grabObject.position).sqrMagnitude < 1)
- _fadePoint = _grabTime;
- _field.SetFloat("_TendrilInfluence", pow(smoothstep(1, _fadePoint, _grabTime), TendrilFadeExponent));
- _field.SetFloat("_TendrilSize", TendrilBaseRadius);
- _field.SetFloat("_TendrilRadius", _grabObjectScale * TendrilTipRadius);
- break;
- default:
- throw new ArgumentOutOfRangeException();
- }
- _field.SetVector("_TendrilBase", Vector3.Scale(transform.InverseTransformPoint(_tendrilBasePos).normalized, transform.localScale));
- _field.SetVector("_TendrilBend", Vector3.Scale(transform.InverseTransformPoint(_tendrilBendTarget), transform.localScale));
- _field.SetVector("_TendrilTarget", Vector3.Scale(transform.InverseTransformPoint(_tendrilTargetPos), transform.localScale));
- }
- }
}
private float almostIdentity( float x )
@@ -258,20 +143,10 @@ public class FieldDriver : MonoBehaviour
return t * t * (3.0f - 2.0f * t);
}
- private const int GIZMO_STEPS = 16;
- private void OnDrawGizmosSelected()
+ private float SmoothStep(float edge0, float edge1, float x)
{
- if (_grabObject != null)
- {
- Vector3 previous = _tendrilBasePos;
- for (int i = 1; i <= GIZMO_STEPS; i++)
- {
- var l = (float)i / GIZMO_STEPS;
- var next = AetheriaMath.GetQuadraticSplinePosition(_tendrilBasePos, _tendrilBendTarget, _tendrilTargetPos, l);
- Gizmos.DrawLine(previous, next);
- previous = next;
- }
- }
+ var t = Mathf.Clamp01((x - edge0) / (edge1 - edge0));
+ return t * t * (3.0f - 2.0f * t);
}
private void OnDestroy()
diff --git a/Assets/Scripts/Gameplay/GameSettings.cs b/Assets/Scripts/Gameplay/GameSettings.cs
index 112c1bf07..2bfb31458 100644
--- a/Assets/Scripts/Gameplay/GameSettings.cs
+++ b/Assets/Scripts/Gameplay/GameSettings.cs
@@ -15,7 +15,6 @@ public class GameSettings : ScriptableObject
public string DefaultBossSoundbank = "Boss_Metal";
public string AmbienceSoundBank = "Ambience";
public string StartingHullName = "Longinus";
- public float PickupLifetime = 30;
public float LootDropProbability = .25f;
public float LootDropVelocity = 25;
public float HeatstrokePhasingFloor = 0;
@@ -86,4 +85,4 @@ public class BodySettingsCollection
{
public float MinimumMass;
public CelestialBodySettings[] BodySettings;
-}
\ No newline at end of file
+}
diff --git a/Assets/Scripts/Gameplay/GridObject.cs b/Assets/Scripts/Gameplay/GridObject.cs
index 772ed781c..180a2dd7c 100644
--- a/Assets/Scripts/Gameplay/GridObject.cs
+++ b/Assets/Scripts/Gameplay/GridObject.cs
@@ -1,7 +1,5 @@
using System;
-using Unity.Mathematics;
using UnityEngine;
-using static Unity.Mathematics.math;
using Random = UnityEngine.Random;
public class GridObject : MonoBehaviour
@@ -13,7 +11,6 @@ public class GridObject : MonoBehaviour
public float Drag = .1f;
public float LaunchDrag;
- private float2 _selfVelocity;
private float _timeOffset;
public Zone Zone { get; set; }
@@ -27,24 +24,6 @@ public class GridObject : MonoBehaviour
void Update()
{
var t = transform;
- t.localRotation = Quaternion.Euler(sin(Time.time - _timeOffset * RotationSpeed) * 90, 0, cos(Time.time - _timeOffset * RotationSpeed) * 90);
-
- if (Zone == null) return;
-
- var position = t.position;
- var gridHeight = Zone.GetHeight(position.Flatland()) + GridOffset;
- Velocity += Vector3.up * (sign(gridHeight - position.y) * GridAttraction * Time.deltaTime);
- Velocity *= max(0, 1 - LaunchDrag * Time.deltaTime);
- var normal = Zone.GetNormal(position.Flatland());
- var force = new float2(normal.x, normal.z);
- var forceMagnitude = lengthsq(force);
- if (forceMagnitude > .001f)
- {
- var fa = 1 / (1 - forceMagnitude) - 1;
- _selfVelocity += normalize(force) * Zone.Settings.GravityStrength * fa * Gravity;
- }
-
- _selfVelocity *= max(0, 1 - Drag * Time.deltaTime);
- t.position = position + (Velocity + new Vector3(_selfVelocity.x, 0, _selfVelocity.y)) * Time.deltaTime;
+ t.localRotation = Quaternion.Euler(Mathf.Sin(Time.time - _timeOffset * RotationSpeed) * 90, 0, Mathf.Cos(Time.time - _timeOffset * RotationSpeed) * 90);
}
-}
\ No newline at end of file
+}
diff --git a/Assets/Scripts/Gameplay/HullCollider.cs b/Assets/Scripts/Gameplay/HullCollider.cs
index cf5ee155e..4553d280c 100644
--- a/Assets/Scripts/Gameplay/HullCollider.cs
+++ b/Assets/Scripts/Gameplay/HullCollider.cs
@@ -1,65 +1,65 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UniRx;
-using Unity.Mathematics;
-using static Unity.Mathematics.math;
using UnityEngine;
-using float2 = Unity.Mathematics.float2;
public class HullCollider : MonoBehaviour
{
- public Subject Hit = new Subject();
- public Subject Splash = new Subject();
-
+ private Renderer[] _renderers;
+
public Entity Entity { get; set; }
-
- public void SendHit(float damage, float penetration, float spread, DamageType damageType, Entity source, Vector2 texCoord, Vector3 direction)
+
+ public Bounds YmirBounds => CalculateBounds(transform.position);
+
+ public float YmirPlanarRadius => Mathf.Max(YmirBounds.extents.x, YmirBounds.extents.z, 0.001f);
+
+ public void RefreshYmirBoundsSource()
{
- Hit.OnNext(new HullHitEventArgs
- {
- Damage = damage,
- Penetration = penetration,
- Spread = spread,
- DamageType = damageType,
- Source = source,
- TexCoord = texCoord,
- Direction = direction
- });
- }
-
- public void SendSplash(float damage, DamageType damageType, Entity source, Vector3 direction)
- {
- Splash.OnNext(new HullSplashEventArgs
- {
- Damage = damage,
- DamageType = damageType,
- Source = source,
- Direction = direction
- });
+ _renderers = GetComponentsInChildren();
}
- private void OnCollisionEnter(Collision other)
+ private void Awake()
{
- Entity.Velocity += ((float3) other.impulse).xz / Time.deltaTime;
+ RefreshYmirBoundsSource();
}
- public class HullHitEventArgs
+ private void OnEnable()
{
- public float Damage;
- public float Penetration;
- public float Spread;
- public DamageType DamageType;
- public Entity Source;
- public float2 TexCoord;
- public float3 Direction;
+ if (_renderers == null || _renderers.Length == 0)
+ RefreshYmirBoundsSource();
}
-
- public class HullSplashEventArgs
+
+ private Bounds CalculateBounds(Vector3 fallbackCenter)
{
- public float Damage;
- public DamageType DamageType;
- public Entity Source;
- public float3 Direction;
+ if (_renderers == null)
+ RefreshYmirBoundsSource();
+
+ if (_renderers == null || _renderers.Length == 0)
+ return new Bounds(fallbackCenter, Vector3.one);
+
+ var firstRenderer = FirstLiveRenderer();
+ if (firstRenderer == null)
+ return new Bounds(fallbackCenter, Vector3.one);
+
+ var bounds = firstRenderer.bounds;
+ for (var i = 0; i < _renderers.Length; i++)
+ {
+ var renderer = _renderers[i];
+ if (renderer == null || renderer == firstRenderer)
+ continue;
+
+ bounds.Encapsulate(renderer.bounds);
+ }
+
+ return bounds;
}
-}
\ No newline at end of file
+
+ private Renderer FirstLiveRenderer()
+ {
+ for (var i = 0; i < _renderers.Length; i++)
+ {
+ if (_renderers[i] != null)
+ return _renderers[i];
+ }
+
+ return null;
+ }
+
+}
diff --git a/Assets/Scripts/Gameplay/ItemPickup.cs b/Assets/Scripts/Gameplay/ItemPickup.cs
index 81436f564..a55674dda 100644
--- a/Assets/Scripts/Gameplay/ItemPickup.cs
+++ b/Assets/Scripts/Gameplay/ItemPickup.cs
@@ -1,8 +1,8 @@
using System;
using TMPro;
-using Unity.Mathematics;
using UnityEngine;
-using static Unity.Mathematics.math;
+using static CultMath.math;
+using cfloat3 = CultMath.float3;
public class ItemPickup : MonoBehaviour
{
@@ -15,27 +15,28 @@ public class ItemPickup : MonoBehaviour
public ItemInstance Item { get; set; }
public ZoneRenderer ZoneRenderer { get; set; }
- public float3 ViewOrigin { get; set; }
- public float3 ViewDirection { get; set; }
+ public cfloat3 ViewOrigin { get; set; }
+ public cfloat3 ViewDirection { get; set; }
private float _displayTime;
private void Update()
{
- var diff = (float3) transform.position - ViewOrigin;
+ var position = transform.position;
+ var diff = new cfloat3(position.x, position.y, position.z) - ViewOrigin;
var toThis = normalize(diff);
- var viewAngle = acos(Vector3.Dot(toThis, ViewDirection)) * Mathf.Rad2Deg;
+ var viewAngle = acos(dot(toThis, ViewDirection)) * AetheriaMath.Rad2Deg;
if (length(diff) < LabelDisplayMaxDistance && viewAngle < LabelDisplayAngle)
_displayTime = Time.time;
var targetAlpha = Time.time - _displayTime < LabelPersistDuration ? 1 : 0;
var c = ScanLabel.color;
c.a = c.a + sign(targetAlpha - c.a) * (Time.deltaTime / LabelFadeDuration);
ScanLabel.color = c;
- ScanLabelContainer.rotation = Quaternion.LookRotation(-toThis);
+ ScanLabelContainer.rotation = Quaternion.LookRotation((Vector3)AetheriaMath.ToUnity(-toThis));
}
private void OnDestroy()
{
ZoneRenderer?.DestroyLoot(this);
}
-}
\ No newline at end of file
+}
diff --git a/Assets/Scripts/Gameplay/Physics.meta b/Assets/Scripts/Gameplay/Physics.meta
new file mode 100644
index 000000000..26dafc8a0
--- /dev/null
+++ b/Assets/Scripts/Gameplay/Physics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: baa9b1a7f453a7a4aafe9c44c9fba7c3
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Gameplay/Physics/AetheriaYmirPhysicsBridge.cs b/Assets/Scripts/Gameplay/Physics/AetheriaYmirPhysicsBridge.cs
new file mode 100644
index 000000000..419ccb168
--- /dev/null
+++ b/Assets/Scripts/Gameplay/Physics/AetheriaYmirPhysicsBridge.cs
@@ -0,0 +1,865 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using UnityEngine;
+
+public sealed class AetheriaYmirPhysicsBridge : MonoBehaviour
+{
+ private const string ProjectileBodyId = "aetheria.projectile";
+ private const string TargetBodyPrefix = "aetheria.target.";
+
+ private static AetheriaYmirPhysicsBridge _instance;
+
+ public string ServiceUrl = "http://127.0.0.1:8877/simulate/step";
+ public string OverlapSphereUrl = "http://127.0.0.1:8877/query/overlap-sphere";
+ public string OverlapCircleUrl = "http://127.0.0.1:8877/query/overlap-circle";
+ public string CastCircleUrl = "http://127.0.0.1:8877/query/cast-circle";
+ public string CastSphereUrl = "http://127.0.0.1:8877/query/cast-sphere";
+ public bool EnableProjectileCutover = true;
+ public float ProjectileRadius = 0.1f;
+ public float ProjectileMass = 1.0f;
+ public float TargetRadiusPadding = 0.1f;
+ public int TimeoutMilliseconds = 20;
+ public AetheriaDaemonObserver DaemonObserver;
+
+ private readonly List _projectileBodies = new List