@woosh/meep-engine 2.122.0 → 2.122.2

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.122.0",
+  "version": "2.122.2",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ebvh_build_for_geometry_morton.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.js"],"names":[],"mappings":"AAWA;;;;;;;;;GASG;AACH,oDAPW,GAAG,eACH,MAAM,EAAE,GAAC,WAAW,GAAC,WAAW,kBAChC,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,iBAClC,WAAW,WACX,KAAK,YACL,MAAM,QAmHhB;sBAnIqB,6BAA6B"}
+{"version":3,"file":"ebvh_build_for_geometry_morton.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.js"],"names":[],"mappings":"AAYA;;;;;;;;;GASG;AACH,oDAPW,GAAG,eACH,MAAM,EAAE,GAAC,WAAW,GAAC,WAAW,kBAChC,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,iBAClC,WAAW,WACX,KAAK,YACL,MAAM,QAiIhB;sBAlJqB,6BAA6B"}

package/src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.js

@@ -8,6 +8,7 @@ import { max2 } from "../../math/max2.js";
 import { build_triangle_morton_codes } from "./build_triangle_morton_codes.js";
 import { COLUMN_CHILD_1, COLUMN_HEIGHT, COLUMN_USER_DATA, ELEMENT_WORD_COUNT, NULL_NODE } from "./BVH.js";
 import { ebvh_build_hierarchy } from "./ebvh_build_hierarchy.js";
+import { ebvh_nodes_sort_sah_local4 } from "./ebvh_nodes_sort_sah_local4.js";
 
 /**
  * Build the BVH bottom-up using spatial hash sorting
@@ -130,6 +131,20 @@ export function ebvh_build_for_geometry_morton(
 
     typed_array_copy(nodes, unprocessed_nodes);
 
+    // do long-distance swaps, starting high and coming down
+    for (let power = 5; power > Math.max(5 - quality, 1); power--) {
+
+        ebvh_nodes_sort_sah_local4(
+            bvh,
+            unprocessed_nodes,
+            0,
+            1 << power,
+            tri_count
+        );
+
+    }
+
+
     // assign root
     bvh.root = ebvh_build_hierarchy(bvh, unprocessed_nodes, tri_count, nodes, tri_count, quality);
 }

package/src/core/bvh2/bvh3/ebvh_nodes_sort_sah_local4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ebvh_nodes_sort_sah_local4.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_nodes_sort_sah_local4.js"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,gDANW,GAAG,SACH,MAAM,EAAE,GAAC,WAAW,UACpB,MAAM,YACN,MAAM,SACN,MAAM,UAkFhB"}
+{"version":3,"file":"ebvh_nodes_sort_sah_local4.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_nodes_sort_sah_local4.js"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,gDANW,GAAG,SACH,MAAM,EAAE,GAAC,WAAW,UACpB,MAAM,YACN,MAAM,SACN,MAAM,UAoFhB"}

package/src/core/bvh2/bvh3/ebvh_nodes_sort_sah_local4.js

@@ -1,3 +1,5 @@
+import { assert } from "../../assert.js";
+
 /**
  * Sort consequent 4 nodes to reduce SAH among each consequent pair.
  * Useful for optimizing topology for traversal.
@@ -14,6 +16,8 @@ export function ebvh_nodes_sort_sah_local4(
     distance,
     count
 ) {
+    assert.isNonNegativeInteger(offset, 'offset');
+    assert.isNonNegativeInteger(count, 'count');
 
     const swap_pair_limit = Math.floor((count - (distance + 2)) / 2);
     const end = offset + swap_pair_limit * 2;

package/src/core/bvh2/bvh3/ebvh_optimize_treelet.d.ts

@@ -3,8 +3,8 @@
  * Note that the root does not move, but everything below the root is subject to change
  * @see "Fast Parallel Construction of High-Quality Bounding Volume Hierarchies" by Kerras, NVIDIA 2013
  * @param {BVH} bvh
- * @param {number} root where to start optimization, only nodes below this one will be considered
+ * @param {number} [root] where to start optimization, only nodes below this one will be considered
  * @param {number} [treelet_size] the larger the size - the more optimization opportunities, but it gets exponentially slower
  */
-export function ebvh_optimize_treelet(bvh: BVH, root: number, treelet_size?: number): void;
+export function ebvh_optimize_treelet(bvh: BVH, root?: number, treelet_size?: number): void;
 //# sourceMappingURL=ebvh_optimize_treelet.d.ts.map

package/src/core/bvh2/bvh3/ebvh_optimize_treelet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ebvh_optimize_treelet.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_optimize_treelet.js"],"names":[],"mappings":"AAoNA;;;;;;;GAOG;AACH,2CAJW,GAAG,QACH,MAAM,iBACN,MAAM,QA8IhB"}
+{"version":3,"file":"ebvh_optimize_treelet.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_optimize_treelet.js"],"names":[],"mappings":"AAuNA;;;;;;;GAOG;AACH,2CAJW,GAAG,SACH,MAAM,iBACN,MAAM,QA8IhB"}

package/src/core/bvh2/bvh3/ebvh_optimize_treelet.js

@@ -3,10 +3,13 @@ import { lsb_32 } from "../../binary/lsb_32.js";
 import { bitCount } from "../../binary/operations/bitCount.js";
 import { NULL_NODE } from "./BVH.js";
 
-const scratch_areas = new Float32Array(256);
-const scratch_cost = new Float32Array(256);
-const scratch_partitions = new Uint32Array(256);
-const scratch_treelet = new Uint32Array(16);
+// Common continuous memory region for better cache performance
+const scratch_memory = new ArrayBuffer((256 * 3 + 16) * 4);
+
+const scratch_areas = new Float32Array(scratch_memory, 0, 256);
+const scratch_cost = new Float32Array(scratch_memory, 1024, 256);
+const scratch_partitions = new Uint32Array(scratch_memory, 2048, 256);
+const scratch_treelet = new Uint32Array(scratch_memory, 3072, 16);
 
 /**
  *
@@ -87,7 +90,7 @@ function optimize_treelet(bvh, root, leaves, leaf_count) {
     for (let i = 0; i < leaf_count; i++) {
         const leaf = leaves[i];
 
-        scratch_cost[1 << i] = SAH_COST_TRIANGLE * bvh.node_get_surface_area(leaf) ;
+        scratch_cost[1 << i] = SAH_COST_TRIANGLE * bvh.node_get_surface_area(leaf);
     }
 
     // Optimize every subset of leaves
@@ -136,7 +139,7 @@ function optimize_treelet(bvh, root, leaves, leaf_count) {
  * @param {number} treelet_max_size
  */
 function optimize_at_node(bvh, root, treelet_max_size) {
-    if(root === NULL_NODE){
+    if (root === NULL_NODE) {
         return;
     }
 
@@ -215,12 +218,12 @@ const CAME_FROM_TYPE_CHILD_2 = 2;
  * Note that the root does not move, but everything below the root is subject to change
  * @see "Fast Parallel Construction of High-Quality Bounding Volume Hierarchies" by Kerras, NVIDIA 2013
  * @param {BVH} bvh
- * @param {number} root where to start optimization, only nodes below this one will be considered
+ * @param {number} [root] where to start optimization, only nodes below this one will be considered
  * @param {number} [treelet_size] the larger the size - the more optimization opportunities, but it gets exponentially slower
  */
 export function ebvh_optimize_treelet(
     bvh,
-    root,
+    root = bvh.root,
     treelet_size = 7
 ) {
     assert.isNonNegativeInteger(treelet_size, 'treelet_size');

package/src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BufferedGeometryBVH.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.js"],"names":[],"mappings":"AAuCA;IAkBI;;;OAGG;IACH,eAFW,KAAK,GAAC,MAAM,EAAE,QAIxB;IAIG;;;;OAIG;IACH,mBAAsB;IAEtB;;;;OAIG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,6BAAgC;IAGhC;;;;OAIG;IACH,yBAAyB;IAG7B;;;OAGG;IACH,WAFW,KAAK,CAAC,cAAc,QA2C9B;IAED;;;;;OAKG;IACH,cAHW,IAAI,GACF,OAAO,CAmHnB;IAED;;;;;;;OAOG;IACH,4BANW,aAAa,KACb,MAAM,KACN,MAAM,KACN,MAAM,GACJ,OAAO,CAUnB;IAGD;;;;;;OAMG;IACH,iBAJW,MAAM,EAAE,OACR,MAAM,EAAE,GAAC,IAAI,GACX,MAAM,CAoIlB;IAED;;;;;OAKG;IACH,gBAJW,MAAM,EAAE,OACR,MAAM,EAAE,GAAC,IAAI,GACX,MAAM,CA2ElB;;CACJ;sBA3eqB,wCAAwC;8BAGhC,2CAA2C"}
+{"version":3,"file":"BufferedGeometryBVH.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.js"],"names":[],"mappings":"AAwCA;IAkBI;;;OAGG;IACH,eAFW,KAAK,GAAC,MAAM,EAAE,QAIxB;IAIG;;;;OAIG;IACH,mBAAsB;IAEtB;;;;OAIG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,6BAAgC;IAGhC;;;;OAIG;IACH,yBAAyB;IAG7B;;;OAGG;IACH,WAFW,KAAK,CAAC,cAAc,QA8C9B;IAED;;;;;OAKG;IACH,cAHW,IAAI,GACF,OAAO,CAmHnB;IAED;;;;;;;OAOG;IACH,4BANW,aAAa,KACb,MAAM,KACN,MAAM,KACN,MAAM,GACJ,OAAO,CAUnB;IAGD;;;;;;OAMG;IACH,iBAJW,MAAM,EAAE,OACR,MAAM,EAAE,GAAC,IAAI,GACX,MAAM,CAoIlB;IAED;;;;;OAKG;IACH,gBAJW,MAAM,EAAE,OACR,MAAM,EAAE,GAAC,IAAI,GACX,MAAM,CA2ElB;;CACJ;sBA9eqB,wCAAwC;8BAGhC,2CAA2C"}

package/src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.js

@@ -7,6 +7,7 @@ import {
     NULL_NODE
 } from "../../../../core/bvh2/bvh3/BVH.js";
 import { ebvh_build_for_geometry_morton } from "../../../../core/bvh2/bvh3/ebvh_build_for_geometry_morton.js";
+import { ebvh_optimize_treelet } from "../../../../core/bvh2/bvh3/ebvh_optimize_treelet.js";
 import { bvh_query_user_data_ray_segment } from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_ray_segment.js";
 import { array_copy } from "../../../../core/collection/array/array_copy.js";
 import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../../core/collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
@@ -130,6 +131,9 @@ export class BufferedGeometryBVH {
             this.#bounds,
             16
         );
+
+        ebvh_optimize_treelet(bvh);
+
         //
         // ebvh_build_for_geometry_incremental(bvh, index_array, array_positions, 1);
 

package/src/engine/graphics/sh3/path_tracer/PathTracedScene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PathTracedScene.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/PathTracedScene.js"],"names":[],"mappings":"AAoDA;IAGI;;;OAGG;IACH,eAFU,GAAG,CAEa;IAG1B;;;OAGG;IACH,QAFU,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAElB;IAEnB;;;OAGG;IACH,UAFU,aAAa,EAAE,CAEX;IAEd;;;OAGG;IACH,WAFU,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAElC;IAmBtB;;;;OAIG;IACH,6BAA6C;IAmF7C,iBAOC;IAED;;;;OAIG;IACH,uBAHW,KAAK,CAAC,cAAc,GACnB,mBAAmB,CAmB9B;IAED;;;OAGG;IACH,gBAFW,aAAa,QAMvB;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAInB;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAiCnB;IAED;;;;OAIG;IACH,iBAHW,cAAc,GACZ,OAAO,CAgBnB;IAED;;;;OAIG;IACH,yBAHW,KAAK,CAAC,QAAQ,GACZ,gBAAgB,CAI5B;IAED;;;;;OAKG;IACH,qBAJW,KAAK,CAAC,cAAc,YACpB,KAAK,CAAC,QAAQ,aACd,IAAI,GAAC,MAAM,EAAE,QAavB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,EAAE,OACR,MAAM,EAAE,gBACR,IAAI,QA0Cd;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAsCnB;IAED;;;;;OAKG;IACH,WAJW,MAAM,EAAE,OACR,MAAM,EAAE,GAAC,IAAI,GACZ,MAAM,CA+CjB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,EAAE,cACR,MAAM,aACN,MAAM,EAAE,oBACR,MAAM,QAIhB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,EAAE,cACR,MAAM,OACN,MAAM,EAAE,QAwHlB;;CACJ;oBA3lB8B,mCAAmC;+BAqBnC,qBAAqB;8BAJtB,kDAAkD;oCAC5C,0BAA0B;qBARzC,sCAAsC"}
+{"version":3,"file":"PathTracedScene.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/PathTracedScene.js"],"names":[],"mappings":"AAoDA;IAGI;;;OAGG;IACH,eAFU,GAAG,CAEa;IAG1B;;;OAGG;IACH,QAFU,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAElB;IAEnB;;;OAGG;IACH,UAFU,aAAa,EAAE,CAEX;IAEd;;;OAGG;IACH,WAFU,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAElC;IAmBtB;;;;OAIG;IACH,6BAA6C;IAkF7C,iBAOC;IAED;;;;OAIG;IACH,uBAHW,KAAK,CAAC,cAAc,GACnB,mBAAmB,CAmB9B;IAED;;;OAGG;IACH,gBAFW,aAAa,QAMvB;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAInB;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAiCnB;IAED;;;;OAIG;IACH,iBAHW,cAAc,GACZ,OAAO,CAgBnB;IAED;;;;OAIG;IACH,yBAHW,KAAK,CAAC,QAAQ,GACZ,gBAAgB,CAI5B;IAED;;;;;OAKG;IACH,qBAJW,KAAK,CAAC,cAAc,YACpB,KAAK,CAAC,QAAQ,aACd,IAAI,GAAC,MAAM,EAAE,QAavB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,EAAE,OACR,MAAM,EAAE,gBACR,IAAI,QA0Cd;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAsCnB;IAED;;;;;OAKG;IACH,WAJW,MAAM,EAAE,OACR,MAAM,EAAE,GAAC,IAAI,GACZ,MAAM,CA+CjB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,EAAE,cACR,MAAM,aACN,MAAM,EAAE,oBACR,MAAM,QAIhB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,EAAE,cACR,MAAM,OACN,MAAM,EAAE,QAwHlB;;CACJ;oBA1lB8B,mCAAmC;+BAqBnC,qBAAqB;8BAJtB,kDAAkD;oCAC5C,0BAA0B;qBARzC,sCAAsC"}

package/src/engine/graphics/sh3/path_tracer/PathTracedScene.js

@@ -1,7 +1,7 @@
 import { assert } from "../../../../core/assert.js";
 import { BVH, NULL_NODE } from "../../../../core/bvh2/bvh3/BVH.js";
 import { ebvh_build_hierarchy } from "../../../../core/bvh2/bvh3/ebvh_build_hierarchy.js";
-import { ebvh_nodes_sort_sah_local4 } from "../../../../core/bvh2/bvh3/ebvh_nodes_sort_sah_local4.js";
+import { ebvh_optimize_treelet } from "../../../../core/bvh2/bvh3/ebvh_optimize_treelet.js";
 import { bvh_query_user_data_ray_segment } from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_ray_segment.js";
 import { Cache } from "../../../../core/cache/Cache.js";
 import { array_copy } from "../../../../core/collection/array/array_copy.js";
@@ -172,15 +172,14 @@ export class PathTracedScene {
 
         }
 
-        ebvh_nodes_sort_sah_local4(bvh, nodes,  0, 2, node_leaf_count);
-
         // record newly generated nodes as "unprocessed"
         const unprocessed_nodes = new Uint32Array(node_leaf_count);
         array_copy(nodes, 0, unprocessed_nodes, 0, node_leaf_count);
 
         // assign root
-        bvh.__root = ebvh_build_hierarchy(bvh, unprocessed_nodes, node_leaf_count, nodes, node_leaf_count);
+        bvh.__root = ebvh_build_hierarchy(bvh, unprocessed_nodes, node_leaf_count, nodes, node_leaf_count,16);
 
+        ebvh_optimize_treelet(bvh);
     }
 
     optimize() {