@adobe/data-gpu 0.10.20 → 0.10.21

package/dist/physics/solvers/rapier-solver-plugin.d.ts

@@ -577,7 +577,7 @@ export declare const rapierSolver: {
                 readonly unique: true;
                 readonly archetype: "Material";
             };
-        }, never>, row: import("../../material/public.js")) => Entity;
+        }, never, never>, row: import("../../material/public.js")) => Entity;
         readonly insertMaterialDefinition: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
             readonly material: {
                 readonly entity: true;
@@ -756,7 +756,7 @@ export declare const rapierSolver: {
                 readonly unique: true;
                 readonly archetype: "Material";
             };
-        }, never>, args: {
+        }, never, never>, args: {
             name: string;
             definition: import("../../material/material-definition.js").MaterialDefinition;
         }) => Entity;
@@ -938,7 +938,7 @@ export declare const rapierSolver: {
                 readonly unique: true;
                 readonly archetype: "Material";
             };
-        }, never>, defs: Readonly<Record<string, import("../../material/material-definition.js").MaterialDefinition>>) => void;
+        }, never, never>, defs: Readonly<Record<string, import("../../material/material-definition.js").MaterialDefinition>>) => void;
         readonly seedStandardMaterials: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
             readonly material: {
                 readonly entity: true;
@@ -1117,7 +1117,7 @@ export declare const rapierSolver: {
                 readonly unique: true;
                 readonly archetype: "Material";
             };
-        }, never>) => void;
+        }, never, never>) => void;
         readonly seedDefinitionMaterials: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
             readonly material: {
                 readonly entity: true;
@@ -1296,7 +1296,7 @@ export declare const rapierSolver: {
                 readonly unique: true;
                 readonly archetype: "Material";
             };
-        }, never>) => void;
+        }, never, never>) => void;
     } & {} & {} & {} & {
         readonly setFixedTimestep: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{}>, import("@adobe/data/schema").FromSchemas<{
             readonly physicsClock: {
@@ -1321,9 +1321,9 @@ export declare const rapierSolver: {
                 readonly default: GPUCommandEncoder | null;
                 readonly nonPersistent: true;
             };
-        }>, {}, {}, never>, hz: number) => void;
+        }>, {}, {}, never, never>, hz: number) => void;
     } & {} & {};
-    readonly systems: import("@adobe/data/ecs").SystemDeclarations<"_frameTime" | "update" | "schedulerSystem" | "input" | "preUpdate" | "postUpdate" | "physics" | "preRender" | "render" | "postRender" | "advancePhysicsClock" | "rapierStep">;
+    readonly systems: import("@adobe/data/ecs").SystemDeclarations<"update" | "_frameTime" | "schedulerSystem" | "input" | "preUpdate" | "postUpdate" | "physics" | "preRender" | "render" | "postRender" | "advancePhysicsClock" | "rapierStep">;
     readonly actions: {
         readonly pickRay: (db: Database<import("@adobe/data/schema").FromSchemas<{
             readonly bodyType: {
@@ -1791,7 +1791,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>, row: import("../../material/public.js")) => Entity;
+            }, never, never>, row: import("../../material/public.js")) => Entity;
             readonly insertMaterialDefinition: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
                 readonly material: {
                     readonly entity: true;
@@ -1970,7 +1970,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>, args: {
+            }, never, never>, args: {
                 name: string;
                 definition: import("../../material/material-definition.js").MaterialDefinition;
             }) => Entity;
@@ -2152,7 +2152,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>, defs: Readonly<Record<string, import("../../material/material-definition.js").MaterialDefinition>>) => void;
+            }, never, never>, defs: Readonly<Record<string, import("../../material/material-definition.js").MaterialDefinition>>) => void;
             readonly seedStandardMaterials: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
                 readonly material: {
                     readonly entity: true;
@@ -2331,7 +2331,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>) => void;
+            }, never, never>) => void;
             readonly seedDefinitionMaterials: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
                 readonly material: {
                     readonly entity: true;
@@ -2510,7 +2510,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>) => void;
+            }, never, never>) => void;
         }>, never, import("@adobe/data/ecs").ToActionFunctions<{}>, import("@adobe/data/ecs").FromServiceFactories<{}>, import("@adobe/data/ecs").FromComputedFactories<{}>, {} & {
             readonly materialByName: {
                 readonly key: "name";
@@ -2987,7 +2987,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>, row: import("../../material/public.js")) => Entity;
+            }, never, never>, row: import("../../material/public.js")) => Entity;
             readonly insertMaterialDefinition: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
                 readonly material: {
                     readonly entity: true;
@@ -3166,7 +3166,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>, args: {
+            }, never, never>, args: {
                 name: string;
                 definition: import("../../material/material-definition.js").MaterialDefinition;
             }) => Entity;
@@ -3348,7 +3348,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>, defs: Readonly<Record<string, import("../../material/material-definition.js").MaterialDefinition>>) => void;
+            }, never, never>, defs: Readonly<Record<string, import("../../material/material-definition.js").MaterialDefinition>>) => void;
             readonly seedStandardMaterials: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
                 readonly material: {
                     readonly entity: true;
@@ -3527,7 +3527,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>) => void;
+            }, never, never>) => void;
             readonly seedDefinitionMaterials: (t: import("@adobe/data/ecs").Store<import("@adobe/data/schema").FromSchemas<{
                 readonly material: {
                     readonly entity: true;
@@ -3706,7 +3706,7 @@ export declare const rapierSolver: {
                     readonly unique: true;
                     readonly archetype: "Material";
                 };
-            }, never>) => void;
+            }, never, never>) => void;
         }>, never, import("@adobe/data/ecs").ToActionFunctions<{}>, import("@adobe/data/ecs").FromServiceFactories<{}>, import("@adobe/data/ecs").FromComputedFactories<{}>, {} & {
             readonly materialByName: {
                 readonly key: "name";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/data-gpu",
-  "version": "0.10.20",
+  "version": "0.10.21",
   "description": "Adobe data WebGPU plugins and types for graphics and compute",
   "type": "module",
   "private": false,
@@ -12,7 +12,7 @@
   "dependencies": {
     "@dimforge/rapier3d-compat": "^0.19.3",
     "jolt-physics": "^1.0.0",
-    "@adobe/data": "0.10.20"
+    "@adobe/data": "0.10.21"
   },
   "devDependencies": {
     "@webgpu/types": "^0.1.61",

package/src/graphics/rendering/pbr-render/pbr-factor-render-plugin.ts

@@ -22,15 +22,37 @@ import {
 
 interface InstCache { buffer: GPUBuffer; indexBuffer: GPUBuffer; bindGroup: GPUBindGroup; capacity: number }
 
+interface StaticPrimDraw {
+    readonly primId: Entity;
+    readonly n: number;
+    readonly indexCount: number;
+    readonly indexFormat: GPUIndexFormat;
+    readonly vertexBuffer: GPUBuffer;
+    readonly indexBuffer: GPUBuffer;
+    readonly bindGroup: GPUBindGroup;
+}
+
 /**
  * pbrFactorRender — instanced primitive PBR from material factors only (no map
  * sampling). Extends `pbrIblRender` for IBL + skybox + optional glTF draws.
  * Pairs with `materialPaletteGpu` (`_paletteIndex` on factor materials).
  *
  * Pairs with `materialPaletteGpu` (`_paletteIndex`). Idle when no factor materials or drawables exist.
+ *
+ * Set resource `_pbrFactorStaticInstances = true` for fully static scenes
+ * (e.g. terrain heightfield): after drawable count stabilizes, skip per-frame
+ * TRS gather + instance buffer uploads and only re-issue drawIndexed.
  */
 export const pbrFactorRender = Database.Plugin.create({
     extends: Database.Plugin.combine(pbrIblRender, materialPaletteGpu, displayTransform),
+    resources: {
+        /**
+         * When true, instance matrices are uploaded once the drawable set is
+         * stable; later frames only rebind and draw. Clear or leave false for
+         * scenes that move/add bodies every frame.
+         */
+        _pbrFactorStaticInstances: { default: false as boolean, nonPersistent: true },
+    },
     systems: {
         pbrFactorPrimitiveRenderSystem: {
             schedule: { during: ["render"], after: ["beginRenderPass", "pbrIblRenderSystem"], before: ["endRenderPass"] },
@@ -54,10 +76,15 @@ export const pbrFactorRender = Database.Plugin.create({
                 let mats = new Float32Array(64 * 16);
                 const batches = new Map<Entity, MeshBatch>();
 
+                let staticDraws: StaticPrimDraw[] | null = null;
+                let staticDrawCount = -1;
+                let staticStableFrames = 0;
+
                 return () => {
                     const {
                         device, renderPassEncoder, canvasFormat, depthFormat, _sceneUniformsBuffer,
                         _factorPaletteBindGroup, _iblIrradiance, _iblPrefiltered, _iblBrdfLut,
+                        _pbrFactorStaticInstances,
                     } = db.store.resources;
                     if (!device || !renderPassEncoder || !_sceneUniformsBuffer || !_factorPaletteBindGroup) return;
                     if (!_iblIrradiance || !_iblPrefiltered || !_iblBrdfLut) return;
@@ -104,6 +131,21 @@ export const pbrFactorRender = Database.Plugin.create({
                         cachedIrradiance = _iblIrradiance;
                     }
 
+                    // Static path: re-draw without re-gather / re-upload.
+                    if (_pbrFactorStaticInstances && staticDraws != null && staticDraws.length > 0) {
+                        renderPassEncoder.setPipeline(pipeline);
+                        renderPassEncoder.setBindGroup(0, sceneBindGroup);
+                        renderPassEncoder.setBindGroup(1, _factorPaletteBindGroup);
+                        renderPassEncoder.setBindGroup(2, iblBindGroup);
+                        for (const d of staticDraws) {
+                            renderPassEncoder.setBindGroup(3, d.bindGroup);
+                            renderPassEncoder.setVertexBuffer(0, d.vertexBuffer);
+                            renderPassEncoder.setIndexBuffer(d.indexBuffer, d.indexFormat);
+                            renderPassEncoder.drawIndexed(d.indexCount, d.n);
+                        }
+                        return;
+                    }
+
                     let mc = 0;
                     for (const arch of db.store.queryArchetypes(["_paletteIndex"])) mc += arch.rowCount;
                     if (mc !== matCount) {
@@ -150,6 +192,8 @@ export const pbrFactorRender = Database.Plugin.create({
                     renderPassEncoder.setBindGroup(1, _factorPaletteBindGroup);
                     renderPassEncoder.setBindGroup(2, iblBindGroup);
 
+                    const nextStatic: StaticPrimDraw[] = [];
+
                     for (const arch of db.store.queryArchetypes(PRIMITIVE)) {
                         const vbs = arch.columns._vertexBuffer, ibs = arch.columns._indexBuffer;
                         const counts = arch.columns._indexCount, formats = arch.columns._indexFormat;
@@ -187,7 +231,37 @@ export const pbrFactorRender = Database.Plugin.create({
                             renderPassEncoder.setVertexBuffer(0, vbs.get(i)!);
                             renderPassEncoder.setIndexBuffer(ibs.get(i)!, formats.get(i));
                             renderPassEncoder.drawIndexed(counts.get(i), n);
+
+                            if (_pbrFactorStaticInstances) {
+                                nextStatic.push({
+                                    primId,
+                                    n,
+                                    indexCount: counts.get(i),
+                                    indexFormat: formats.get(i),
+                                    vertexBuffer: vbs.get(i)!,
+                                    indexBuffer: ibs.get(i)!,
+                                    bindGroup: entry.bindGroup,
+                                });
+                            }
+                        }
+                    }
+
+                    // Freeze only after the drawable set stops growing for one frame
+                    // (mesh resolve / material assign finish during the first seconds).
+                    if (_pbrFactorStaticInstances) {
+                        if (drawCount === staticDrawCount && drawCount > 0) {
+                            staticStableFrames++;
+                        } else {
+                            staticStableFrames = 0;
+                            staticDrawCount = drawCount;
+                        }
+                        if (staticStableFrames >= 1 && nextStatic.length > 0) {
+                            staticDraws = nextStatic;
                         }
+                    } else {
+                        staticDraws = null;
+                        staticStableFrames = 0;
+                        staticDrawCount = -1;
                     }
                 };
             },

package/src/graphics/rendering/pbr-render/physics-bridge-plugin.ts

@@ -13,23 +13,22 @@ import { boundsFromShapeMesh } from "../../scene/model/shape/bounds-from-shape-m
 import type { ColliderMesh } from "../../../physics/body/collider-mesh.js";
 import { interpolation } from "../interpolation-plugin.js";
 
-/** Authored column sets for primitive collider rows (RigidBody, ConvexBody,
- *  StaticCollider, MeshCollider). Query by these sets — not the named handle —
- *  so solver-tagged variants are found after migration. Rows with
- *  `voxelShapeName` are skipped at runtime (mechs voxel bodies). */
+/**
+ * Authored column sets for primitive collider rows still missing a render mesh.
+ * - exclude `mesh` → once assigned, rows drop out of the scan (O(pending) not O(all)).
+ * - exclude `voxelShapeName` → mechs voxel bodies use voxelShapeVisualBridge only
+ *   (never visit ~all static voxel colliders every frame).
+ */
 const PRIMITIVE_COLLIDER_QUERIES: readonly {
     include: readonly string[];
-    exclude?: readonly string[];
+    exclude: readonly string[];
 }[] = [
-    { include: RIGID_BODY_COMPONENTS, exclude: ["convexPoints"] },
-    { include: [...RIGID_BODY_COMPONENTS, "convexPoints"] },
-    { include: STATIC_COLLIDER_COMPONENTS, exclude: ["colliderMesh"] },
-    { include: [...STATIC_COLLIDER_COMPONENTS, "colliderMesh"] },
+    { include: RIGID_BODY_COMPONENTS, exclude: ["convexPoints", "voxelShapeName", "mesh"] },
+    { include: [...RIGID_BODY_COMPONENTS, "convexPoints"], exclude: ["voxelShapeName", "mesh"] },
+    { include: STATIC_COLLIDER_COMPONENTS, exclude: ["colliderMesh", "voxelShapeName", "mesh"] },
+    { include: [...STATIC_COLLIDER_COMPONENTS, "colliderMesh"], exclude: ["voxelShapeName", "mesh"] },
 ];
 
-const hasVoxelShapeName = (store: { read(id: Entity): Record<string, unknown> | null }, id: Entity): boolean =>
-    store.read(id)?.voxelShapeName != null;
-
 /**
  * physicsRenderBridge — assigns default primitive render meshes for standard
  * physics bodies whose visual is the collider primitive (RigidBody,
@@ -97,15 +96,13 @@ export const physicsRenderBridge = Database.Plugin.create({
                     for (const { include, exclude } of PRIMITIVE_COLLIDER_QUERIES) {
                         for (const arch of db.store.queryArchetypes(
                             include as typeof RIGID_BODY_COMPONENTS,
-                            exclude ? { exclude: exclude as ["convexPoints"] | ["colliderMesh"] } : undefined,
+                            { exclude: exclude as ["mesh"] },
                         )) {
                             const ids = arch.columns.id;
                             const css = arch.columns.colliderShape;
                             const hes = arch.columns.halfExtents;
                             for (let i = arch.rowCount - 1; i >= 0; i--) {
                                 const id = ids.get(i);
-                                if (hasVoxelShapeName(db.store, id)) continue;
-                                if (db.store.get(id, "mesh") != null) continue;
                                 const shape = css.get(i);
                                 const he = hes.get(i);
                                 let meshId: Entity;