@woosh/meep-engine 2.119.110 → 2.119.111

package/package.json

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

package/src/core/binary/operations/bitCount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bitCount.d.ts","sourceRoot":"","sources":["../../../../../src/core/binary/operations/bitCount.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,4BAHW,MAAM,GACJ,MAAM,CAYlB"}
+{"version":3,"file":"bitCount.d.ts","sourceRoot":"","sources":["../../../../../src/core/binary/operations/bitCount.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,4BAHW,MAAM,GACJ,MAAM,CAalB"}

package/src/core/binary/operations/bitCount.js

@@ -4,13 +4,14 @@
  * @returns {number}
  */
 export function bitCount(v) {
-    let x = v;
+    // see https://stackoverflow.com/a/109025/3973586
+    // see https://graphics.stanford.edu/%7Eseander/bithacks.html#CountBitsSetParallel
 
-    // Successively collapse alternating bit groups into a sum.
-    x = ((x >> 1) & 0x55555555) + (x & 0x55555555);
-    x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
-    x = ((x >> 4) & 0x0f0f0f0f) + (x & 0x0f0f0f0f);
-    x = ((x >> 8) & 0x00ff00ff) + (x & 0x00ff00ff);
+    let i = v|0;
 
-    return ((x >> 16) & 0x0000ffff) + (x & 0x0000ffff);
+    i = i - ((i >> 1) & 0x55555555);        // add pairs of bits
+    i = (i & 0x33333333) + ((i >> 2) & 0x33333333);  // quads
+    i = (i + (i >> 4)) & 0x0F0F0F0F;        // groups of 8
+    i *= 0x01010101;                        // horizontal sum of bytes
+    return  i >> 24;               // return just that top byte (after truncating to 32-bit even when int is wider than uint32_t)
 }

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

@@ -1 +1 @@
-{"version":3,"file":"build_triangle_morton_codes.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/build_triangle_morton_codes.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,0DAXW,MAAM,EAAE,GAAC,WAAW,aACpB,MAAM,eACN,MAAM,EAAE,GAAC,UAAU,GAAC,WAAW,GAAC,WAAW,kBAC3C,MAAM,EAAE,GAAC,YAAY,WACrB,MAAM,WACN,MAAM,WACN,MAAM,WACN,MAAM,WACN,MAAM,WACN,MAAM,QAsEhB"}
+{"version":3,"file":"build_triangle_morton_codes.d.ts","sourceRoot":"","sources":["../../../../../src/core/bvh2/bvh3/build_triangle_morton_codes.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,0DAXW,MAAM,EAAE,GAAC,WAAW,aACpB,MAAM,eACN,MAAM,EAAE,GAAC,UAAU,GAAC,WAAW,GAAC,WAAW,kBAC3C,MAAM,EAAE,GAAC,YAAY,WACrB,MAAM,WACN,MAAM,WACN,MAAM,WACN,MAAM,WACN,MAAM,WACN,MAAM,QAyEhB"}

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

@@ -21,6 +21,7 @@ export function build_triangle_morton_codes(
     aabb_x0, aabb_y0, aabb_z0,
     aabb_x1, aabb_y1, aabb_z1
 ) {
+    // TODO use adaptive number of bits per axis (see "Extended Morton Codes for High Performance Bounding Volume Hierarchy Construction" by Marek Vinkler et al, 2017,  Proceedings of HPG
 
     const aabb_size_x = aabb_x1 - aabb_x0;
     const aabb_size_y = aabb_y1 - aabb_y0;
@@ -35,9 +36,10 @@ export function build_triangle_morton_codes(
     const aabb_3_z0 = aabb_z0 * 3;
 
     // compute multipliers to bring normalized values in range of 10bit unsigned integer each
-    const morton_scale_x = aabb_size_x === 0 ? 0 : 1023 / (aabb_size_x*3);
-    const morton_scale_y = aabb_size_y === 0 ? 0 : 1023 / (aabb_size_y*3);
-    const morton_scale_z = aabb_size_z === 0 ? 0 : 1023 / (aabb_size_z*3);
+    // NOTE we give extra 11 bits to X and Z as most models tend to sprawl horizontally
+    const morton_scale_x = aabb_size_x === 0 ? 0 : 2047 / (aabb_size_x * 3);
+    const morton_scale_y = aabb_size_y === 0 ? 0 : 1023 / (aabb_size_y * 3);
+    const morton_scale_z = aabb_size_z === 0 ? 0 : 2047 / (aabb_size_z * 3);
 
     // compute morton codes
     for (let i = 0; i < tri_count; i++) {
@@ -66,6 +68,7 @@ export function build_triangle_morton_codes(
         const cy = position_array[c_address + 1];
         const cz = position_array[c_address + 2];
 
+        // compute centroid coordinate
         const center_x = (ax + bx + cx);
         const center_y = (ay + by + cy);
         const center_z = (az + bz + cz);
@@ -77,8 +80,8 @@ export function build_triangle_morton_codes(
 
         morton_codes[i] = morton(
             Math.round(ncx),
+            Math.round(ncz),
             Math.round(ncy),
-            Math.round(ncz)
         );
     }
 }

package/src/core/binary/bitcount.d.ts

@@ -1,7 +0,0 @@
-/**
- *
- * @param {number} i32
- * @returns {number} number of set bits
- */
-export function bitcount(i32: number): number;
-//# sourceMappingURL=bitcount.d.ts.map

package/src/core/binary/bitcount.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bitcount.d.ts","sourceRoot":"","sources":["../../../../src/core/binary/bitcount.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,8BAHW,MAAM,GACJ,MAAM,CAWlB"}

package/src/core/binary/bitcount.js

@@ -1,15 +0,0 @@
-/**
- *
- * @param {number} i32
- * @returns {number} number of set bits
- */
-export function bitcount(i32){
-    // see https://stackoverflow.com/a/109025/3973586
-    // see https://graphics.stanford.edu/%7Eseander/bithacks.html#CountBitsSetParallel
-
-    let i = (i32|0) - ((i32 >> 1) & 0x55555555);        // add pairs of bits
-    i = (i & 0x33333333) + ((i >> 2) & 0x33333333);  // quads
-    i = (i + (i >> 4)) & 0x0F0F0F0F;        // groups of 8
-    i *= 0x01010101;                        // horizontal sum of bytes
-    return  i >> 24;               // return just that top byte (after truncating to 32-bit even when int is wider than uint32_t)
-}