@woosh/meep-engine 2.117.31 → 2.117.33

package/package.json

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

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

@@ -6,7 +6,8 @@
  * @param {number[]|Float32Array|Float64Array} position_array
  * @param {Uint32Array} [morton_codes]
  * @param {AABB3} [bounds] Bounding box of the entire geometry, if not supplied will be computed internally
+ * @param {number} [quality] va value from 0 to infinity, controls how many optimization passes are to be done beyond morton sort
  */
-export function ebvh_build_for_geometry_morton(bvh: BVH, index_array: number[] | Uint32Array | Uint16Array, position_array: number[] | Float32Array | Float64Array, morton_codes?: Uint32Array, bounds?: AABB3): void;
+export function ebvh_build_for_geometry_morton(bvh: BVH, index_array: number[] | Uint32Array | Uint16Array, position_array: number[] | Float32Array | Float64Array, morton_codes?: Uint32Array, bounds?: AABB3, quality?: number): void;
 import { AABB3 } from "../../geom/3d/aabb/AABB3.js";
 //# sourceMappingURL=ebvh_build_for_geometry_morton.d.ts.map

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":"AAYA;;;;;;;;GAQG;AACH,sEALW,MAAM,EAAE,GAAC,WAAW,GAAC,WAAW,kBAChC,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,iBAClC,WAAW,WACX,KAAK,QAkHf;sBAlIqB,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":"AAWA;;;;;;;;;GASG;AACH,sEANW,MAAM,EAAE,GAAC,WAAW,GAAC,WAAW,kBAChC,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,iBAClC,WAAW,WACX,KAAK,YACL,MAAM,QAiHhB;sBAjIqB,6BAA6B"}

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

@@ -8,7 +8,6 @@ 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
@@ -18,13 +17,15 @@ import { ebvh_nodes_sort_sah_local4 } from "./ebvh_nodes_sort_sah_local4.js";
  * @param {number[]|Float32Array|Float64Array} position_array
  * @param {Uint32Array} [morton_codes]
  * @param {AABB3} [bounds] Bounding box of the entire geometry, if not supplied will be computed internally
+ * @param {number} [quality] va value from 0 to infinity, controls how many optimization passes are to be done beyond morton sort
  */
 export function ebvh_build_for_geometry_morton(
     bvh,
     index_array,
     position_array,
     morton_codes = new Uint32Array(index_array.length / 3),
-    bounds
+    bounds,
+    quality = 0
 ) {
     assert.defined(bvh, 'bvh');
 
@@ -39,7 +40,6 @@ export function ebvh_build_for_geometry_morton(
     // clear out existing BVH
     bvh.release_all();
 
-
     // allocate nodes
     const tri_count = index_array.length / 3;
 
@@ -113,6 +113,7 @@ export function ebvh_build_for_geometry_morton(
         const c_index = index_array[triangle_index3 + 2];
 
         const node_address = ELEMENT_WORD_COUNT * node;
+
         aabb3_compute_from_triangle(
             bvh_float32, node_address,
             position_array, a_index, b_index, c_index
@@ -123,12 +124,10 @@ export function ebvh_build_for_geometry_morton(
         bvh_uint32[node_address + COLUMN_HEIGHT] = 0;
     }
 
-    ebvh_nodes_sort_sah_local4(bvh, nodes, 0, tri_count );
-
     // record newly generated nodes as "unprocessed"
     const unprocessed_nodes = new Uint32Array(tri_count);
     array_copy(nodes, 0, unprocessed_nodes, 0, tri_count);
 
     // assign root
-    bvh.root = ebvh_build_hierarchy(bvh, unprocessed_nodes, tri_count, nodes, tri_count);
+    bvh.root = ebvh_build_hierarchy(bvh, unprocessed_nodes, tri_count, nodes, tri_count, quality );
 }

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

@@ -7,7 +7,8 @@
  * @param {number} input_node_count
  * @param {number[]|Uint32Array} node_pool Contains node indices that can be used to build ancestry hierarchy, need to be pre-allocated before calling this method
  * @param {number} node_pool_offset
+ * @param {number} [sah_optimization_level]
  * @returns {number} new root
  */
-export function ebvh_build_hierarchy(bvh: BVH, unprocessed_nodes: number[] | Uint32Array, input_node_count: number, node_pool: number[] | Uint32Array, node_pool_offset: number): number;
+export function ebvh_build_hierarchy(bvh: BVH, unprocessed_nodes: number[] | Uint32Array, input_node_count: number, node_pool: number[] | Uint32Array, node_pool_offset: number, sah_optimization_level?: number): number;
 //# sourceMappingURL=ebvh_build_hierarchy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ebvh_build_hierarchy.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_build_hierarchy.js"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AACH,kEANW,MAAM,EAAE,GAAC,WAAW,oBACpB,MAAM,aACN,MAAM,EAAE,GAAC,WAAW,oBACpB,MAAM,GACJ,MAAM,CA4DlB"}
+{"version":3,"file":"ebvh_build_hierarchy.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_build_hierarchy.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;GAWG;AACH,kEAPW,MAAM,EAAE,GAAC,WAAW,oBACpB,MAAM,aACN,MAAM,EAAE,GAAC,WAAW,oBACpB,MAAM,2BACN,MAAM,GACJ,MAAM,CAwElB"}

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

@@ -1,6 +1,7 @@
 import { assert } from "../../assert.js";
 import { max2 } from "../../math/max2.js";
 import { NULL_NODE } from "./BVH.js";
+import { ebvh_nodes_sort_sah_local4 } from "./ebvh_nodes_sort_sah_local4.js";
 
 /**
  * Given a set of leaves, build intermediate node hierarchy on top, all the way up to the root
@@ -11,6 +12,7 @@ import { NULL_NODE } from "./BVH.js";
  * @param {number} input_node_count
  * @param {number[]|Uint32Array} node_pool Contains node indices that can be used to build ancestry hierarchy, need to be pre-allocated before calling this method
  * @param {number} node_pool_offset
+ * @param {number} [sah_optimization_level]
  * @returns {number} new root
  */
 export function ebvh_build_hierarchy(
@@ -18,7 +20,8 @@ export function ebvh_build_hierarchy(
     unprocessed_nodes,
     input_node_count,
     node_pool,
-    node_pool_offset
+    node_pool_offset,
+    sah_optimization_level = 1
 ) {
 
     assert.isNonNegativeInteger(input_node_count, 'input_node_count');
@@ -29,9 +32,20 @@ export function ebvh_build_hierarchy(
     // Assemble hierarchy
     let unprocessed_node_count = input_node_count;
 
+    let optimization_cycle_limit = sah_optimization_level;
 
     while (unprocessed_node_count > 1) {
 
+        for (let i = 0; i < optimization_cycle_limit; i++) {
+            // sort intermediate nodes using small locality and SAH metric
+            let swap_count = ebvh_nodes_sort_sah_local4(bvh, unprocessed_nodes, 2, unprocessed_node_count - 2);
+            swap_count += ebvh_nodes_sort_sah_local4(bvh, unprocessed_nodes, 0, unprocessed_node_count);
+
+            if(swap_count === 0){
+                optimization_cycle_limit = 0;
+            }
+        }
+
         let added_nodes = 0;
         let cursor = 0;
 

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

@@ -6,5 +6,5 @@
  * @param {number} offset
  * @param {number} count
  */
-export function ebvh_nodes_sort_sah_local4(bvh: BVH, nodes: number[] | Uint32Array, offset: number, count: number): void;
+export function ebvh_nodes_sort_sah_local4(bvh: BVH, nodes: number[] | Uint32Array, offset: number, count: number): number;
 //# sourceMappingURL=ebvh_nodes_sort_sah_local4.d.ts.map

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;;;;;;;GAOG;AACH,4DAJW,MAAM,EAAE,GAAC,WAAW,UACpB,MAAM,SACN,MAAM,QAsChB"}
+{"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;;;;;;;GAOG;AACH,4DAJW,MAAM,EAAE,GAAC,WAAW,UACpB,MAAM,SACN,MAAM,UA6ChB"}

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

@@ -11,6 +11,8 @@ export function ebvh_nodes_sort_sah_local4(bvh, nodes, offset, count) {
     // the bit manipulation rounds count down to nearest value divisible by 4
     const end = offset + ((count >>> 2) << 2);
 
+    let swap_count = 0;
+
     for (let i = offset; i < end; i += 4) {
         const a = nodes[i];
         const b = nodes[i + 1];
@@ -31,15 +33,20 @@ export function ebvh_nodes_sort_sah_local4(bvh, nodes, offset, count) {
 
         if (cost0 <= cost1 && cost0 <= cost2) {
             // no change
+            continue;
         } else if (cost1 <= cost2) {
             // swap C and B
             nodes[i + 1] = c;
             nodes[i + 2] = b;
+
         } else {
             // swap B and D
             nodes[i + 1] = d;
             nodes[i + 3] = b;
         }
+
+        swap_count++;
     }
 
+    return swap_count;
 }

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":"AA8CA;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,MAAM,cAAc,QA0C9B;IAED;;;;;OAKG;IACH,qBAFa,OAAO,CAmHnB;IAED;;;;;;;OAOG;IACH,4BANW,aAAa,KACb,MAAM,KACN,MAAM,KACN,MAAM,GACJ,OAAO,CAqKnB;IAGD;;;;;;OAMG;IACH,iBAJW,MAAM,EAAE,OACR,MAAM,EAAE,OAAK,GACX,MAAM,CAoIlB;IAED;;;;;OAKG;IACH,gBAJW,MAAM,EAAE,OACR,MAAM,EAAE,OAAK,GACX,MAAM,CA2ElB;;CACJ;sBA5oBqB,wCAAwC;8BAMhC,2CAA2C"}
+{"version":3,"file":"BufferedGeometryBVH.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.js"],"names":[],"mappings":"AA8CA;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,MAAM,cAAc,QA2C9B;IAED;;;;;OAKG;IACH,qBAFa,OAAO,CAmHnB;IAED;;;;;;;OAOG;IACH,4BANW,aAAa,KACb,MAAM,KACN,MAAM,KACN,MAAM,GACJ,OAAO,CAqKnB;IAGD;;;;;;OAMG;IACH,iBAJW,MAAM,EAAE,OACR,MAAM,EAAE,OAAK,GACX,MAAM,CAoIlB;IAED;;;;;OAKG;IACH,gBAJW,MAAM,EAAE,OACR,MAAM,EAAE,OAAK,GACX,MAAM,CA2ElB;;CACJ;sBA7oBqB,wCAAwC;8BAMhC,2CAA2C"}

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

@@ -134,7 +134,8 @@ export class BufferedGeometryBVH {
             index_array,
             array_positions,
             this.#morton_codes,
-            this.#bounds
+            this.#bounds,
+            16
         );
         //
         // ebvh_build_for_geometry_incremental(bvh, index_array, array_positions, 1);