@forgeax/engine-render 0.1.21 → 0.1.23

package/src/temporal/frame-coordinator.ts

@@ -70,6 +70,32 @@ export interface TemporalFrameReceipt<T = unknown> {
   readonly historyDirection: 'a-to-b' | 'b-to-a';
 }
 
+export type ReflectionFallbackTemporalReset =
+  | { readonly reset: false }
+  | { readonly reset: true; readonly reason: 'reflection-fallback-generation' };
+
+/** Maps committed producer generations into the existing temporal reset seam. */
+export function resolveReflectionFallbackTemporalReset(
+  previousGeneration: number | undefined,
+  nextGeneration: number | undefined,
+): ReflectionFallbackTemporalReset {
+  if (previousGeneration === undefined || nextGeneration === undefined) return { reset: false };
+  return previousGeneration === nextGeneration
+    ? { reset: false }
+    : { reset: true, reason: 'reflection-fallback-generation' };
+}
+
+/**
+ * Keeps SSR admission on the existing producer-generation reset seam. The
+ * admission path never allocates or resolves temporal history itself.
+ */
+export function resolveSsrAdmissionTemporalReset(
+  previousGeneration: number | undefined,
+  nextGeneration: number | undefined,
+): ReflectionFallbackTemporalReset {
+  return resolveReflectionFallbackTemporalReset(previousGeneration, nextGeneration);
+}
+
 function failure(code: TemporalFrameErrorCode, hint: string): TemporalFrameError {
   return {
     code,

package/src/temporal/frame.ts

@@ -44,6 +44,8 @@ export interface TemporalFrameTransaction {
   stage(input: TemporalFrameInput): void;
   commit(submit: TemporalSubmitResult): Result<TemporalFrame, TemporalFrameSubmitError>;
   snapshot(): TemporalFrame;
+  /** Drop accepted/staged history after a producer or device generation cut. */
+  reset(reason?: Extract<TemporalResetReason, 'signature-change' | 'device-recovery'>): void;
 }
 
 function copyInput(input: TemporalFrameInput): TemporalFrameInput {
@@ -82,6 +84,7 @@ export function createTemporalFrameTransaction(options: {
   let accepted: TemporalFrame | undefined;
   let staged: TemporalFrameInput | undefined;
   let historyEpoch = 0;
+  let pendingResetReason: Exclude<TemporalResetReason, 'none' | 'queue-submit-failed'> | undefined;
 
   return {
     stage(input) {
@@ -96,7 +99,7 @@ export function createTemporalFrameTransaction(options: {
         return err(new TemporalFrameSubmitError('queue-submit-failed'));
       }
 
-      const resetReason = submit.resetReason ?? staged.resetReason ?? 'none';
+      const resetReason = submit.resetReason ?? staged.resetReason ?? pendingResetReason ?? 'none';
       const shouldReset = resetReason !== 'none';
       if (shouldReset) historyEpoch += 1;
       const next: TemporalFrame = {
@@ -117,6 +120,7 @@ export function createTemporalFrameTransaction(options: {
       };
       accepted = next;
       staged = undefined;
+      pendingResetReason = undefined;
       return ok(copyFrame(next));
     },
     snapshot() {
@@ -124,5 +128,14 @@ export function createTemporalFrameTransaction(options: {
         throw new Error('TemporalFrame snapshot is unavailable before commit');
       return copyFrame(accepted);
     },
+    reset(reason = 'signature-change') {
+      accepted = undefined;
+      staged = undefined;
+      historyEpoch += 1;
+      // The reason is carried into the next accepted frame while clearing the
+      // committed frame prevents stale motion vectors from crossing the
+      // producer/device boundary.
+      pendingResetReason = reason;
+    },
   };
 }

package/src/temporal/view.ts

@@ -38,6 +38,8 @@ export interface TemporalViewInput {
   readonly historyValid?: boolean;
   readonly currentUnjitteredViewProjection?: ArrayLike<number> | undefined;
   readonly previousUnjitteredViewProjection?: ArrayLike<number> | undefined;
+  readonly currentCameraPosition?: readonly [number, number, number] | undefined;
+  readonly previousCameraPosition?: readonly [number, number, number] | undefined;
   readonly resetReason?: TemporalResetReason | undefined;
 }
 
@@ -55,6 +57,8 @@ interface TemporalViewSnapshot {
   readonly historyValid: boolean;
   readonly currentUnjitteredViewProjection: ArrayLike<number> | undefined;
   readonly previousUnjitteredViewProjection: ArrayLike<number> | undefined;
+  readonly currentCameraPosition: readonly [number, number, number] | undefined;
+  readonly previousCameraPosition: readonly [number, number, number] | undefined;
   readonly resetReason: TemporalResetReason | undefined;
 }
 
@@ -70,6 +74,9 @@ export interface TemporalView {
   /** Unjittered matrices are supplied by the renderer projection owner. */
   readonly currentUnjitteredViewProjection: ArrayLike<number> | undefined;
   readonly previousUnjitteredViewProjection: ArrayLike<number> | undefined;
+  /** Camera origins follow the same accepted-submit boundary as the matrices. */
+  readonly currentCameraPosition: readonly [number, number, number] | undefined;
+  readonly previousCameraPosition: readonly [number, number, number] | undefined;
   readonly currentProjection: 'jittered' | 'unjittered';
   readonly previousProjection: 'unjittered';
   readonly historyRequired: boolean;
@@ -112,6 +119,8 @@ export function createTemporalView(input: TemporalViewInput): TemporalView {
     historyValid: input.historyValid ?? false,
     currentUnjitteredViewProjection: input.currentUnjitteredViewProjection,
     previousUnjitteredViewProjection: input.previousUnjitteredViewProjection,
+    currentCameraPosition: input.currentCameraPosition,
+    previousCameraPosition: input.previousCameraPosition,
     resetReason: input.resetReason,
   });
   const taa = input.antialias === 'taa';
@@ -135,6 +144,8 @@ export function createTemporalView(input: TemporalViewInput): TemporalView {
     temporalFrameIndex: frameIndex,
     currentUnjitteredViewProjection: input.currentUnjitteredViewProjection,
     previousUnjitteredViewProjection: input.previousUnjitteredViewProjection,
+    currentCameraPosition: input.currentCameraPosition,
+    previousCameraPosition: input.previousCameraPosition,
     currentProjection: taa ? 'jittered' : 'unjittered',
     previousProjection: 'unjittered',
     historyRequired: taa,

package/src/tilemap-chunk-extract-system.ts

@@ -57,7 +57,7 @@ import {
 import type { EntityHandle, World } from '@forgeax/engine-ecs';
 import { decodeTileBits } from '@forgeax/engine-graphics-extras';
 import { type box3, frustum, mat4 } from '@forgeax/engine-math';
-import { ChildOf, Children, Transform } from '@forgeax/engine-scene';
+import { ChildOf, Children, GlobalTransform, Transform } from '@forgeax/engine-scene';
 import {
   type Handle,
   type MaterialAsset,
@@ -874,13 +874,13 @@ function bucketTileLayer(
  * cull paths use byte-identical planes (charter P4 consistent abstraction).
  */
 function buildCameraFrustumPlanes(world: World): frustum.Frustum | null {
-  const query = world.query({ with: [Camera, Transform] }).unwrap();
+  const query = world.query({ with: [Camera, Transform, GlobalTransform] }).unwrap();
   let result: frustum.Frustum | null = null;
   for (const row of query) {
     const camEntity = row.entity;
 
     const camRes = world.get(camEntity, Camera);
-    const trRes = world.get(camEntity, Transform);
+    const trRes = world.get(camEntity, GlobalTransform);
     if (!camRes.ok || !trRes.ok) continue;
 
     const cam = camRes.value;
@@ -1081,7 +1081,7 @@ function evictDeadPerCellStreamingCaches(work: readonly LayerWork[], world: Worl
 /**
  * Walk every TileLayer ChildOf-ing a Tilemap, extract its non-zero cells
  * into derived render entities. A Renderer attaches this system to FrameEnd;
- * World's final publication then resolves newly-created Transform.world values before the
+ * World's final publication then resolves newly-created GlobalTransform.world values before the
  * read-only render walk begins.
  *
  * Two paths based on `TileLayer.sortScope`:

package/src/typed-render-graph-primitives.ts

@@ -34,6 +34,7 @@ import {
 } from './render-graph-primitives';
 import type { RenderPipelineFrame, RenderPipelineGpuDrivenProjection } from './render-pipeline';
 import { createRenderPipelineTarget, type RenderPipelineTarget } from './render-pipeline';
+import type { OcclusionFrameProjection } from './scene/visibility/occlusion-runtime';
 import {
   getTemporalBindGroupResources,
   getTemporalGpuState,
@@ -136,6 +137,7 @@ export interface TypedScenePassOptions {
   readonly transmissionBackdrop?: GraphTextureView | undefined;
   readonly extraAccesses?: readonly GraphAccess[] | undefined;
   readonly gpuDriven?: RenderPipelineGpuDrivenProjection | undefined;
+  readonly occlusion?: OcclusionFrameProjection | undefined;
 }
 
 export function addTypedScenePass(
@@ -187,6 +189,7 @@ export function addTypedScenePass(
       stencilLoadOp: options.depthLoadOp ?? 'clear',
       stencilStoreOp: 'store',
     },
+    occlusionQuerySet: options.occlusion?.querySet,
     encode: ({ pass, frame, resources }) => {
       const colorViews = colorTargets.map((target) => resolvedView(resources, target.view));
       const depthView = resolvedView(resources, options.depth.view);
@@ -228,13 +231,23 @@ export function addTypedScenePass(
       if (groups.viewBindGroup !== null) {
         options.gpuDriven?.encode(groups.viewBindGroup, pass, resources);
       }
+      // The context carries the frame's primary occlusion projection for
+      // pipeline construction, but only the pass that owns that projection
+      // may begin its query. Forwarding it to deferred/temporal scene passes
+      // leaves their descriptors without an occlusionQuerySet and makes Dawn
+      // reject beginOcclusionQuery in those passes.
+      const activeOcclusion = options.occlusion;
       encodeMainPass(
         {
           ...internal,
+          ...(activeOcclusion === undefined ? {} : { occlusion: activeOcclusion }),
           geometryColorView: colorViews[0] ?? null,
           geometryDepthView: depthView,
           geometryColorResolveView: resolveView,
           transparentColorFormat: colorTargets[0]?.format as GPUTextureFormat,
+          ...(colorTargets[1]?.format === 'rgba16float'
+            ? { reflectionFallbackColorFormat: 'rgba16float' as const }
+            : {}),
           msaaActive: colorTargets[0]?.sampleCount === 4,
           viewBindGroup: groups.viewBindGroup,
           meshBindGroup: groups.meshBindGroup,
@@ -256,6 +269,10 @@ export function addTypedScenePass(
             : { transmissionBackdropView: transmissionBackdrop }),
         },
       );
+      if (activeOcclusion !== undefined) {
+        const proxyResult = activeOcclusion.encodeProxyBounds(pass);
+        if (!proxyResult.ok) throw proxyResult.error;
+      }
     },
   });
 }
@@ -291,6 +308,37 @@ export function addTypedFrameObservationPass(
   });
 }
 
+/** Publish the same-frame fallback MRT as a detached, copy-readable source. */
+export function addReflectionFallbackObservationPass(
+  graph: RenderGraphBuilder<RenderPipelineFrame>,
+  target: RenderPipelineTarget,
+): Result<void, RenderGraphError> {
+  return graph.addCopyPass('reflection-fallback-observation', {
+    accesses: [{ resource: target.view, usage: 'copy-src' }],
+    encode: ({ frame, resources }) => {
+      const internal = frame as _InternalRenderPipelineContext;
+      const texture = resources.texture(target.texture);
+      if (!texture.ok) throw texture.error;
+      internal.frameState.reflectionFallbackObservationSource = {
+        texture: texture.value,
+        descriptor: {
+          texture: texture.value,
+          format: target.format,
+          size: { width: frame.targetW, height: frame.targetH },
+          usage:
+            GPU_TEXTURE_USAGE_COPY_SRC |
+            GPU_TEXTURE_USAGE_RENDER_ATTACHMENT |
+            GPU_TEXTURE_USAGE_TEXTURE_BINDING,
+          sample: target.sampleCount,
+        },
+        frameId: internal.frameState.frameNumber,
+        pipelineId: 'forgeax::standard',
+        backendId: internal.runtime.device.caps.backendKind,
+      };
+    },
+  });
+}
+
 export interface TypedBloomTargets {
   readonly scene: RenderPipelineTarget;
   readonly composited: RenderPipelineTarget;

package/src/volume/passes.ts

@@ -2,8 +2,8 @@ import type {
   GraphBuffer,
   GraphTextureView,
   RenderGraphBuilder,
-  RenderGraphError,
 } from '@forgeax/engine-render-graph';
+import { RenderGraphError } from '@forgeax/engine-render-graph';
 import type {
   BindGroup,
   BindGroupLayout,
@@ -14,18 +14,10 @@ import type {
   TextureView,
 } from '@forgeax/engine-rhi';
 import { RhiError } from '@forgeax/engine-rhi';
-import { ok, type Result } from '@forgeax/engine-types';
+import { err, ok, type Result } from '@forgeax/engine-types';
 import { GPU_TEXTURE_USAGE_TEXTURE_BINDING } from '../gpu-texture-usage';
-import {
-  GPU_BUFFER_USAGE_COPY_DST,
-  GPU_BUFFER_USAGE_STORAGE,
-  GPU_BUFFER_USAGE_UNIFORM,
-} from '../gpu-usage';
-import {
-  LIGHT_ARRAY_HEADER_BYTES,
-  LIGHT_ARRAY_MAX_SLOTS,
-  SPOT_LIGHT_STD430_BYTES,
-} from '../light-buffer-layout';
+import { GPU_BUFFER_USAGE_COPY_DST, GPU_BUFFER_USAGE_UNIFORM } from '../gpu-usage';
+import type { StandardClusterGraphBuffers } from '../pipeline/standard-lighting/graph';
 import { VIEW_UNIFORM_BYTES } from '../record/view-ubo';
 import type { VolumetricFogFrameContext, VolumetricFogShaderSources } from '../render-contract';
 import type {
@@ -91,8 +83,10 @@ export interface VolumetricFogPassInputs {
   readonly view: GraphBuffer;
   readonly directionalShadow?: GraphTextureView;
   readonly spotShadow: GraphTextureView;
-  readonly pointLights: GraphBuffer;
-  readonly spotLights: GraphBuffer;
+  /** The single Standard Cluster light payload consumed by all volume stages. */
+  readonly lightData: GraphBuffer;
+  /** The Cluster uniform carries the admitted light count for slot guards. */
+  readonly clusterUniform: GraphBuffer;
   readonly selectedLightKind: 'directional' | 'point' | 'spot';
   readonly projector?: GraphTextureView;
 }
@@ -169,10 +163,26 @@ function importVolumeInputs(
   directionalShadow: GraphTextureView | undefined,
   spotShadow: GraphTextureView,
   selectedLightKind: 'directional' | 'point' | 'spot' | undefined,
+  clusterBuffers: StandardClusterGraphBuffers | null,
 ): Result<ImportedVolumeInputs | undefined, RenderGraphError> {
   const volume = topology.volumetricFog;
   if (volume?.enabled !== true || volume.format === undefined || volume.extent === undefined)
     return ok(undefined);
+  if (clusterBuffers === null) {
+    return err(
+      new RenderGraphError({
+        code: 'resource-descriptor-invalid',
+        expected: 'volumetric fog consumes the Standard Cluster light buffers',
+        hint: 'enable the storage-backed Standard Cluster transport before enabling volumetric fog',
+        detail: {
+          resourceLabel: 'volumetric-fog',
+          field: 'clusterBuffers',
+          expected: 'StandardClusterGraphBuffers',
+          actual: 'missing',
+        },
+      }),
+    );
+  }
   const texture = graph.importTexture(
     'volume-density',
     {
@@ -218,21 +228,6 @@ function importVolumeInputs(
     (frame) => frame.pipelineState.viewUniformBuffer,
   );
   if (!view.ok) return view;
-  const spotLights = graph.importBuffer(
-    'volume-spot-lights',
-    {
-      size: LIGHT_ARRAY_HEADER_BYTES + LIGHT_ARRAY_MAX_SLOTS * SPOT_LIGHT_STD430_BYTES,
-      usage: GPU_BUFFER_USAGE_STORAGE | GPU_BUFFER_USAGE_COPY_DST,
-    },
-    (frame) => frame.pipelineState.spotLightsBuffer,
-  );
-  if (!spotLights.ok) return spotLights;
-  const pointLights = graph.importBuffer(
-    'volume-point-lights',
-    { size: 16 + 4 * 32, usage: GPU_BUFFER_USAGE_STORAGE | GPU_BUFFER_USAGE_COPY_DST },
-    (frame) => frame.pipelineState.pointLightsBuffer,
-  );
-  if (!pointLights.ok) return pointLights;
   let projector: GraphTextureView | undefined;
   if (volume.projector !== undefined) {
     const projectorTexture = graph.importTexture(
@@ -270,8 +265,8 @@ function importVolumeInputs(
     view: view.value,
     ...(directionalShadow === undefined ? {} : { directionalShadow }),
     spotShadow,
-    pointLights: pointLights.value,
-    spotLights: spotLights.value,
+    lightData: clusterBuffers.lightData,
+    clusterUniform: clusterBuffers.clusterUniform,
     selectedLightKind: selectedLightKind ?? 'directional',
     ...(projector === undefined ? {} : { projector }),
   });
@@ -283,6 +278,7 @@ export function addAuthoredVolumetricFogPasses(
   sceneDepth: GraphTextureView,
   directionalShadow: GraphTextureView | undefined,
   spotShadow: GraphTextureView,
+  clusterBuffers: StandardClusterGraphBuffers | null,
 ): Result<void, RenderGraphError> {
   // A paired Point+Spot volume stores the Spot shadow lane as well. The
   // topology's primary light remains PointLight for radiance selection, but
@@ -300,6 +296,7 @@ export function addAuthoredVolumetricFogPasses(
     directionalShadow,
     spotShadow,
     shadowLightKind,
+    clusterBuffers,
   );
   if (!imported.ok) return imported;
   if (imported.value === undefined) return ok(undefined);
@@ -342,8 +339,8 @@ export function addVolumetricFogPasses(
         resource: shadowResource,
         usage: 'sampled-read',
       },
-      { resource: inputs.spotLights, usage: 'storage-read' },
-      { resource: inputs.pointLights, usage: 'storage-read' },
+      { resource: inputs.lightData, usage: 'storage-read' },
+      { resource: inputs.clusterUniform, usage: 'uniform-read' },
       ...(inputs.projector === undefined
         ? []
         : [{ resource: inputs.projector, usage: 'sampled-read' as const }]),
@@ -365,19 +362,19 @@ export function addVolumetricFogPasses(
           },
         },
         { binding: 7, visibility: 4, buffer: { type: 'read-only-storage' } },
-        { binding: 8, visibility: 4, buffer: { type: 'read-only-storage' } },
+        { binding: 8, visibility: 4, buffer: { type: 'uniform' } },
       ]);
       const shadow = resources.textureView(shadowResource);
       const params = resources.buffer(inputs.params);
       const view = resources.buffer(inputs.view);
-      const spotLights = resources.buffer(inputs.spotLights);
-      const pointLights = resources.buffer(inputs.pointLights);
+      const lightData = resources.buffer(inputs.lightData);
+      const clusterUniform = resources.buffer(inputs.clusterUniform);
       const froxel = resources.textureView(inputs.resources.froxelView);
       if (!shadow.ok) throw shadow.error;
       if (!params.ok) throw params.error;
       if (!view.ok) throw view.error;
-      if (!spotLights.ok) throw spotLights.error;
-      if (!pointLights.ok) throw pointLights.error;
+      if (!lightData.ok) throw lightData.error;
+      if (!clusterUniform.ok) throw clusterUniform.error;
       if (!froxel.ok) throw froxel.error;
       const shadowSampler = frame.runtime.device.createSampler({ compare: 'less' });
       if (!shadowSampler.ok) throw shadowSampler.error;
@@ -387,8 +384,8 @@ export function addVolumetricFogPasses(
         { binding: 4, resource: { kind: 'sampler', value: shadowSampler.value } },
         { binding: 5, resource: { kind: 'buffer', value: { buffer: params.value } } },
         { binding: 6, resource: { kind: 'textureView', value: froxel.value as never } },
-        { binding: 7, resource: { kind: 'buffer', value: { buffer: spotLights.value } } },
-        { binding: 8, resource: { kind: 'buffer', value: { buffer: pointLights.value } } },
+        { binding: 7, resource: { kind: 'buffer', value: { buffer: lightData.value } } },
+        { binding: 8, resource: { kind: 'buffer', value: { buffer: clusterUniform.value } } },
       ]);
       pass.setPipeline(inject.pipeline);
       pass.setBindGroup(0, bindings);
@@ -406,8 +403,8 @@ export function addVolumetricFogPasses(
       { resource: inputs.resources.temporalView, usage: 'storage-write' },
       { resource: inputs.params, usage: 'uniform-read' },
       { resource: inputs.view, usage: 'uniform-read' },
-      { resource: inputs.spotLights, usage: 'storage-read' },
-      { resource: inputs.pointLights, usage: 'storage-read' },
+      { resource: inputs.lightData, usage: 'storage-read' },
+      { resource: inputs.clusterUniform, usage: 'uniform-read' },
       ...(inputs.projector === undefined
         ? []
         : [{ resource: inputs.projector, usage: 'sampled-read' as const }]),
@@ -449,7 +446,7 @@ export function addVolumetricFogPasses(
           },
         },
         { binding: 10, visibility: 4, buffer: { type: 'read-only-storage' } },
-        { binding: 11, visibility: 4, buffer: { type: 'read-only-storage' } },
+        { binding: 11, visibility: 4, buffer: { type: 'uniform' } },
         { binding: 12, visibility: 4, texture: { sampleType: 'float', viewDimension: '2d' } },
         { binding: 13, visibility: 4, sampler: { type: 'filtering' } },
       ]);
@@ -461,8 +458,8 @@ export function addVolumetricFogPasses(
       const temporalSeed = resources.textureView(inputs.resources.temporalView);
       const params = resources.buffer(inputs.params);
       const view = resources.buffer(inputs.view);
-      const spotLights = resources.buffer(inputs.spotLights);
-      const pointLights = resources.buffer(inputs.pointLights);
+      const lightData = resources.buffer(inputs.lightData);
+      const clusterUniform = resources.buffer(inputs.clusterUniform);
       const projector =
         inputs.projector === undefined ? undefined : resources.textureView(inputs.projector);
       if (!froxel.ok) throw froxel.error;
@@ -473,8 +470,8 @@ export function addVolumetricFogPasses(
       if (!temporalSeed.ok) throw temporalSeed.error;
       if (!params.ok) throw params.error;
       if (!view.ok) throw view.error;
-      if (!spotLights.ok) throw spotLights.error;
-      if (!pointLights.ok) throw pointLights.error;
+      if (!lightData.ok) throw lightData.error;
+      if (!clusterUniform.ok) throw clusterUniform.error;
       if (projector !== undefined && !projector.ok) throw projector.error;
       const sampler = frame.runtime.device.createSampler({
         minFilter: 'linear',
@@ -500,8 +497,8 @@ export function addVolumetricFogPasses(
         { binding: 7, resource: { kind: 'sampler', value: densitySampler.value } },
         { binding: 8, resource: { kind: 'textureView', value: historySeed.value as never } },
         { binding: 9, resource: { kind: 'textureView', value: temporalSeed.value as never } },
-        { binding: 10, resource: { kind: 'buffer', value: { buffer: spotLights.value } } },
-        { binding: 11, resource: { kind: 'buffer', value: { buffer: pointLights.value } } },
+        { binding: 10, resource: { kind: 'buffer', value: { buffer: lightData.value } } },
+        { binding: 11, resource: { kind: 'buffer', value: { buffer: clusterUniform.value } } },
         {
           binding: 12,
           resource: {