@woosh/meep-engine 2.119.116 → 2.119.118

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.119.116",
+  "version": "2.119.118",
   "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,CAoFlB"}
+{"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,CAkFlB"}

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

@@ -38,23 +38,21 @@ export function ebvh_build_hierarchy(
 
     while (unprocessed_node_count > 1) {
 
-        const sah_optimization_cycle_count = sah_optimization_level + sah_optimization_bias * current_construction_depth;
+        const sah_optimization_cycle_count = Math.floor(sah_optimization_level + sah_optimization_bias * current_construction_depth);
 
         for (let i = 0; i < sah_optimization_cycle_count; i++) {
 
             // sort intermediate nodes using small locality and SAH metric
-            const swap_count = ebvh_nodes_sort_sah_local4(
+            const swap_distance = (sah_optimization_cycle_count - i) * 2;
+
+            ebvh_nodes_sort_sah_local4(
                 bvh,
                 unprocessed_nodes,
                 0,
-                (sah_optimization_cycle_count - i)*2,
+                swap_distance,
                 unprocessed_node_count
             );
 
-            if (swap_count === 0) {
-                break;
-            }
-
         }
 
         let added_nodes = 0;

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,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,UAgDhB"}

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

@@ -9,16 +9,19 @@
  */
 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 + Math.floor((count - (distance + 2)) / 2) * 2;
+    const swap_pair_limit = Math.floor((count - (distance + 2)) / 2);
+    const end = offset + swap_pair_limit * 2;
 
     let swap_count = 0;
 
     for (let i = offset; i < end; i += 2) {
+        const j = i + distance;
+
         const a = nodes[i];
         const b = nodes[i + 1];
-        const c = nodes[i + distance];
-        const d = nodes[i + distance + 1];
+
+        const c = nodes[j];
+        const d = nodes[j + 1];
 
         /*
          possible combinations:
@@ -38,12 +41,12 @@ export function ebvh_nodes_sort_sah_local4(bvh, nodes, offset, distance, count)
         } else if (cost1 <= cost2) {
             // swap C and B
             nodes[i + 1] = c;
-            nodes[i + 2] = b;
+            nodes[j] = b;
 
         } else {
             // swap B and D
             nodes[i + 1] = d;
-            nodes[i + 3] = b;
+            nodes[j + 1] = b;
         }
 
         swap_count++;