From 49f52d0bc290c169467e36f04a8ca5d98d1ca8e3 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 5 Jul 2026 01:17:27 +0100 Subject: [PATCH] Emit daemon Eve field surface for RTS --- .../Client/aetheria-rts-contract.ts | 60 ++++ Aetheria.Rts.Web/Client/app.ts | 53 ++++ .../Electron/aetheria-cultmesh.ts | 28 ++ .../Electron/aetheria-rts-bindings.ts | 1 + .../aetheria-rts-generated-bindings.ts | 200 ++++++++++++ .../Electron/aetheria-rts-local-documents.ts | 300 ++++++++++++++++++ Aetheria.Rts.Web/Electron/main.ts | 68 +++- Aetheria.Rts.Web/Electron/preload.cjs | 2 + .../scripts/generate-rts-bindings.mjs | 108 +++++++ .../scripts/verify-stage7c-electron-shell.ps1 | 16 +- GameCult.Aetheria.State.Unity.csproj | 1 + ...AetheriaRuntimeDaemonGameSurfaceBuilder.cs | 166 +++++++++- 12 files changed, 991 insertions(+), 12 deletions(-) diff --git a/Aetheria.Rts.Web/Client/aetheria-rts-contract.ts b/Aetheria.Rts.Web/Client/aetheria-rts-contract.ts index d2c3071f9..67305e261 100644 --- a/Aetheria.Rts.Web/Client/aetheria-rts-contract.ts +++ b/Aetheria.Rts.Web/Client/aetheria-rts-contract.ts @@ -92,6 +92,57 @@ export type GravityViewportResponse = { bodies: BodyView[]; }; +export type RenderSplatsViewportResponse = { + schema: string; + frameId: number; + publishedAtUtc: string; + simulationTimeSeconds: number; + runId: string; + zoneIndex: number; + zoneName: string; + viewport: Viewport; + layers: RenderSplatLayerDefinition[]; + splats: RenderSplatSoa; +}; + +export type RenderSplatLayerDefinition = { + layerKey: string; + displayName: string; + channel: number; + blendMode: string; + graphicsFormat: string; + clearBeforeDraw: boolean; + clearR: number; + clearG: number; + clearB: number; + clearA: number; +}; + +export type RenderSplatSoa = { + count: number; + centerX: number[]; + centerY: number[]; + halfExtentX: number[]; + halfExtentY: number[]; + rotationCos: number[]; + rotationSin: number[]; + channel: number[]; + falloff: number[]; + valueR: number[]; + valueG: number[]; + valueB: number[]; + valueA: number[]; + sourceKey: string[]; + layerIndex: number[]; + sourceKind: number[]; + frequencyX: number[]; + frequencyY: number[]; + phaseX: number[]; + phaseY: number[]; + animationSpeed: number[]; + sourceFlags: number[]; +}; + export type ViewObject = { entityIndex: number; entityKey: string; @@ -331,9 +382,17 @@ export type AetheriaMenuSurfaceComponent = { id: string; kind: string; props: Record; + embeddedDocuments?: AetheriaMenuEmbeddedDocumentSlot[]; children: AetheriaMenuSurfaceComponent[]; }; +export type AetheriaMenuEmbeddedDocumentSlot = { + slotId: string; + documentId: string; + schemaId: string; + presentationKind: string; +}; + export type AetheriaMenuStyleToken = { name: string; value: string; @@ -349,6 +408,7 @@ export type AetheriaRtsApi = { mapViewport(request: Viewport): Promise; objectsViewport(request: Viewport): Promise; gravityViewport(request: Viewport): Promise; + renderSplatsViewport(request: Viewport): Promise; selectedObject(request: AetheriaRuntimeSelectedObjectRequest): Promise; inventory(request: AetheriaRuntimeSelectedObjectRequest): Promise; daemonHealth(): Promise; diff --git a/Aetheria.Rts.Web/Client/app.ts b/Aetheria.Rts.Web/Client/app.ts index 996d73e19..c8b75d6cc 100644 --- a/Aetheria.Rts.Web/Client/app.ts +++ b/Aetheria.Rts.Web/Client/app.ts @@ -1,6 +1,8 @@ import { renderEveSurface, type EveCommandIntent, + type EveEmbeddedDocumentRequest, + type EveSurfaceComponent, } from "../node_modules/@gamecult/eve-browser-lowering/dist/index.js"; import type { AetheriaRtsApi, @@ -155,6 +157,7 @@ async function showDaemonEveSurface(): Promise { body: document.body, clientId: "aetheria.rts.electron", commandSink: intent => submitEveCommand(intent), + documentResolver: resolveEveDocument, source: "Aetheria Daemon", statusElement: statusEl, }); @@ -173,6 +176,56 @@ async function showDaemonEveSurface(): Promise { } } +async function resolveEveDocument( + request: EveEmbeddedDocumentRequest, + component: EveSurfaceComponent, +): Promise<{ document: unknown; documentId: string; schemaId: string } | undefined> { + const viewport = viewportFromComponent(component); + if (request.schemaId === "gamecult.aetheria.render_splats_viewport.v1" || request.slotId === "renderSplats") { + return { + document: await window.aetheriaRts.renderSplatsViewport(viewport), + documentId: request.documentId, + schemaId: "gamecult.aetheria.render_splats_viewport.v1", + }; + } + if (request.schemaId === "gamecult.aetheria.gravity_viewport.v1" || request.slotId === "gravity") { + return { + document: await window.aetheriaRts.gravityViewport(viewport), + documentId: request.documentId, + schemaId: "gamecult.aetheria.gravity_viewport.v1", + }; + } + if (request.schemaId === "gamecult.aetheria.objects_viewport.v1" || request.slotId === "objects") { + return { + document: await window.aetheriaRts.objectsViewport(viewport), + documentId: request.documentId, + schemaId: "gamecult.aetheria.objects_viewport.v1", + }; + } + return undefined; +} + +function viewportFromComponent(component: EveSurfaceComponent): Viewport { + const props = component.props ?? {}; + return { + minX: numberProp(props.minX, -1500), + minY: numberProp(props.minY, -1000), + maxX: numberProp(props.maxX, 1500), + maxY: numberProp(props.maxY, 1000), + }; +} + +function numberProp(value: unknown, fallback: number): number { + if (typeof value === "number" && Number.isFinite(value)) + return value; + if (typeof value === "string") { + const parsed = Number.parseFloat(value); + if (Number.isFinite(parsed)) + return parsed; + } + return fallback; +} + async function startDebugSurface(): Promise { try { renderDebugSurface(await window.aetheriaRts.debugSurface()); diff --git a/Aetheria.Rts.Web/Electron/aetheria-cultmesh.ts b/Aetheria.Rts.Web/Electron/aetheria-cultmesh.ts index 989bd4790..e6fde5161 100644 --- a/Aetheria.Rts.Web/Electron/aetheria-cultmesh.ts +++ b/Aetheria.Rts.Web/Electron/aetheria-cultmesh.ts @@ -31,6 +31,7 @@ import { type GravityViewportResponse, type InventoryDocument, type ObjectsViewportResponse, + type RenderSplatsViewportResponse, type AetheriaRuntimeRtsLiveFeedDiagnostic, type AetheriaRuntimeRtsQueryDiagnostic, type AetheriaRuntimeRtsSurfaceCatalogDiagnostic, @@ -54,6 +55,7 @@ import { buildGravityViewportDocumentFromFrame, buildInventoryDocumentFromFrame, buildObjectsViewportDocumentFromFrame, + buildRenderSplatsViewportDocumentFromFrame, buildSelectedObjectDocumentFromFrame, readStarbridgeSessionSummaryDocument, buildViewportDocumentFromFrame, @@ -123,9 +125,17 @@ export type AetheriaMenuSurfaceComponent = { props: Record; layout?: Record; style?: Record; + embeddedDocuments?: AetheriaMenuEmbeddedDocumentSlot[]; children: AetheriaMenuSurfaceComponent[]; }; +export type AetheriaMenuEmbeddedDocumentSlot = { + slotId: string; + documentId: string; + schemaId: string; + presentationKind: string; +}; + export type AetheriaMenuStyleToken = { name: string; value: string; @@ -193,6 +203,7 @@ export class AetheriaCultMeshClient { mapViewport: async (request: ViewportRequest) => buildViewportDocumentFromFrame(await this.fetchLatestFrameDocument(), request), objectsViewport: async (request: ViewportRequest) => buildObjectsViewportDocumentFromFrame(await this.fetchLatestFrameDocument(), request), gravityViewport: async (request: ViewportRequest) => buildGravityViewportDocumentFromFrame(await this.fetchLatestFrameDocument(), request), + renderSplatsViewport: async (request: ViewportRequest) => buildRenderSplatsViewportDocumentFromFrame(await this.fetchLatestFrameDocument(), request), selectedObject: async (request: SelectedObjectRequest) => buildSelectedObjectDocumentFromFrame(await this.fetchLatestFrameDocument(), request), inventory: async (request: SelectedObjectRequest) => buildInventoryDocumentFromFrame(await this.fetchLatestFrameDocument(), request), daemonHealth: async () => readDaemonHealthDocument(await this.fetchDaemonHealthDocument()), @@ -206,6 +217,7 @@ export class AetheriaCultMeshClient { { objectsViewport: CultMesh.pollingQueryWatcher(executors.objectsViewport, { intervalMs: 50 }), gravityViewport: CultMesh.pollingQueryWatcher(executors.gravityViewport, { intervalMs: 50 }), + renderSplatsViewport: CultMesh.pollingQueryWatcher(executors.renderSplatsViewport, { intervalMs: 50 }), selectedObject: CultMesh.pollingQueryWatcher(executors.selectedObject, { intervalMs: 50 }), inventory: CultMesh.pollingQueryWatcher(executors.inventory, { intervalMs: 50 }), daemonHealth: CultMesh.pollingQueryWatcher(executors.daemonHealth, { intervalMs: 250 }), @@ -277,6 +289,10 @@ export class AetheriaCultMeshClient { return this.aetheria.zone().gravity.within(request); } + public async renderSplatsViewport(request: ViewportRequest): Promise { + return this.aetheria.zone().renderSplats.within(request); + } + public async selectedObject(request: SelectedObjectRequest): Promise { return this.aetheria.selectedObject(request.entityIndex); } @@ -1050,11 +1066,23 @@ function normalizeEveComponent(component: unknown, fallbackId: string): Aetheria props: stringRecord(readField(component, "props", 2)), layout: stringRecord(readField(component, "layout", 6)), style: stringRecord(readField(component, "style", 7)), + embeddedDocuments: arrayValue(readField(component, "embeddedDocuments", 5)) + .map(normalizeEmbeddedDocumentSlot) + .filter(slot => slot.documentId.length > 0), children: arrayValue(readField(component, "children", 3)) .map((child, index) => normalizeEveComponent(child, `${fallbackId}.${index}`)), }; } +function normalizeEmbeddedDocumentSlot(slot: unknown): AetheriaMenuEmbeddedDocumentSlot { + return { + slotId: stringOr(readField(slot, "slotId", 0), ""), + documentId: stringOr(readField(slot, "documentId", 1), ""), + schemaId: stringOr(readField(slot, "schemaId", 2), ""), + presentationKind: stringOr(readField(slot, "presentationKind", 3), ""), + }; +} + function readField(value: unknown, property: string, index: number): unknown { if (Array.isArray(value)) return value[index]; diff --git a/Aetheria.Rts.Web/Electron/aetheria-rts-bindings.ts b/Aetheria.Rts.Web/Electron/aetheria-rts-bindings.ts index 581996a13..64710a590 100644 --- a/Aetheria.Rts.Web/Electron/aetheria-rts-bindings.ts +++ b/Aetheria.Rts.Web/Electron/aetheria-rts-bindings.ts @@ -44,6 +44,7 @@ export type { InventoryItem, InventoryDocument, ObjectsViewportResponse, + RenderSplatsViewportResponse, SelectedObjectDocument, StarbridgeBaseStatusDocument, StarbridgeRuntimeRoleDocument, diff --git a/Aetheria.Rts.Web/Electron/aetheria-rts-generated-bindings.ts b/Aetheria.Rts.Web/Electron/aetheria-rts-generated-bindings.ts index 905979078..4aaa83348 100644 --- a/Aetheria.Rts.Web/Electron/aetheria-rts-generated-bindings.ts +++ b/Aetheria.Rts.Web/Electron/aetheria-rts-generated-bindings.ts @@ -14,6 +14,7 @@ export const AetheriaRtsSchemas = { rtsViewport: "gamecult.aetheria.rts_viewport.v1", objectsViewport: "gamecult.aetheria.objects_viewport.v1", gravityViewport: "gamecult.aetheria.gravity_viewport.v1", + renderSplatsViewport: "gamecult.aetheria.render_splats_viewport.v1", currentZone: "gamecult.aetheria.current_zone.v1", currentEntity: "gamecult.aetheria.current_entity.v1", currentDocking: "gamecult.aetheria.current_docking.v1", @@ -103,6 +104,7 @@ export const AetheriaRtsIpcChannels = { mapViewport: "aetheria-rts:map-viewport", objectsViewport: "aetheria-rts:objects-viewport", gravityViewport: "aetheria-rts:gravity-viewport", + renderSplatsViewport: "aetheria-rts:render-splats-viewport", viewportFeed: "aetheria-rts:viewport-feed", viewportFeedStop: "aetheria-rts:viewport-feed-stop", viewportFeedUpdate: "aetheria-rts:viewport-feed-update", @@ -449,6 +451,105 @@ export const aetheriaRuntimeGravityViewportDocumentSlots: Record = { + schema: 0, + frameId: 1, + publishedAtUtc: 2, + simulationTimeSeconds: 3, + runId: 4, + zoneIndex: 5, + zoneName: 6, + viewport: 7, + layers: 8, + splats: 9, +}; + +export type AetheriaRuntimeRenderSplatLayerDefinitionSlot = + | "layerKey" + | "displayName" + | "channel" + | "blendMode" + | "graphicsFormat" + | "clearBeforeDraw" + | "clearR" + | "clearG" + | "clearB" + | "clearA"; + +export const aetheriaRuntimeRenderSplatLayerDefinitionSlots: Record = { + layerKey: 0, + displayName: 1, + channel: 2, + blendMode: 3, + graphicsFormat: 4, + clearBeforeDraw: 5, + clearR: 6, + clearG: 7, + clearB: 8, + clearA: 9, +}; + +export type AetheriaRuntimeRenderSplatSoaSlot = + | "count" + | "centerX" + | "centerY" + | "halfExtentX" + | "halfExtentY" + | "rotationCos" + | "rotationSin" + | "channel" + | "falloff" + | "valueR" + | "valueG" + | "valueB" + | "valueA" + | "sourceKey" + | "layerIndex" + | "sourceKind" + | "frequencyX" + | "frequencyY" + | "phaseX" + | "phaseY" + | "animationSpeed" + | "sourceFlags"; + +export const aetheriaRuntimeRenderSplatSoaSlots: Record = { + count: 0, + centerX: 1, + centerY: 2, + halfExtentX: 3, + halfExtentY: 4, + rotationCos: 5, + rotationSin: 6, + channel: 7, + falloff: 8, + valueR: 9, + valueG: 10, + valueB: 11, + valueA: 12, + sourceKey: 13, + layerIndex: 14, + sourceKind: 15, + frequencyX: 16, + frequencyY: 17, + phaseX: 18, + phaseY: 19, + animationSpeed: 20, + sourceFlags: 21, +}; + export type AetheriaRuntimeCurrentZoneDocumentSlot = | "schema" | "frameId" @@ -1023,6 +1124,25 @@ export const aetheriaRuntimeBodySnapshotCommitSlots: Record = { + lightColorX: 0, + lightColorY: 1, + lightColorZ: 2, + fogTintColorX: 3, + fogTintColorY: 4, + fogTintColorZ: 5, + lightRadiusMultiplier: 6, +}; + export type AetheriaRuntimeEntityStatGridCommitSlot = | "name" | "width" @@ -1496,6 +1616,57 @@ export type GravityViewportResponse = { bodies: BodyView[]; }; +export type RenderSplatsViewportResponse = { + schema: string; + frameId: number; + publishedAtUtc: string; + simulationTimeSeconds: number; + runId: string; + zoneIndex: number; + zoneName: string; + viewport: CultMeshViewportRequest; + layers: RenderSplatLayerDefinition[]; + splats: RenderSplatSoa; +}; + +export type RenderSplatLayerDefinition = { + layerKey: string; + displayName: string; + channel: number; + blendMode: string; + graphicsFormat: string; + clearBeforeDraw: boolean; + clearR: number; + clearG: number; + clearB: number; + clearA: number; +}; + +export type RenderSplatSoa = { + count: number; + centerX: number[]; + centerY: number[]; + halfExtentX: number[]; + halfExtentY: number[]; + rotationCos: number[]; + rotationSin: number[]; + channel: number[]; + falloff: number[]; + valueR: number[]; + valueG: number[]; + valueB: number[]; + valueA: number[]; + sourceKey: string[]; + layerIndex: number[]; + sourceKind: number[]; + frequencyX: number[]; + frequencyY: number[]; + phaseX: number[]; + phaseY: number[]; + animationSpeed: number[]; + sourceFlags: number[]; +}; + export type ViewObject = { entityIndex: number; entityKey: string; @@ -1776,9 +1947,17 @@ export type AetheriaMenuSurfaceComponent = { props: Record; layout?: Record; style?: Record; + embeddedDocuments?: AetheriaMenuEmbeddedDocumentSlot[]; children: AetheriaMenuSurfaceComponent[]; }; +export type AetheriaMenuEmbeddedDocumentSlot = { + slotId: string; + documentId: string; + schemaId: string; + presentationKind: string; +}; + export type AetheriaMenuStyleToken = { name: string; value: string; @@ -1794,6 +1973,7 @@ export type AetheriaRtsMainClient = { mapViewport(request: CultMeshViewportRequest): Promise; objectsViewport(request: CultMeshViewportRequest): Promise; gravityViewport(request: CultMeshViewportRequest): Promise; + renderSplatsViewport(request: CultMeshViewportRequest): Promise; selectedObject(request: AetheriaRuntimeSelectedObjectRequest): Promise; inventory(request: AetheriaRuntimeSelectedObjectRequest): Promise; daemonHealth(): Promise; @@ -1823,6 +2003,8 @@ export function registerAetheriaRtsIpcHandlers( getClient().objectsViewport(request)); ipcMain.handle(AetheriaRtsIpcChannels.gravityViewport, async (_event, request: CultMeshViewportRequest) => getClient().gravityViewport(request)); + ipcMain.handle(AetheriaRtsIpcChannels.renderSplatsViewport, async (_event, request: CultMeshViewportRequest) => + getClient().renderSplatsViewport(request)); ipcMain.handle(AetheriaRtsIpcChannels.selectedObject, async (_event, request: AetheriaRuntimeSelectedObjectRequest) => getClient().selectedObject(request)); ipcMain.handle(AetheriaRtsIpcChannels.inventory, async (_event, request: AetheriaRuntimeSelectedObjectRequest) => @@ -1879,6 +2061,7 @@ export type AetheriaRuntimeRtsQueryExecutors = { mapViewport: AetheriaRuntimeViewportQueryExecutor; objectsViewport: AetheriaRuntimeViewportQueryExecutor; gravityViewport: AetheriaRuntimeViewportQueryExecutor; + renderSplatsViewport: AetheriaRuntimeViewportQueryExecutor; selectedObject: AetheriaRuntimeQueryExecutor; inventory: AetheriaRuntimeQueryExecutor; daemonHealth: AetheriaRuntimeQueryExecutor; @@ -1891,6 +2074,7 @@ export type AetheriaRuntimeRtsQueryWatchers = Partial<{ mapViewport: CultMeshQueryWatcher; objectsViewport: CultMeshQueryWatcher; gravityViewport: CultMeshQueryWatcher; + renderSplatsViewport: CultMeshQueryWatcher; selectedObject: CultMeshQueryWatcher; inventory: CultMeshQueryWatcher; daemonHealth: CultMeshQueryWatcher; @@ -2020,6 +2204,11 @@ export function createAetheriaRuntimeRtsQueryHandles( executors.gravityViewport, { routeHint, sources: [AetheriaRuntimeRtsDocumentSources.daemonFrame], watchQuery: watchers.gravityViewport }, ), + renderSplatsViewport: CultMesh.query( + AetheriaRtsSchemas.renderSplatsViewport, + executors.renderSplatsViewport, + { routeHint, sources: [AetheriaRuntimeRtsDocumentSources.daemonFrame], watchQuery: watchers.renderSplatsViewport }, + ), selectedObject: CultMesh.query( AetheriaRtsSchemas.selectedObject, executors.selectedObject, @@ -2060,6 +2249,7 @@ export function describeAetheriaRuntimeRtsQueryHandles( mapViewport: describeAetheriaRuntimeRtsQuerySurface(handles.mapViewport), objectsViewport: describeAetheriaRuntimeRtsQuerySurface(handles.objectsViewport), gravityViewport: describeAetheriaRuntimeRtsQuerySurface(handles.gravityViewport), + renderSplatsViewport: describeAetheriaRuntimeRtsQuerySurface(handles.renderSplatsViewport), selectedObject: describeAetheriaRuntimeRtsQuerySurface(handles.selectedObject), inventory: describeAetheriaRuntimeRtsQuerySurface(handles.inventory), daemonHealth: describeAetheriaRuntimeRtsQuerySurface(handles.daemonHealth), @@ -2085,6 +2275,7 @@ export function describeAetheriaRuntimeRtsSurfaceCatalog( CultMesh.describeSurface(handles.mapViewport), CultMesh.describeSurface(handles.objectsViewport), CultMesh.describeSurface(handles.gravityViewport), + CultMesh.describeSurface(handles.renderSplatsViewport), CultMesh.describeSurface(handles.selectedObject), CultMesh.describeSurface(handles.inventory), CultMesh.describeSurface(handles.daemonHealth), @@ -2171,6 +2362,7 @@ export function createAetheriaRuntimeRtsVerseHandles( const mapViewport = CultMesh.bindQuery(queryVerse, queries.mapViewport); const objectsViewport = CultMesh.bindQuery(queryVerse, queries.objectsViewport); const gravityViewport = CultMesh.bindQuery(queryVerse, queries.gravityViewport); + const renderSplatsViewport = CultMesh.bindQuery(queryVerse, queries.renderSplatsViewport); const selectedObject = CultMesh.bindQuery(queryVerse, queries.selectedObject); const inventory = CultMesh.bindQuery(queryVerse, queries.inventory); const daemonHealth = CultMesh.bindQuery(queryVerse, queries.daemonHealth); @@ -2211,6 +2403,14 @@ export function createAetheriaRuntimeRtsVerseHandles( callback: (value: GravityViewportResponse) => void, ) => gravityViewport.watch(request, callback), }, + renderSplats: { + within: (request: CultMeshViewportRequest) => + renderSplatsViewport.execute(request), + watchWithin: ( + request: CultMeshViewportRequest, + callback: (value: RenderSplatsViewportResponse) => void, + ) => renderSplatsViewport.watch(request, callback), + }, }), entity: (entityKey: string) => ({ pilot: { diff --git a/Aetheria.Rts.Web/Electron/aetheria-rts-local-documents.ts b/Aetheria.Rts.Web/Electron/aetheria-rts-local-documents.ts index 8b8fbcd39..a56640e41 100644 --- a/Aetheria.Rts.Web/Electron/aetheria-rts-local-documents.ts +++ b/Aetheria.Rts.Web/Electron/aetheria-rts-local-documents.ts @@ -13,6 +13,7 @@ import { aetheriaRuntimeLoadoutItemCommitSlots as itemSlots, aetheriaRuntimeLoadoutItemSlotCommitSlots as itemSlotSlots, aetheriaRuntimeRunCheckpointCommitSlots as runSlots, + aetheriaRuntimeSunVisualCommitSlots as sunVisualSlots, aetheriaRuntimeStarbridgeBaseStatusSlots as starbridgeBaseSlots, aetheriaRuntimeStarbridgeRuntimeRoleSlots as starbridgeRoleSlots, aetheriaRuntimeStarbridgeSessionSummaryDocumentSlots as starbridgeSummarySlots, @@ -33,6 +34,7 @@ import type { InventoryDocument, InventoryItem, ObjectsViewportResponse, + RenderSplatsViewportResponse, SelectedObjectDocument, SelectedObjectRequest, StarbridgeSessionDocument, @@ -132,6 +134,204 @@ export function buildGravityViewportDocumentFromFrame( }; } +export function buildRenderSplatsViewportDocumentFromFrame( + frameDocument: unknown, + request: ViewportRequest, +): RenderSplatsViewportResponse { + const frame = arr(frameDocument); + const run = arr(frame[frameSlots.run]); + const zones = list(run[runSlots.zones]); + const currentZoneIndex = num(run[runSlots.currentZoneIndex], -1); + const zone = zones.find(candidate => num(candidate[zoneSlots.zoneIndex], -1) === currentZoneIndex) ?? + zones[0] ?? + []; + const runId = str(run[runSlots.runId]) || "local-rts"; + const viewport = normalizeViewport(request); + const layers = defaultRenderSplatLayers(); + const layerIndices: ReadonlyMap = new Map(layers.map((layer, index) => [layer.layerKey, index] as const)); + const builder = new RenderSplatBuilder(); + const viewportCenterX = (viewport.minX + viewport.maxX) * 0.5; + const viewportCenterY = (viewport.minY + viewport.maxY) * 0.5; + const viewportHalfX = Math.max(0.0001, (viewport.maxX - viewport.minX) * 0.5); + const viewportHalfY = Math.max(0.0001, (viewport.maxY - viewport.minY) * 0.5); + const terrainDepth = num(zone[zoneSlots.gravityTerrainDepth]); + const terrainWaveFrequency = num(zone[zoneSlots.gravityTerrainWaveFrequency], 1); + + if (terrainDepth !== 0) { + builder.add({ + layerIndex: requiredLayerIndex(layerIndices, "gravity.height"), + centerX: viewportCenterX, + centerY: viewportCenterY, + halfExtentX: viewportHalfX, + halfExtentY: viewportHalfY, + channel: 1, + falloff: 0, + valueR: -terrainDepth, + valueA: 1, + sourceKey: "environment.gravity_terrain", + sourceKind: 2, + frequencyX: 3, + frequencyY: 3, + animationSpeed: terrainWaveFrequency * 0.025, + sourceFlags: 1, + }); + } + + builder.add({ + layerIndex: requiredLayerIndex(layerIndices, "fog.surface_height"), + centerX: viewportCenterX, + centerY: viewportCenterY, + halfExtentX: viewportHalfX, + halfExtentY: viewportHalfY, + channel: 4, + falloff: 0, + valueR: 1, + valueA: 1, + sourceKey: "environment.fog_surface_height", + sourceKind: 2, + frequencyX: 4, + frequencyY: 4, + animationSpeed: 0.015, + sourceFlags: 1, + }); + builder.add({ + layerIndex: requiredLayerIndex(layerIndices, "fog.patch_height"), + centerX: viewportCenterX, + centerY: viewportCenterY, + halfExtentX: viewportHalfX, + halfExtentY: viewportHalfY, + channel: 4, + falloff: 0, + valueR: 1, + valueA: 1, + sourceKey: "environment.fog_patch_height", + sourceKind: 2, + frequencyX: 9, + frequencyY: 9, + animationSpeed: 0.02, + sourceFlags: 1, + }); + builder.add({ + layerIndex: requiredLayerIndex(layerIndices, "fog.patch"), + centerX: viewportCenterX, + centerY: viewportCenterY, + halfExtentX: viewportHalfX, + halfExtentY: viewportHalfY, + channel: 4, + falloff: 0, + valueR: 1, + valueA: 1, + sourceKey: "environment.fog_patch", + sourceKind: 2, + frequencyX: 6, + frequencyY: 6, + animationSpeed: 0.01, + sourceFlags: 1, + }); + + for (const body of list(zone[zoneSlots.bodies])) { + if (!gravityInfluenceIntersectsViewport(body, viewport)) + continue; + + const radius = resolveGravityRadius(body); + const bodyKey = str(body[bodySlots.bodyKey]); + builder.add({ + layerIndex: requiredLayerIndex(layerIndices, "gravity.height"), + centerX: num(body[bodySlots.gravityInfluenceCenterX]), + centerY: num(body[bodySlots.gravityInfluenceCenterZ]), + halfExtentX: radius, + halfExtentY: radius, + channel: 1, + falloff: 3, + valueR: num(body[bodySlots.gravityWellDepth]), + valueA: 1, + sourceKey: bodyKey, + }); + + if (num(body[bodySlots.gravityWaveRadius]) > 0 && num(body[bodySlots.gravityWaveDepth]) !== 0) { + builder.add({ + layerIndex: requiredLayerIndex(layerIndices, "gravity.wave"), + centerX: num(body[bodySlots.gravityInfluenceCenterX]), + centerY: num(body[bodySlots.gravityInfluenceCenterZ]), + halfExtentX: num(body[bodySlots.gravityWaveRadius]), + halfExtentY: num(body[bodySlots.gravityWaveRadius]), + channel: 2, + falloff: 2, + valueR: num(body[bodySlots.gravityWaveDepth]), + valueG: num(body[bodySlots.gravityWaveSpeed]), + valueA: 1, + sourceKey: bodyKey, + }); + } + + if (str(body[bodySlots.kind]).toLowerCase().includes("sun")) { + const sunVisual = arr(body[bodySlots.sunVisual]); + const tintRadius = Math.max( + radius, + Math.max(32, num(body[bodySlots.bodyRadiusMultiplier]) * 70) * + Math.max(0.01, num(sunVisual[sunVisualSlots.lightRadiusMultiplier], 1)), + ); + builder.add({ + layerIndex: requiredLayerIndex(layerIndices, "fog.tint"), + centerX: num(body[bodySlots.gravityInfluenceCenterX]), + centerY: num(body[bodySlots.gravityInfluenceCenterZ]), + halfExtentX: tintRadius, + halfExtentY: tintRadius, + channel: 4, + falloff: 2, + valueR: num(sunVisual[sunVisualSlots.fogTintColorX]), + valueG: num(sunVisual[sunVisualSlots.fogTintColorY]), + valueB: num(sunVisual[sunVisualSlots.fogTintColorZ]), + valueA: 1, + sourceKey: bodyKey, + }); + } + } + + for (const entity of list(zone[zoneSlots.entities])) { + if (!isPlayerControlled(entity)) + continue; + + const visibility = Math.max(180, num(entity[entitySlots.visibility])); + const x = num(entity[entitySlots.positionX]); + const y = num(entity[entitySlots.positionZ]); + if (x + visibility < viewport.minX || + x - visibility > viewport.maxX || + y + visibility < viewport.minY || + y - visibility > viewport.maxY) { + continue; + } + + builder.add({ + layerIndex: requiredLayerIndex(layerIndices, "visibility.mask"), + centerX: x, + centerY: y, + halfExtentX: visibility, + halfExtentY: visibility, + channel: 0, + falloff: 2, + valueR: 1, + valueG: 1, + valueB: 1, + valueA: 1, + sourceKey: entityKey(runId, num(zone[zoneSlots.zoneIndex]), num(entity[entitySlots.entityIndex], -1)), + }); + } + + return { + schema: AetheriaRtsSchemas.renderSplatsViewport, + frameId: num(frame[frameSlots.frameId]), + publishedAtUtc: str(frame[frameSlots.publishedAtUtc]), + simulationTimeSeconds: num(frame[frameSlots.simulationTimeSeconds]), + runId, + zoneIndex: num(zone[zoneSlots.zoneIndex]), + zoneName: str(zone[zoneSlots.name]) || `Zone ${num(zone[zoneSlots.zoneIndex])}`, + viewport, + layers, + splats: builder.build(), + }; +} + export function buildSelectedObjectDocumentFromFrame( frameDocument: unknown, request: SelectedObjectRequest, @@ -437,6 +637,106 @@ function resolveGravityRadius(body: unknown[]): number { return Math.max(32, num(body[bodySlots.bodyRadiusMultiplier]) * 70); } +type RenderSplatRow = { + layerIndex: number; + centerX: number; + centerY: number; + halfExtentX: number; + halfExtentY: number; + rotationCos?: number; + rotationSin?: number; + channel: number; + falloff: number; + valueR?: number; + valueG?: number; + valueB?: number; + valueA?: number; + sourceKey: string; + sourceKind?: number; + frequencyX?: number; + frequencyY?: number; + phaseX?: number; + phaseY?: number; + animationSpeed?: number; + sourceFlags?: number; +}; + +class RenderSplatBuilder { + private readonly rows: RenderSplatRow[] = []; + + public add(row: RenderSplatRow): void { + this.rows.push(row); + } + + public build(): RenderSplatsViewportResponse["splats"] { + return { + count: this.rows.length, + centerX: this.rows.map(row => row.centerX), + centerY: this.rows.map(row => row.centerY), + halfExtentX: this.rows.map(row => row.halfExtentX), + halfExtentY: this.rows.map(row => row.halfExtentY), + rotationCos: this.rows.map(row => row.rotationCos ?? 1), + rotationSin: this.rows.map(row => row.rotationSin ?? 0), + channel: this.rows.map(row => row.channel), + falloff: this.rows.map(row => row.falloff), + valueR: this.rows.map(row => row.valueR ?? 0), + valueG: this.rows.map(row => row.valueG ?? 0), + valueB: this.rows.map(row => row.valueB ?? 0), + valueA: this.rows.map(row => row.valueA ?? 0), + sourceKey: this.rows.map(row => row.sourceKey), + layerIndex: this.rows.map(row => row.layerIndex), + sourceKind: this.rows.map(row => row.sourceKind ?? 0), + frequencyX: this.rows.map(row => row.frequencyX ?? 1), + frequencyY: this.rows.map(row => row.frequencyY ?? 1), + phaseX: this.rows.map(row => row.phaseX ?? 0), + phaseY: this.rows.map(row => row.phaseY ?? 0), + animationSpeed: this.rows.map(row => row.animationSpeed ?? 0), + sourceFlags: this.rows.map(row => row.sourceFlags ?? 0), + }; + } +} + +function defaultRenderSplatLayers(): RenderSplatsViewportResponse["layers"] { + return [ + layer("gravity.height", "Gravity Height", 1, "add", "R16_SFloat"), + layer("gravity.wave", "Gravity Wave", 2, "add", "R16_SFloat"), + layer("visibility.mask", "Visibility Mask", 0, "max", "R16_SFloat"), + layer("fog.surface_height", "Fog Surface Height", 4, "add", "R16_SFloat"), + layer("fog.patch_height", "Fog Patch Height", 4, "add", "R16_SFloat"), + layer("fog.patch", "Fog Patch", 4, "max", "R16_SFloat"), + layer("fog.tint", "Fog Tint", 4, "add", "B10G11R11_UFloatPack32"), + layer("influence.mask", "Influence", 3, "add", "R16_SFloat"), + ]; +} + +function layer( + layerKey: string, + displayName: string, + channel: number, + blendMode: string, + graphicsFormat: string, +): RenderSplatsViewportResponse["layers"][number] { + return { + layerKey, + displayName, + channel, + blendMode, + graphicsFormat, + clearBeforeDraw: true, + clearR: 0, + clearG: 0, + clearB: 0, + clearA: 0, + }; +} + +function requiredLayerIndex(layers: ReadonlyMap, key: string): number { + const index = layers.get(key); + if (index == null) + throw new Error(`Missing render splat layer ${key}.`); + return index; +} + function entityKey(runId: string, zoneIndex: number, entityIndex: number): string { return `global:aetheria.run_state.${runId}.zone.${zoneIndex}.entity.${entityIndex}.v1`; } diff --git a/Aetheria.Rts.Web/Electron/main.ts b/Aetheria.Rts.Web/Electron/main.ts index 4980d2bae..b39f69722 100644 --- a/Aetheria.Rts.Web/Electron/main.ts +++ b/Aetheria.Rts.Web/Electron/main.ts @@ -1,6 +1,6 @@ import { app, BrowserWindow, ipcMain, shell, type WebContents } from "electron"; import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process"; -import { createWriteStream, existsSync, mkdirSync, readFileSync, watch, writeFileSync, type FSWatcher } from "node:fs"; +import { createWriteStream, existsSync, mkdirSync, readdirSync, readFileSync, statSync, watch, writeFileSync, type FSWatcher } from "node:fs"; import { dirname, resolve } from "node:path"; import { fileURLToPath } from "node:url"; @@ -222,7 +222,19 @@ async function runElectronSmoke(window: BrowserWindow): Promise object.controlled) ?? viewport?.objects?.[0] ?? null; + const findComponent = (component, predicate) => { + if (!component || typeof component !== "object") return null; + if (predicate(component)) return component; + for (const child of component.children ?? []) { + const match = findComponent(child, predicate); + if (match) return match; + } + return null; + }; + const eveFieldSurface = findComponent(eveSurface?.surface?.root, component => + component.kind === "field.surface2d" || component.kind === "gravity.surface"); const eveReceipt = api ? await api.submitEveCommand({ providerId: "aetheria.daemon", surfaceId: "aetheria.game", @@ -235,6 +247,7 @@ async function runElectronSmoke(window: BrowserWindow): Promise): boolean { const surfaceCatalog = objectValue(result.surfaceCatalog); const surfaceCatalogIndex = objectValue(result.surfaceCatalogIndex); const viewport = objectValue(result.viewport); + const renderSplatsViewport = objectValue(result.renderSplatsViewport); const actor = objectValue(result.actor); + const eveFieldSurface = objectValue(result.eveFieldSurface); const eveReceipt = objectValue(result.eveReceipt); return result.hasApi === true && status.includes("Aetheria Daemon") && @@ -293,6 +310,16 @@ function isElectronSmokeReady(result: Record): boolean { authority?.policyId === "aetheria.trusted-coop.v1" && starbridge?.scenarioName === "Frontier Fabricator Defense" && arrayValue(viewport?.objects).length > 0 && + renderSplatsViewport?.schema === "gamecult.aetheria.render_splats_viewport.v1" && + arrayValue(renderSplatsViewport?.layers).some(layer => + objectValue(layer)?.layerKey === "fog.tint") && + stringValue(eveFieldSurface?.id).length > 0 && + arrayValue(eveFieldSurface?.embeddedDocuments).some(slot => + objectValue(slot)?.slotId === "renderSplats") && + arrayValue(eveFieldSurface?.embeddedDocuments).some(slot => + objectValue(slot)?.slotId === "gravity") && + arrayValue(eveFieldSurface?.embeddedDocuments).some(slot => + objectValue(slot)?.slotId === "objects") && stringValue(actor?.entityKey).length > 0 && surfaceCatalog?.catalogId === "gamecult.aetheria.rts.surfaces.v1" && arrayValue(surfaceCatalogIndex?.queries).length > 0 && @@ -538,12 +565,49 @@ function requireClient(): AetheriaCultMeshClient { } async function ensureDotnetBuild(): Promise { - if (existsSync(daemonDll)) + if (existsSync(daemonDll) && !daemonBuildInputsAreNewer(daemonDll)) return; await runProcess("dotnet", ["build", resolve(repoRoot, "Aetheria.State.Daemon", "Aetheria.State.Daemon.csproj")], "Aetheria.State.Daemon.build"); } +function daemonBuildInputsAreNewer(outputPath: string): boolean { + const outputMtime = statSync(outputPath).mtimeMs; + const sourceRoots = [ + resolve(repoRoot, "Aetheria.State.Daemon"), + resolve(repoRoot, "Aetheria.State"), + resolve(repoRoot, "Packages", "org.gamecult.aetheria.state", "Runtime"), + ]; + + return sourceRoots.some(sourceRoot => newestSourceMtime(sourceRoot) > outputMtime); +} + +function newestSourceMtime(root: string): number { + if (!existsSync(root)) + return 0; + + const stat = statSync(root); + if (stat.isFile()) + return isBuildInput(root) ? stat.mtimeMs : 0; + + let newest = 0; + for (const entry of readdirSync(root, { withFileTypes: true })) { + const path = resolve(root, entry.name); + if (entry.isDirectory()) { + if (entry.name === "bin" || entry.name === "obj") + continue; + newest = Math.max(newest, newestSourceMtime(path)); + } else if (entry.isFile() && isBuildInput(path)) { + newest = Math.max(newest, statSync(path).mtimeMs); + } + } + return newest; +} + +function isBuildInput(path: string): boolean { + return path.endsWith(".cs") || path.endsWith(".csproj") || path.endsWith(".props") || path.endsWith(".targets"); +} + function startDotnet(name: string, dllPath: string, args: string[]): ChildProcessWithoutNullStreams { mkdirSync(logsRoot, { recursive: true }); const child = spawn("dotnet", [dllPath, ...args], { diff --git a/Aetheria.Rts.Web/Electron/preload.cjs b/Aetheria.Rts.Web/Electron/preload.cjs index b6c2430ea..435aff32a 100644 --- a/Aetheria.Rts.Web/Electron/preload.cjs +++ b/Aetheria.Rts.Web/Electron/preload.cjs @@ -7,6 +7,7 @@ const channels = { mapViewport: "aetheria-rts:map-viewport", objectsViewport: "aetheria-rts:objects-viewport", gravityViewport: "aetheria-rts:gravity-viewport", + renderSplatsViewport: "aetheria-rts:render-splats-viewport", viewportFeed: "aetheria-rts:viewport-feed", viewportFeedStop: "aetheria-rts:viewport-feed-stop", viewportFeedUpdate: "aetheria-rts:viewport-feed-update", @@ -35,6 +36,7 @@ contextBridge.exposeInMainWorld("aetheriaRts", { mapViewport: request => ipcRenderer.invoke(channels.mapViewport, request), objectsViewport: request => ipcRenderer.invoke(channels.objectsViewport, request), gravityViewport: request => ipcRenderer.invoke(channels.gravityViewport, request), + renderSplatsViewport: request => ipcRenderer.invoke(channels.renderSplatsViewport, request), watchViewportFeed: (request, callback) => { const subscriptionId = `viewport-feed-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`; const listener = (_event, message) => { diff --git a/Aetheria.Rts.Web/scripts/generate-rts-bindings.mjs b/Aetheria.Rts.Web/scripts/generate-rts-bindings.mjs index 27b14be10..cbac53050 100644 --- a/Aetheria.Rts.Web/scripts/generate-rts-bindings.mjs +++ b/Aetheria.Rts.Web/scripts/generate-rts-bindings.mjs @@ -12,6 +12,7 @@ const sources = [ resolve(repoRoot, "Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeAssetDocuments.cs"), resolve(repoRoot, "Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeSnapshotDocuments.cs"), resolve(repoRoot, "Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeRtsViewportDocuments.cs"), + resolve(repoRoot, "Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeRenderSplatDocuments.cs"), resolve(repoRoot, "Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStarbridgeDocuments.cs"), resolve(repoRoot, "Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseAuthorityPolicy.cs"), ]; @@ -24,6 +25,7 @@ const ipcChannels = [ ["mapViewport", "aetheria-rts:map-viewport"], ["objectsViewport", "aetheria-rts:objects-viewport"], ["gravityViewport", "aetheria-rts:gravity-viewport"], + ["renderSplatsViewport", "aetheria-rts:render-splats-viewport"], ["viewportFeed", "aetheria-rts:viewport-feed"], ["viewportFeedStop", "aetheria-rts:viewport-feed-stop"], ["viewportFeedUpdate", "aetheria-rts:viewport-feed-update"], @@ -109,6 +111,19 @@ const documents = [ className: "AetheriaRuntimeGravityViewportDocument", schemaName: "gravityViewport", }, + { + exportName: "aetheriaRuntimeRenderSplatsViewportDocument", + className: "AetheriaRuntimeRenderSplatsViewportDocument", + schemaName: "renderSplatsViewport", + }, + { + exportName: "aetheriaRuntimeRenderSplatLayerDefinition", + className: "AetheriaRuntimeRenderSplatLayerDefinition", + }, + { + exportName: "aetheriaRuntimeRenderSplatSoa", + className: "AetheriaRuntimeRenderSplatSoa", + }, { exportName: "aetheriaRuntimeCurrentZoneDocument", className: "AetheriaRuntimeCurrentZoneDocument", @@ -189,6 +204,10 @@ const documents = [ exportName: "aetheriaRuntimeBodySnapshotCommit", className: "AetheriaRuntimeBodySnapshotCommit", }, + { + exportName: "aetheriaRuntimeSunVisualCommit", + className: "AetheriaRuntimeSunVisualCommit", + }, { exportName: "aetheriaRuntimeEntityStatGridCommit", className: "AetheriaRuntimeEntityStatGridCommit", @@ -502,9 +521,17 @@ export type AetheriaMenuSurfaceComponent = { props: Record; layout?: Record; style?: Record; + embeddedDocuments?: AetheriaMenuEmbeddedDocumentSlot[]; children: AetheriaMenuSurfaceComponent[]; }; +export type AetheriaMenuEmbeddedDocumentSlot = { + slotId: string; + documentId: string; + schemaId: string; + presentationKind: string; +}; + export type AetheriaMenuStyleToken = { name: string; value: string; @@ -520,6 +547,7 @@ export type AetheriaRtsMainClient = { mapViewport(request: CultMeshViewportRequest): Promise; objectsViewport(request: CultMeshViewportRequest): Promise; gravityViewport(request: CultMeshViewportRequest): Promise; + renderSplatsViewport(request: CultMeshViewportRequest): Promise; selectedObject(request: AetheriaRuntimeSelectedObjectRequest): Promise; inventory(request: AetheriaRuntimeSelectedObjectRequest): Promise; daemonHealth(): Promise; @@ -549,6 +577,8 @@ export function registerAetheriaRtsIpcHandlers( getClient().objectsViewport(request)); ipcMain.handle(AetheriaRtsIpcChannels.gravityViewport, async (_event, request: CultMeshViewportRequest) => getClient().gravityViewport(request)); + ipcMain.handle(AetheriaRtsIpcChannels.renderSplatsViewport, async (_event, request: CultMeshViewportRequest) => + getClient().renderSplatsViewport(request)); ipcMain.handle(AetheriaRtsIpcChannels.selectedObject, async (_event, request: AetheriaRuntimeSelectedObjectRequest) => getClient().selectedObject(request)); ipcMain.handle(AetheriaRtsIpcChannels.inventory, async (_event, request: AetheriaRuntimeSelectedObjectRequest) => @@ -605,6 +635,7 @@ export type AetheriaRuntimeRtsQueryExecutors = { mapViewport: AetheriaRuntimeViewportQueryExecutor; objectsViewport: AetheriaRuntimeViewportQueryExecutor; gravityViewport: AetheriaRuntimeViewportQueryExecutor; + renderSplatsViewport: AetheriaRuntimeViewportQueryExecutor; selectedObject: AetheriaRuntimeQueryExecutor; inventory: AetheriaRuntimeQueryExecutor; daemonHealth: AetheriaRuntimeQueryExecutor; @@ -617,6 +648,7 @@ export type AetheriaRuntimeRtsQueryWatchers = Partial<{ mapViewport: CultMeshQueryWatcher; objectsViewport: CultMeshQueryWatcher; gravityViewport: CultMeshQueryWatcher; + renderSplatsViewport: CultMeshQueryWatcher; selectedObject: CultMeshQueryWatcher; inventory: CultMeshQueryWatcher; daemonHealth: CultMeshQueryWatcher; @@ -746,6 +778,11 @@ export function createAetheriaRuntimeRtsQueryHandles( executors.gravityViewport, { routeHint, sources: [AetheriaRuntimeRtsDocumentSources.daemonFrame], watchQuery: watchers.gravityViewport }, ), + renderSplatsViewport: CultMesh.query( + AetheriaRtsSchemas.renderSplatsViewport, + executors.renderSplatsViewport, + { routeHint, sources: [AetheriaRuntimeRtsDocumentSources.daemonFrame], watchQuery: watchers.renderSplatsViewport }, + ), selectedObject: CultMesh.query( AetheriaRtsSchemas.selectedObject, executors.selectedObject, @@ -786,6 +823,7 @@ export function describeAetheriaRuntimeRtsQueryHandles( mapViewport: describeAetheriaRuntimeRtsQuerySurface(handles.mapViewport), objectsViewport: describeAetheriaRuntimeRtsQuerySurface(handles.objectsViewport), gravityViewport: describeAetheriaRuntimeRtsQuerySurface(handles.gravityViewport), + renderSplatsViewport: describeAetheriaRuntimeRtsQuerySurface(handles.renderSplatsViewport), selectedObject: describeAetheriaRuntimeRtsQuerySurface(handles.selectedObject), inventory: describeAetheriaRuntimeRtsQuerySurface(handles.inventory), daemonHealth: describeAetheriaRuntimeRtsQuerySurface(handles.daemonHealth), @@ -811,6 +849,7 @@ export function describeAetheriaRuntimeRtsSurfaceCatalog( CultMesh.describeSurface(handles.mapViewport), CultMesh.describeSurface(handles.objectsViewport), CultMesh.describeSurface(handles.gravityViewport), + CultMesh.describeSurface(handles.renderSplatsViewport), CultMesh.describeSurface(handles.selectedObject), CultMesh.describeSurface(handles.inventory), CultMesh.describeSurface(handles.daemonHealth), @@ -897,6 +936,7 @@ export function createAetheriaRuntimeRtsVerseHandles( const mapViewport = CultMesh.bindQuery(queryVerse, queries.mapViewport); const objectsViewport = CultMesh.bindQuery(queryVerse, queries.objectsViewport); const gravityViewport = CultMesh.bindQuery(queryVerse, queries.gravityViewport); + const renderSplatsViewport = CultMesh.bindQuery(queryVerse, queries.renderSplatsViewport); const selectedObject = CultMesh.bindQuery(queryVerse, queries.selectedObject); const inventory = CultMesh.bindQuery(queryVerse, queries.inventory); const daemonHealth = CultMesh.bindQuery(queryVerse, queries.daemonHealth); @@ -937,6 +977,14 @@ export function createAetheriaRuntimeRtsVerseHandles( callback: (value: GravityViewportResponse) => void, ) => gravityViewport.watch(request, callback), }, + renderSplats: { + within: (request: CultMeshViewportRequest) => + renderSplatsViewport.execute(request), + watchWithin: ( + request: CultMeshViewportRequest, + callback: (value: RenderSplatsViewportResponse) => void, + ) => renderSplatsViewport.watch(request, callback), + }, }), entity: (entityKey: string) => ({ pilot: { @@ -1140,9 +1188,17 @@ export type AetheriaMenuSurfaceComponent = { id: string; kind: string; props: Record; + embeddedDocuments?: AetheriaMenuEmbeddedDocumentSlot[]; children: AetheriaMenuSurfaceComponent[]; }; +export type AetheriaMenuEmbeddedDocumentSlot = { + slotId: string; + documentId: string; + schemaId: string; + presentationKind: string; +}; + export type AetheriaMenuStyleToken = { name: string; value: string; @@ -1158,6 +1214,7 @@ export type AetheriaRtsApi = { mapViewport(request: Viewport): Promise; objectsViewport(request: Viewport): Promise; gravityViewport(request: Viewport): Promise; + renderSplatsViewport(request: Viewport): Promise; selectedObject(request: AetheriaRuntimeSelectedObjectRequest): Promise; inventory(request: AetheriaRuntimeSelectedObjectRequest): Promise; daemonHealth(): Promise; @@ -1224,6 +1281,57 @@ export type GravityViewportResponse = { bodies: BodyView[]; }; +export type RenderSplatsViewportResponse = { + schema: string; + frameId: number; + publishedAtUtc: string; + simulationTimeSeconds: number; + runId: string; + zoneIndex: number; + zoneName: string; + viewport: ${viewportTypeName}; + layers: RenderSplatLayerDefinition[]; + splats: RenderSplatSoa; +}; + +export type RenderSplatLayerDefinition = { + layerKey: string; + displayName: string; + channel: number; + blendMode: string; + graphicsFormat: string; + clearBeforeDraw: boolean; + clearR: number; + clearG: number; + clearB: number; + clearA: number; +}; + +export type RenderSplatSoa = { + count: number; + centerX: number[]; + centerY: number[]; + halfExtentX: number[]; + halfExtentY: number[]; + rotationCos: number[]; + rotationSin: number[]; + channel: number[]; + falloff: number[]; + valueR: number[]; + valueG: number[]; + valueB: number[]; + valueA: number[]; + sourceKey: string[]; + layerIndex: number[]; + sourceKind: number[]; + frequencyX: number[]; + frequencyY: number[]; + phaseX: number[]; + phaseY: number[]; + animationSpeed: number[]; + sourceFlags: number[]; +}; + export type ViewObject = { entityIndex: number; entityKey: string; diff --git a/Aetheria.Rts.Web/scripts/verify-stage7c-electron-shell.ps1 b/Aetheria.Rts.Web/scripts/verify-stage7c-electron-shell.ps1 index 6991ab101..0f2437eba 100644 --- a/Aetheria.Rts.Web/scripts/verify-stage7c-electron-shell.ps1 +++ b/Aetheria.Rts.Web/scripts/verify-stage7c-electron-shell.ps1 @@ -21,15 +21,17 @@ if (-not $mainText.Contains('await api.surfaceCatalog()') -or -not $mainText.Con Write-Error "Stage 7C Electron shell verifier failed: Electron smoke does not call the preload CultMesh surface catalog APIs." } -if (-not $mainText.Contains('runtimeSurfaceDetails.includes("shared-memory")') -or -not $mainText.Contains('daemon:aetheria.frame.latest.v1')) { - Write-Error "Stage 7C Electron shell verifier failed: Electron smoke does not verify rendered CultMesh route/source metadata." +if (-not $mainText.Contains('await api.renderSplatsViewport') -or + -not $mainText.Contains('eveFieldSurface') -or + -not $mainText.Contains('embeddedDocuments') -or + -not $mainText.Contains('fog.tint')) { + Write-Error "Stage 7C Electron shell verifier failed: Electron smoke does not verify daemon Eve field document lowering." } -if (-not $mainText.Contains('await api.setMoveVector') -or - -not $mainText.Contains('moveReceipt?.commandId') -or - -not $mainText.Contains('moveReceipt?.operationId') -or - -not $mainText.Contains('moveReceipt?.accepted') -or - -not $mainText.Contains('moveReceipt?.route')) { +if (-not $mainText.Contains('await api.submitEveCommand') -or + -not $mainText.Contains('eveReceipt?.commandId') -or + -not $mainText.Contains('eveReceipt?.accepted') -or + -not $mainText.Contains('eveReceipt?.route')) { Write-Error "Stage 7C Electron shell verifier failed: Electron smoke does not verify typed operation receipts through preload." } diff --git a/GameCult.Aetheria.State.Unity.csproj b/GameCult.Aetheria.State.Unity.csproj index 9703cba7e..f044c398e 100644 --- a/GameCult.Aetheria.State.Unity.csproj +++ b/GameCult.Aetheria.State.Unity.csproj @@ -81,6 +81,7 @@ + diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonGameSurfaceBuilder.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonGameSurfaceBuilder.cs index 133cba452..2199e1ca4 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonGameSurfaceBuilder.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonGameSurfaceBuilder.cs @@ -30,6 +30,7 @@ namespace GameCult.Aetheria.State.Verse var entityName = string.IsNullOrWhiteSpace(entity?.Name) ? "(no current entity)" : entity!.Name; var surfaceChildren = new List { + GravityFieldSurface("aetheria.daemon.game.field"), Node( "aetheria.daemon.game.frame", "card", @@ -101,10 +102,8 @@ namespace GameCult.Aetheria.State.Verse updatedAtUtc: frame.PublishedAtUtc, surface: new AetheriaRuntimeSurfaceTree( SurfaceId, - Node( + SurfaceRoot( "aetheria.daemon.game.root", - "surface", - Array.Empty<(string Key, string Value)>(), surfaceChildren.ToArray()), Array.Empty()), commands: commandBoundary.Commands @@ -260,6 +259,143 @@ namespace GameCult.Aetheria.State.Verse return AetheriaRuntimeDaemonSurfaceCommandCatalog.CommandName(kind); } + private static AetheriaRuntimeSurfaceComponent GravityFieldSurface(string id) + { + var viewport = DefaultViewport(); + var renderSplatsDocumentId = ViewportDocumentId("aetheria.viewport.render_splats", viewport); + var gravityDocumentId = ViewportDocumentId("aetheria.viewport.gravity", viewport); + var objectsDocumentId = ViewportDocumentId("aetheria.viewport.objects", viewport); + var props = new[] + { + ("label", "Aetheria level field surface"), + ("minX", F(viewport.MinX)), + ("minY", F(viewport.MinY)), + ("maxX", F(viewport.MaxX)), + ("maxY", F(viewport.MaxY)), + ("fieldModel", "aetheria.fields2d.v1"), + ("scalarField", "gravity.height"), + ("scalarFieldSlot", "gravity"), + ("scalarFieldSchemaId", AetheriaRuntimeDaemonSchemas.GravityViewport), + ("scalarFieldDefaultVisualizer", "isolines.branchless"), + ("scalarFieldVisualizers", "isolines.branchless,height-shade,probe"), + ("scalarFieldLineInterval", "11.4398025"), + ("scalarFieldBaseColor", "0.002,0.006,0.012"), + ("scalarFieldGlowColor", "0.018,0.050,0.075"), + ("scalarFieldLowLineColor", "0.000,0.340,0.520"), + ("scalarFieldHighLineColor", "1.450,0.300,0.050"), + ("scalarFieldLowAngleColor", "0.060,0.160,0.240"), + ("scalarFieldHighAngleColor", "1.100,0.240,0.040"), + ("vectorField", "nebula.tint"), + ("vectorFieldSlot", "renderSplats"), + ("vectorFieldLayer", AetheriaRuntimeRenderSplatLayerKeys.FogTint), + ("vectorFieldSchemaId", AetheriaRuntimeDaemonSchemas.RenderSplatsViewport), + ("vectorFieldDefaultVisualizer", "color.powerpulse"), + ("vectorFieldVisualizers", "color.powerpulse,probe"), + ("vectorFieldTintScale", "0.45"), + ("objectFieldSlot", "objects"), + ("objectFieldSchemaId", AetheriaRuntimeDaemonSchemas.ObjectsViewport), + ("bodyIconMinPx", "24"), + ("sunIconMinPx", "34"), + ("bodyIconScale", "0.48"), + ("sunIconScale", "0.72"), + ("bodyLabelColor", "rgba(226, 244, 255, 0.82)"), + ("objectLabelFont", "700 12px Ubuntu, system-ui, sans-serif"), + ("objectLabelStroke", "rgba(0, 0, 0, 0.72)"), + ("objectLabelStrokeWidth", "3"), + ("objectControlledColor", "rgba(122, 240, 255, {alpha})"), + ("objectRaiderColor", "rgba(255, 143, 74, {alpha})"), + ("objectNeutralColor", "rgba(232, 232, 224, {alpha})"), + ("objectDefaultColor", "rgba(214, 244, 255, {alpha})"), + ("shipIconSizePx", "22"), + ("remoteShipIconSizePx", "18"), + ("stationIconSizePx", "34"), + ("renderSplatsDocumentId", renderSplatsDocumentId), + ("renderSplatsSchemaId", AetheriaRuntimeDaemonSchemas.RenderSplatsViewport), + ("gravityDocumentId", gravityDocumentId), + ("gravitySchemaId", AetheriaRuntimeDaemonSchemas.GravityViewport), + ("objectsDocumentId", objectsDocumentId), + ("objectsSchemaId", AetheriaRuntimeDaemonSchemas.ObjectsViewport), + ("samplesX", "196"), + ("shader", "aetheria.field-surface2d.v1"), + ("stateRefreshMs", "50") + }; + var normalizedProps = props.ToDictionary(prop => prop.Item1, prop => prop.Item2 ?? "", StringComparer.Ordinal); + return new AetheriaRuntimeSurfaceComponent( + id, + "field.surface2d", + normalizedProps, + Array.Empty(), + AetheriaRuntimeSurfaceStateBindings.FromProps(normalizedProps), + new[] + { + new AetheriaRuntimeEmbeddedDocumentSlot( + "renderSplats", + renderSplatsDocumentId, + AetheriaRuntimeDaemonSchemas.RenderSplatsViewport, + "data"), + new AetheriaRuntimeEmbeddedDocumentSlot( + "gravity", + gravityDocumentId, + AetheriaRuntimeDaemonSchemas.GravityViewport, + "data"), + new AetheriaRuntimeEmbeddedDocumentSlot( + "objects", + objectsDocumentId, + AetheriaRuntimeDaemonSchemas.ObjectsViewport, + "data") + }, + Layout( + ("position", "absolute"), + ("top", "0"), + ("right", "0"), + ("bottom", "0"), + ("left", "0"), + ("width", "100%"), + ("height", "100%")), + null); + } + + private static AetheriaRuntimeRtsViewportBounds DefaultViewport() + { + return new AetheriaRuntimeRtsViewportBounds + { + MinX = -1500, + MinY = -1000, + MaxX = 1500, + MaxY = 1000 + }; + } + + private static string ViewportDocumentId(string prefix, AetheriaRuntimeRtsViewportBounds viewport) + { + var normalized = AetheriaRuntimeRtsDocuments.Normalize(viewport); + return string.Join( + ".", + prefix, + ViewportToken(normalized.MinX), + ViewportToken(normalized.MinY), + ViewportToken(normalized.MaxX), + ViewportToken(normalized.MaxY)); + } + + private static string ViewportToken(double value) + { + return value + .ToString("0.###", CultureInfo.InvariantCulture) + .Replace('-', 'n') + .Replace('.', 'p'); + } + + private static IReadOnlyDictionary Layout(params (string Key, string Value)[] values) + { + return values.ToDictionary(value => value.Item1, value => value.Item2 ?? "", StringComparer.Ordinal); + } + + private static string F(double value) + { + return value.ToString("0.###", CultureInfo.InvariantCulture); + } + private static AetheriaRuntimeSurfaceComponent Metric(string id, string label, string value, string stateRef = "") { var props = string.IsNullOrWhiteSpace(stateRef) @@ -301,6 +437,30 @@ namespace GameCult.Aetheria.State.Verse return Node(id, "row", Array.Empty<(string Key, string Value)>(), children); } + private static AetheriaRuntimeSurfaceComponent SurfaceRoot( + string id, + params AetheriaRuntimeSurfaceComponent[] children) + { + var props = new Dictionary(StringComparer.Ordinal); + return new AetheriaRuntimeSurfaceComponent( + id, + "surface", + props, + children ?? Array.Empty(), + AetheriaRuntimeSurfaceStateBindings.FromProps(props), + Array.Empty(), + Layout( + ("position", "relative"), + ("overflow", "hidden"), + ("width", "100%"), + ("height", "100vh"), + ("minHeight", "100vh")), + new Dictionary + { + ["background"] = "#020606" + }); + } + private static AetheriaRuntimeSurfaceComponent Node( string id, string kind,