@woosh/meep-engine 3.23.0 → 3.24.0

package/src/shade/renderer/scene/bvh/StaticSceneBVH.d.ts

@@ -10,12 +10,20 @@ export class StaticSceneBVH {
      *
      * @type {Map<number, Mesh>}
      */
-    inverse_lookup: Map<number, Mesh>;
     /**
+     * The primitive behind each leaf's user data.
      *
-     * @param {Scene} scene
+     * @type {Map<number, StaticSceneInstance>}
      */
-    build(scene: Scene): void;
+    inverse_lookup: Map<number, StaticSceneInstance>;
+    /**
+     * Build the tree over every primitive the scene draws: the mesh rows of its context, each
+     * under the world transform its entity carries — the ECS's own composition, which is exact for
+     * a scene the CPU places, and what a CPU bake of a static scene wants.
+     *
+     * @param {GPUSceneContext} scene_context
+     */
+    build(scene_context: GPUSceneContext): void;
     /**
      * Note: will produce incorrect results for non-uniformly scaled meshes
      * @param {SurfacePoint3} hit
@@ -55,6 +63,19 @@ export class StaticSceneBVH {
         distance: number;
     }[], ray: Ray3): number;
 }
+export type GPUSceneContext = import("../GPUSceneContext.js").GPUSceneContext;
+export type MeshletGeometry = import("../../geometry/MeshletGeometry.js").MeshletGeometry;
+export type ShadeMaterial = import("../../material/ShadeMaterial.js").ShadeMaterial;
+/**
+ * One primitive as the tree holds it: the entity it stands at, what it draws and with what, and a
+ * view over the world matrix its entity carries.
+ */
+export type StaticSceneInstance = {
+    entity: number;
+    geometry: MeshletGeometry;
+    material: ShadeMaterial;
+    matrix: Float64Array;
+};
 import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
 import { BinaryUint32BVH } from "../../../../core/bvh2/binary/2/BinaryUint32BVH.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";

package/src/shade/renderer/scene/bvh/StaticSceneBVH.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StaticSceneBVH.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/scene/bvh/StaticSceneBVH.js"],"names":[],"mappings":"AA4DA;IAEI,kBAAyB;IAEzB;;;OAGG;IACH,cAFU,cAAc,eAAe,CAAC,CAEf;IAEzB,gCAA6B;IAE7B;;;OAGG;IACH,gBAFU,IAAI,MAAM,OAAO,CAEA;IAG3B;;;OAGG;IACH,0BA2DC;IAED;;;;;;;OAOG;IACH,qCANW,aAAa,KACb,MAAM,KACN,MAAM,KACN,MAAM,GACJ,OAAO,CAqJnB;IAED;;;;;;;;;OASG;IACH,mCARW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,OAAO,CAmEnB;IAGD;;;;;OAKG;IACH,qBAJW,aAAa,OACb,IAAI,GACF,OAAO,CA2GnB;IAED;;;;;OAKG;IACH,iBAJW;QAAC,GAAG,EAAE,aAAa,CAAC;QAAC,IAAI,OAAM;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,EAAE,OACnD,IAAI,GACH,MAAM,CAmEjB;CAGJ;oBA7iBM,mCAAmC;gCARV,mDAAmD;8BA0BrD,2CAA2C;qBADpD,sCAAsC"}
+{"version":3,"file":"StaticSceneBVH.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/scene/bvh/StaticSceneBVH.js"],"names":[],"mappings":"AA6EA;IAEI,kBAAyB;IAEzB;;;OAGG;IACH,cAFU,cAAc,eAAe,CAAC,CAEf;IAEzB,gCAA6B;IAE7B;;;OAGG;IACH;;;;OAIG;IACH,gBAFU,IAAI,MAAM,EAAE,mBAAmB,CAAC,CAEf;IAG3B;;;;;;OAMG;IACH,qBAFW,eAAe,QA4EzB;IAED;;;;;;;OAOG;IACH,qCANW,aAAa,KACb,MAAM,KACN,MAAM,KACN,MAAM,GACJ,OAAO,CAqJnB;IAED;;;;;;;;;OASG;IACH,mCARW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,OAAO,CAmEnB;IAGD;;;;;OAKG;IACH,qBAJW,aAAa,OACb,IAAI,GACF,OAAO,CA2GnB;IAED;;;;;OAKG;IACH,iBAJW;QAAC,GAAG,EAAE,aAAa,CAAC;QAAC,IAAI,OAAM;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,EAAE,OACnD,IAAI,GACH,MAAM,CAmEjB;CAGJ;8BA/hBY,OAAO,uBAAuB,EAAE,eAAe;8BAC/C,OAAO,mCAAmC,EAAE,eAAe;4BAC3D,OAAO,iCAAiC,EAAE,aAAa;;;;;kCAOvD;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,YAAY,CAAA;CAAC;oBA7DhG,mCAAmC;gCARV,mDAAmD;8BA0BrD,2CAA2C;qBADpD,sCAAsC"}

package/src/shade/renderer/scene/bvh/StaticSceneBVH.js

@@ -1,4 +1,6 @@
 import { assert } from "../../../../core/assert.js";
+import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
+import { Transform64 } from "../../../../engine/ecs/transform/Transform64.js";
 import { BinaryUint32BVH } from "../../../../core/bvh2/binary/2/BinaryUint32BVH.js";
 import {
     BVH,
@@ -58,6 +60,21 @@ const scratch_surface_point = new SurfacePoint3();
 const scratch_vec3 = new Vector3();
 
 
+/**
+ * @typedef {import("../GPUSceneContext.js").GPUSceneContext} GPUSceneContext
+ * @typedef {import("../../geometry/MeshletGeometry.js").MeshletGeometry} MeshletGeometry
+ * @typedef {import("../../material/ShadeMaterial.js").ShadeMaterial} ShadeMaterial
+ */
+
+/**
+ * One primitive as the tree holds it: the entity it stands at, what it draws and with what, and a
+ * view over the world matrix its entity carries.
+ *
+ * @typedef {{entity: number, geometry: MeshletGeometry, material: ShadeMaterial, matrix: Float64Array}} StaticSceneInstance
+ */
+
+const SCRATCH_INSTANCE_BOX = new Float64Array(6);
+
 export class StaticSceneBVH {
 
     instance_bvh = new BVH();
@@ -74,14 +91,28 @@ export class StaticSceneBVH {
      *
      * @type {Map<number, Mesh>}
      */
+    /**
+     * The primitive behind each leaf's user data.
+     *
+     * @type {Map<number, StaticSceneInstance>}
+     */
     inverse_lookup = new Map();
 
 
     /**
+     * Build the tree over every primitive the scene draws: the mesh rows of its context, each
+     * under the world transform its entity carries — the ECS's own composition, which is exact for
+     * a scene the CPU places, and what a CPU bake of a static scene wants.
      *
-     * @param {Scene} scene
+     * @param {GPUSceneContext} scene_context
      */
-    build(scene) {
+    build(scene_context) {
+        assert.defined(scene_context, 'scene_context');
+
+        const dataset = scene_context.scene.dataset;
+
+        assert.ok(dataset !== null && dataset !== undefined, 'the scene names no dataset, and its primitives are entities of one');
+
         this.inverse_lookup.clear();
         this.instance_bvh.release_all();
         this.geometry_bvh.clear();
@@ -89,7 +120,15 @@ export class StaticSceneBVH {
 
         let id_count = 0;
 
-        scene.instances.instances.forEach(mesh => {
+        scene_context.rows.for_each_mesh((entity, geometry, material) => {
+            const world = dataset.getComponent(entity, Transform64);
+
+            assert.defined(world, `entity ${entity} holds a mesh row and no Transform64`);
+
+            // a view over the transform, so a placement moved before the next build is read as moved
+            const matrix = world.matrix;
+
+            aabb3_matrix4_project(SCRATCH_INSTANCE_BOX, geometry.bounding_box, matrix);
 
             const bvh = this.instance_bvh;
 
@@ -98,9 +137,12 @@ export class StaticSceneBVH {
             const id = id_count++;
 
             bvh.node_set_user_data(leaf, id)
-            bvh.node_set_aabb(leaf, mesh.bounding_box);
+            bvh.node_set_aabb(leaf, SCRATCH_INSTANCE_BOX);
             bvh.insert_leaf(leaf);
 
+            /** @type {StaticSceneInstance} */
+            const mesh = { entity, geometry, material, matrix };
+
             this.inverse_lookup.set(id, mesh);
 
             /**
@@ -121,8 +163,6 @@ export class StaticSceneBVH {
                 return bvh;
             }
 
-            const geometry = mesh.geometry;
-
             // TODO get rid of the plain geometry usage, move fully onto meshlet-based flow
             if(this.plain_geometries.has(geometry) === false) {
 
@@ -259,7 +299,7 @@ export class StaticSceneBVH {
                 const geometry_bvh = this.geometry_bvh.get(mesh.geometry);
 
                 // transform search point into local space of the geometry
-                m4_invert(scratch_transform_inverse, mesh.transform_global.matrix);
+                m4_invert(scratch_transform_inverse, mesh.matrix);
                 scratch_vec3.set(x, y, z);
                 scratch_vec3.applyMatrix4(scratch_transform_inverse);
 
@@ -280,7 +320,7 @@ export class StaticSceneBVH {
                 }
 
                 // transform result back to global space
-                scratch_surface_point.applyMatrix4(mesh.transform_global.matrix);
+                scratch_surface_point.applyMatrix4(mesh.matrix);
 
                 const geo_distance_sqr = scratch_surface_point.position._distanceSqrTo(x, y, z);
 
@@ -344,7 +384,7 @@ export class StaticSceneBVH {
             );
 
             // Get world -> object transform matrix
-            m4_invert(scratch_transform_inverse, mesh.transform_global.matrix);
+            m4_invert(scratch_transform_inverse, mesh.matrix);
 
             // Transform clipping volume to object space
             clipping_volume_matrix4_project(
@@ -414,7 +454,7 @@ export class StaticSceneBVH {
             const geometry_bvh = this.geometry_bvh.get(mesh.geometry);
 
 
-            m4_invert(scratch_transform_inverse, mesh.transform_global.matrix);
+            m4_invert(scratch_transform_inverse, mesh.matrix);
 
             scratch_local_ray.copy(ray);
             scratch_local_ray.tMax = nearest_distance;
@@ -441,7 +481,7 @@ export class StaticSceneBVH {
                 continue;
             }
 
-            sp.applyMatrix4(mesh.transform_global.matrix);
+            sp.applyMatrix4(mesh.matrix);
 
             const distance = sp.position._distanceTo(
                 ray.origin_x, ray.origin_y, ray.origin_z
@@ -520,7 +560,7 @@ export class StaticSceneBVH {
             const geometry = this.plain_geometries.get(mesh.geometry);
             const geometry_bvh = this.geometry_bvh.get(mesh.geometry);
 
-            m4_invert(scratch_transform_inverse, mesh.transform_global.matrix);
+            m4_invert(scratch_transform_inverse, mesh.matrix);
 
             scratch_local_ray.copy(ray);
             scratch_local_ray.applyMatrix4(scratch_transform_inverse);
@@ -545,7 +585,7 @@ export class StaticSceneBVH {
                 continue;
             }
 
-            sp.applyMatrix4(mesh.transform_global.matrix);
+            sp.applyMatrix4(mesh.matrix);
 
             const distance = sp.position._distanceTo(
                 ray.origin_x, ray.origin_y, ray.origin_z

package/src/shade/renderer/scene/hierarchy/graph_scene_update_transform_hierarchy.d.ts

@@ -4,12 +4,11 @@
  *
  * Builds a flat `{count, elements}` buffer holding all node IDs and
  * feeds it through {@link graph_nodes_update_transform_hierarchy}.
- * `GPUSceneContext` allocates row 0 of the transforms table to the
- * scene root (NODE3D_SCENE_ID) and a row to every other node in the
- * batch — meshes and non-mesh Node3Ds alike (anchor rigs, attachment
- * points, future skeleton joints). The scene itself is included, and
- * its walk terminates immediately at parent==SCENE_NODE_ID so its
- * identity-default global stays consistent.
+ * Row 0 of the transforms table is the scene root (NODE3D_SCENE_ID),
+ * and every other row is an entity's, at `entity + 1` — drawn or not:
+ * joints, anchors and attachment points hold rows too. The root is
+ * included, and its walk terminates immediately at parent==SCENE_NODE_ID
+ * so its identity global stays consistent.
  *
  * **The rows are not a contiguous range.** Removing a node frees its
  * row and leaves a hole, so the ids come from the table's occupancy

package/src/shade/renderer/scene/hierarchy/graph_scene_update_transform_hierarchy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_scene_update_transform_hierarchy.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/scene/hierarchy/graph_scene_update_transform_hierarchy.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH;IAZqC,KAAK;IACL,KAAK;IACL,cAAc,GAAxC,MAAM;IAOJ;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAwFtC"}
+{"version":3,"file":"graph_scene_update_transform_hierarchy.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/scene/hierarchy/graph_scene_update_transform_hierarchy.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH;IAZqC,KAAK;IACL,KAAK;IACL,cAAc,GAAxC,MAAM;IAOJ;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAwFtC"}

package/src/shade/renderer/scene/hierarchy/graph_scene_update_transform_hierarchy.js

@@ -11,12 +11,11 @@ import { graph_nodes_update_transform_hierarchy } from "./graph_nodes_update_tra
  *
  * Builds a flat `{count, elements}` buffer holding all node IDs and
  * feeds it through {@link graph_nodes_update_transform_hierarchy}.
- * `GPUSceneContext` allocates row 0 of the transforms table to the
- * scene root (NODE3D_SCENE_ID) and a row to every other node in the
- * batch — meshes and non-mesh Node3Ds alike (anchor rigs, attachment
- * points, future skeleton joints). The scene itself is included, and
- * its walk terminates immediately at parent==SCENE_NODE_ID so its
- * identity-default global stays consistent.
+ * Row 0 of the transforms table is the scene root (NODE3D_SCENE_ID),
+ * and every other row is an entity's, at `entity + 1` — drawn or not:
+ * joints, anchors and attachment points hold rows too. The root is
+ * included, and its walk terminates immediately at parent==SCENE_NODE_ID
+ * so its identity global stays consistent.
  *
  * **The rows are not a contiguous range.** Removing a node frees its
  * row and leaves a hole, so the ids come from the table's occupancy

package/src/shade/renderer/scene/optimization/scene_optimize.d.ts

@@ -1,6 +1,14 @@
 /**
+ * Make a loaded model cheaper to draw without changing what it looks like: exact-duplicate
+ * geometries collapse to one, equivalent pieces of different geometries are shared, and the
+ * textures the materials reach are deduplicated and downscaled where that loses nothing.
  *
- * @param {Scene} scene
+ * The bundle is rewritten in place — it is the tool's, not a shared asset's.
+ *
+ * @param {SceneBundle} bundle
  */
-export function scene_optimize(scene: Scene): void;
+export function scene_optimize(bundle: SceneBundle): void;
+export type SceneBundle = import("../../loader/SceneBundle.js").SceneBundle;
+export type MeshletGeometry = import("../../geometry/MeshletGeometry.js").MeshletGeometry;
+export type Geometry = import("../../geometry/Geometry.js").Geometry;
 //# sourceMappingURL=scene_optimize.d.ts.map

package/src/shade/renderer/scene/optimization/scene_optimize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scene_optimize.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/scene/optimization/scene_optimize.js"],"names":[],"mappings":"AAoMA;;;GAGG;AACH,mDA6BC"}
+{"version":3,"file":"scene_optimize.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/scene/optimization/scene_optimize.js"],"names":[],"mappings":"AAkOA;;;;;;;;GAQG;AACH,uCAFW,WAAW,QAgCrB;0BA/PY,OAAO,6BAA6B,EAAE,WAAW;8BACjD,OAAO,mCAAmC,EAAE,eAAe;uBAC3D,OAAO,4BAA4B,EAAE,QAAQ"}