@woosh/meep-engine 2.119.114 → 2.119.116

package/package.json

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

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":"AAKA;;;;;;;;;;;;GAYG;AACH,0CATW,GAAG,qBACH,MAAM,EAAE,GAAC,WAAW,oBACpB,MAAM,aACN,MAAM,EAAE,GAAC,WAAW,oBACpB,MAAM,2BACN,MAAM,0BACN,MAAM,GACJ,MAAM,CAsFlB"}
+{"version":3,"file":"ebvh_build_hierarchy.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/ebvh_build_hierarchy.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,0CATW,GAAG,qBACH,MAAM,EAAE,GAAC,WAAW,oBACpB,MAAM,aACN,MAAM,EAAE,GAAC,WAAW,oBACpB,MAAM,2BACN,MAAM,0BACN,MAAM,GACJ,MAAM,CAoFlB"}

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

@@ -43,14 +43,12 @@ export function ebvh_build_hierarchy(
         for (let i = 0; i < sah_optimization_cycle_count; i++) {
 
             // sort intermediate nodes using small locality and SAH metric
-
-            const offset = (i << 1) & 3; // cycle between 0 and 2
-
             const swap_count = ebvh_nodes_sort_sah_local4(
                 bvh,
                 unprocessed_nodes,
-                offset,
-                unprocessed_node_count - offset
+                0,
+                (sah_optimization_cycle_count - i)*2,
+                unprocessed_node_count
             );
 
             if (swap_count === 0) {

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

@@ -4,7 +4,8 @@
  * @param {BVH} bvh
  * @param {number[]|Uint32Array} nodes
  * @param {number} offset
+ * @param {number} distance
  * @param {number} count
  */
-export function ebvh_nodes_sort_sah_local4(bvh: BVH, nodes: number[] | Uint32Array, offset: number, count: number): number;
+export function ebvh_nodes_sort_sah_local4(bvh: BVH, nodes: number[] | Uint32Array, offset: number, distance: 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,gDALW,GAAG,SACH,MAAM,EAAE,GAAC,WAAW,UACpB,MAAM,SACN,MAAM,UA6ChB"}
+{"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,UA6ChB"}

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

@@ -4,20 +4,21 @@
  * @param {BVH} bvh
  * @param {number[]|Uint32Array} nodes
  * @param {number} offset
+ * @param {number} distance
  * @param {number} count
  */
-export function ebvh_nodes_sort_sah_local4(bvh, nodes, offset, count) {
+export function ebvh_nodes_sort_sah_local4(bvh, nodes, offset, distance, count) {
 
     // the bit manipulation rounds count down to nearest value divisible by 4
-    const end = offset + ((count >>> 2) << 2);
+    const end = offset + Math.floor((count - (distance + 2)) / 2) * 2;
 
     let swap_count = 0;
 
-    for (let i = offset; i < end; i += 4) {
+    for (let i = offset; i < end; i += 2) {
         const a = nodes[i];
         const b = nodes[i + 1];
-        const c = nodes[i + 2];
-        const d = nodes[i + 3];
+        const c = nodes[i + distance];
+        const d = nodes[i + distance + 1];
 
         /*
          possible combinations:

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

@@ -170,7 +170,7 @@ export class PathTracedScene {
             bvh.node_set_height(node, 0);
 
         }
-        ebvh_nodes_sort_sah_local4(bvh, nodes, 0, node_leaf_count);
+        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);