@woosh/meep-engine 2.74.0 → 2.75.0

package/build/meep.module.js

@@ -53658,6 +53658,12 @@ class TerrainPreview {
     }
 }
 
+/**
+ * equal to `Math.pow(2,32) - 1`
+ * @type {number}
+ */
+const UINT32_MAX = 4294967295;
+
 /**
  * Assumes arrays have the same type
  * @param {TypedArray|Float32Array|Uint8Array|Uint32Array} source
@@ -53737,6 +53743,13 @@ const ELEMENT_WORD_COUNT = 10;
  */
 const INITIAL_CAPACITY = 128;
 
+
+/**
+ * Tree can not contain more than this number of nodes
+ * @type {number}
+ */
+const NODE_CAPACITY_LIMIT = Math.floor(UINT32_MAX / (ELEMENT_WORD_COUNT * 4));
+
 /**
  * Bounding Volume Hierarchy implementation. Stores unsigned integer values at leaves, these are typically IDs or Index values.
  * Highly optimized both in terms of memory usage and CPU. Most of the code inlined. No allocation are performed during usage (except for growing the tree capacity).
@@ -53831,17 +53844,26 @@ class BVH {
     }
 
     __grow_capacity() {
-        const new_capacity = Math.ceil(max2(
+        if (this.__capacity >= NODE_CAPACITY_LIMIT) {
+            throw new Error('Can not grow capacity, already at maximum platform limit');
+        }
+
+        let new_capacity = Math.ceil(max2(
             this.__capacity * CAPACITY_GROW_MULTIPLIER,
             this.__capacity + CAPACITY_GROW_MIN_STEP
         ));
 
+        if (new_capacity > NODE_CAPACITY_LIMIT) {
+            // can not grow as much as we'd like, but we can still grow up to the limit
+            new_capacity = NODE_CAPACITY_LIMIT;
+        }
+
         this.__set_capacity(new_capacity);
     }
 
     /**
      *
-     * @param {number} new_capacity
+     * @param {number} new_capacity in number of nodes
      * @private
      */
     __set_capacity(new_capacity) {
@@ -54393,6 +54415,9 @@ class BVH {
             assert.notEqual(child1, NULL_NODE, 'child1 is null');
             assert.notEqual(child2, NULL_NODE, 'child2 is null');
 
+            assert.notEqual(child1, index, 'child1 is equal to parent');
+            assert.notEqual(child2, index, 'child2 is equal to parent');
+
             this.node_set_combined_aabb(index, child1, child2);
 
             index = uint32[address + COLUMN_PARENT];
@@ -54420,6 +54445,9 @@ class BVH {
             assert.notEqual(child1, NULL_NODE, 'child1 is null');
             assert.notEqual(child2, NULL_NODE, 'child2 is null');
 
+            assert.notEqual(child1, index, 'child1 is equal to parent');
+            assert.notEqual(child2, index, 'child2 is equal to parent');
+
             uint32[node_address + COLUMN_HEIGHT] = 1 + max2(
                 uint32[child1 * ELEMENT_WORD_COUNT + COLUMN_HEIGHT],
                 uint32[child2 * ELEMENT_WORD_COUNT + COLUMN_HEIGHT],
@@ -54501,6 +54529,9 @@ class BVH {
         const iB = uint32[iA * ELEMENT_WORD_COUNT + COLUMN_CHILD_1];
         const iC = uint32[iA * ELEMENT_WORD_COUNT + COLUMN_CHILD_2];
 
+        assert.notEqual(iA, iB, 'child1 equal to parent');
+        assert.notEqual(iA, iB, 'child2 equal to parent');
+
         assert.greaterThanOrEqual(iB, 0);
         assert.lessThan(iB, this.node_capacity);
         assert.greaterThanOrEqual(iC, 0);
@@ -54516,6 +54547,9 @@ class BVH {
             const iF = uint32[iC * ELEMENT_WORD_COUNT + COLUMN_CHILD_1];
             const iG = uint32[iC * ELEMENT_WORD_COUNT + COLUMN_CHILD_2];
 
+            assert.notEqual(iC, iF, 'child1 equal to parent');
+            assert.notEqual(iC, iG, 'child2 equal to parent');
+
             // b2TreeNode* F = m_nodes + iF;
             // b2TreeNode* G = m_nodes + iG;
 
@@ -54534,6 +54568,7 @@ class BVH {
 
             // A's old parent should point to C
             if (a_parent !== NULL_NODE) {
+                assert.notEqual(a_parent, iC);
                 if (uint32[a_parent * ELEMENT_WORD_COUNT + COLUMN_CHILD_1] === iA) {
                     uint32[a_parent * ELEMENT_WORD_COUNT + COLUMN_CHILD_1] = iC;
                 } else {
@@ -54586,6 +54621,9 @@ class BVH {
 
             }
 
+            assert.notEqual(iC, uint32[iC * ELEMENT_WORD_COUNT + COLUMN_CHILD_1]);
+            assert.notEqual(iC, uint32[iC * ELEMENT_WORD_COUNT + COLUMN_CHILD_2]);
+
             return iC;
         }
 
@@ -54594,6 +54632,9 @@ class BVH {
             const iD = uint32[iB * ELEMENT_WORD_COUNT + COLUMN_CHILD_1];
             const iE = uint32[iB * ELEMENT_WORD_COUNT + COLUMN_CHILD_2];
 
+            assert.notEqual(iB, iD, 'child1 equal to parent');
+            assert.notEqual(iB, iE, 'child2 equal to parent');
+
             assert.greaterThanOrEqual(iD, 0);
             assert.lessThan(iD, this.node_capacity);
             assert.greaterThanOrEqual(iE, 0);
@@ -54660,9 +54701,15 @@ class BVH {
 
             }
 
+            assert.notEqual(iB, uint32[iB * ELEMENT_WORD_COUNT + COLUMN_CHILD_1]);
+            assert.notEqual(iB, uint32[iB * ELEMENT_WORD_COUNT + COLUMN_CHILD_2]);
+
             return iB;
         }
 
+        assert.notEqual(iA, uint32[iA * ELEMENT_WORD_COUNT + COLUMN_CHILD_1]);
+        assert.notEqual(iA, uint32[iA * ELEMENT_WORD_COUNT + COLUMN_CHILD_2]);
+
         // no rotation
         return iA;
     }
@@ -54823,6 +54870,7 @@ const SCRATCH_UINT32_TRAVERSAL_STACK = new Uint32Array(781250);
 
 /**
  * Pointer used to track current top of the stack, make sure to unwind once your traversal is done
+ * Must be a positive integer
  * @type {number}
  */
 SCRATCH_UINT32_TRAVERSAL_STACK.pointer = 0;
@@ -68900,50 +68948,49 @@ function bvh_query_user_data_overlaps_frustum(
     return result_cursor - result_offset;
 }
 
+const PATH_SEPARATOR = '/';
+
 /**
- * @template CTX
- * @template Asset
+ * Strips all directories from the path.
+ * @example 'a/b/c' -> 'c'
+ * @param {string} path
+ * @returns {string}
  */
-class AssetLoader {
-    /**
-     *
-     * @type {AssetManager}
-     */
-    assetManager = null;
+function computePathBase(path) {
+    if (typeof path !== "string") {
+        throw new Error('path is not a string');
+    }
 
-    /**
-     *
-     * @type {CTX}
-     */
-    context = null;
+    const lastSlashIndex = path.lastIndexOf(PATH_SEPARATOR);
 
-    /**
-     *
-     * @param {AssetManager} assetManager
-     * @param {CTX} context
-     */
-    async link(assetManager, context) {
-        this.assetManager = assetManager;
-        this.context = context;
+    if (lastSlashIndex !== -1) {
+        return path.substring(lastSlashIndex + 1);
+    } else {
+        return path;
+    }
+}
+
+/**
+ *
+ * @param {string} path
+ * @returns {String|null}
+ */
+function computeFileExtension(path) {
+    const type_of_path = typeof path;
+    if (type_of_path !== "string") {
+        throw new Error(`path must be a string, instead was '${type_of_path}'`);
     }
 
-    /**
-     * Release any held resources, finalizing operation of the loader
-     */
-    async unlink() {
+    //get base
+    const pathBase = computePathBase(path);
 
-    }
+    const lastDotIndex = pathBase.lastIndexOf('.');
 
-    /**
-     *
-     * @param {AssetRequestScope} scope
-     * @param {string} path
-     * @param {function(Asset)} success
-     * @param {function} failure
-     * @param {function(current:number, total:number)} progress
-     */
-    load(scope, path, success, failure, progress) {
-        failure('Not Implemented');
+    if (lastDotIndex !== -1) {
+        return pathBase.substring(lastDotIndex + 1);
+    } else {
+        //no extension
+        return null;
     }
 }
 
@@ -69154,49 +69201,6 @@ class Asset {
 
 Asset.prototype.byteSize = 0;
 
-class ImageRGBADataAsset extends Asset {
-    /**
-     *
-     * @param {number[]|Uint8Array} data
-     * @param {number} width
-     * @param {number} height
-     * @param {number} [itemSize]
-     */
-    constructor(data, width, height, itemSize = 4) {
-        super();
-
-        /**
-         *
-         * @type {number[]}
-         */
-        this.data = data;
-
-        /**
-         *
-         * @type {number}
-         */
-        this.width = width;
-
-        /**
-         *
-         * @type {number}
-         */
-        this.height = height;
-
-        /**
-         * Number of channels
-         * @type {number}
-         */
-        this.itemSize = itemSize;
-
-        this.byteSize = data.length;
-    }
-
-    create() {
-        return new Sampler2D(this.data, this.itemSize, this.width, this.height);
-    }
-}
-
 const CrossOriginKind = {
     UseCredentials: 'use-credentials',
     Anonymous: 'anonymous'
@@ -69212,6 +69216,53 @@ class CrossOriginConfig {
 const default_coc = new CrossOriginConfig();
 CrossOriginConfig.default = Object.freeze(default_coc);
 
+/**
+ * @template CTX
+ * @template Asset
+ */
+class AssetLoader {
+    /**
+     *
+     * @type {AssetManager}
+     */
+    assetManager = null;
+
+    /**
+     *
+     * @type {CTX}
+     */
+    context = null;
+
+    /**
+     *
+     * @param {AssetManager} assetManager
+     * @param {CTX} context
+     */
+    async link(assetManager, context) {
+        this.assetManager = assetManager;
+        this.context = context;
+    }
+
+    /**
+     * Release any held resources, finalizing operation of the loader
+     */
+    async unlink() {
+
+    }
+
+    /**
+     *
+     * @param {AssetRequestScope} scope
+     * @param {string} path
+     * @param {function(Asset)} success
+     * @param {function} failure
+     * @param {function(current:number, total:number)} progress
+     */
+    load(scope, path, success, failure, progress) {
+        failure('Not Implemented');
+    }
+}
+
 class ArrayBufferLoader extends AssetLoader {
     /**
      *
@@ -69296,33 +69347,33 @@ class ArrayBufferLoader extends AssetLoader {
             }
 
             const reader = response.body.getReader();
-            response.headers.get('Content-Length');
+            const contentLength = response.headers.get('Content-Length');
+            const total = contentLength ? parseInt(contentLength) : 0;
             let loaded = 0;
 
             // periodically read data into the new stream tracking while download progress
             const stream = new ReadableStream({
+                type: "bytes",
                 start(controller) {
 
-                    readData();
+                    pump();
 
-                    function readData() {
+                    function pump() {
 
                         reader.read().then(({ done, value }) => {
 
                             if (done) {
-
+                                // no more data, we're done
                                 controller.close();
+                                return;
+                            }
 
-                            } else {
-
-                                loaded += value.byteLength;
-
-                                progress(loaded, length);
+                            loaded += value.byteLength;
 
-                                controller.enqueue(value);
-                                readData();
+                            progress(loaded, total);
 
-                            }
+                            controller.enqueue(value);
+                            pump();
 
                         });
 
@@ -69466,6 +69517,10 @@ class OnDemandWorkerManager {
         this.worker = worker;
     }
 
+    /**
+     * In milliseconds
+     * @param {number} v
+     */
     setTimeout(v) {
         assert.isNonNegativeInteger(v, 'v');
 
@@ -69572,7 +69627,7 @@ class ThreadedImageDecoder extends Codec {
          */
         this.worker = new OnDemandWorkerManager(workerBuilder.build());
 
-        this.worker.setTimeout(200);
+        this.worker.setTimeout(1200);
     }
 
     async test(data) {
@@ -69591,104 +69646,46 @@ class ThreadedImageDecoder extends Codec {
     }
 }
 
-/**
- *
- * @param {Image|ImageBitmap|HTMLImageElement} img
- * @returns {Uint8Array}
- */
-function decode(img) {
-    const imgWidth = img.width;
-    const imgHeight = img.height;
-
-    //
-    const canvas = document.createElement('canvas');
-
-    canvas.width = imgWidth;
-    canvas.height = imgHeight;
-
-    const context = canvas.getContext('2d');
-
-    context.drawImage(img, 0, 0, imgWidth, imgHeight);
-
-    const imgd = context.getImageData(0, 0, imgWidth, imgHeight);
-
-    return imgd.data;
-}
-
-class NativeImageDecoder extends Codec {
-    async decode(data) {
-        const image = new Image();
-
-        // convert binary data to image URL that we can load
-        const blob = new Blob([data]);
-        const url = URL.createObjectURL(blob);
-
-        image.src = url;
-
-        // give browser a chance to decode image in async
-        await image.decode();
-
-        const rgba_data = decode(image);
+class ImageRGBADataAsset extends Asset {
+    /**
+     *
+     * @param {number[]|Uint8Array} data
+     * @param {number} width
+     * @param {number} height
+     * @param {number} [itemSize]
+     */
+    constructor(data, width, height, itemSize = 4) {
+        super();
 
-        const width = image.width;
-        const height = image.height;
+        /**
+         *
+         * @type {number[]}
+         */
+        this.data = data;
 
-        // release resources
-        URL.revokeObjectURL(url);
+        /**
+         *
+         * @type {number}
+         */
+        this.width = width;
 
-        return {
-            data: rgba_data,
-            width: width,
-            height: height,
-            itemSize: 4,
-            bitDepth: 8
-        };
-    }
-}
-
-const PATH_SEPARATOR = '/';
-
-/**
- * Strips all directories from the path.
- * @example 'a/b/c' -> 'c'
- * @param {string} path
- * @returns {string}
- */
-function computePathBase(path) {
-    if (typeof path !== "string") {
-        throw new Error('path is not a string');
-    }
+        /**
+         *
+         * @type {number}
+         */
+        this.height = height;
 
-    const lastSlashIndex = path.lastIndexOf(PATH_SEPARATOR);
+        /**
+         * Number of channels
+         * @type {number}
+         */
+        this.itemSize = itemSize;
 
-    if (lastSlashIndex !== -1) {
-        return path.substring(lastSlashIndex + 1);
-    } else {
-        return path;
-    }
-}
-
-/**
- *
- * @param {string} path
- * @returns {String|null}
- */
-function computeFileExtension(path) {
-    const type_of_path = typeof path;
-    if (type_of_path !== "string") {
-        throw new Error(`path must be a string, instead was '${type_of_path}'`);
+        this.byteSize = data.length;
     }
 
-    //get base
-    const pathBase = computePathBase(path);
-
-    const lastDotIndex = pathBase.lastIndexOf('.');
-
-    if (lastDotIndex !== -1) {
-        return pathBase.substring(lastDotIndex + 1);
-    } else {
-        //no extension
-        return null;
+    create() {
+        return new Sampler2D(this.data, this.itemSize, this.width, this.height);
     }
 }
 
@@ -69700,7 +69697,7 @@ class ImageRGBADataLoader extends AssetLoader {
 
         this.decoder = new CodecWithFallback(
             new ThreadedImageDecoder(),
-            new NativeImageDecoder()
+            // new NativeImageDecoder()
         );
     }
 
@@ -69742,7 +69739,6 @@ class ImageRGBADataLoader extends AssetLoader {
 
         const bitmap = await this.__decode_via_worker(path, scope);
 
-
         let data;
 
         const bitDepth = bitmap.bitDepth;

package/package.json

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

package/src/core/binary/UINT32_MAX.js

@@ -0,0 +1,5 @@
+/**
+ * equal to `Math.pow(2,32) - 1`
+ * @type {number}
+ */
+export const UINT32_MAX = 4294967295;

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

@@ -1,4 +1,5 @@
 import { assert } from "../../assert.js";
+import { UINT32_MAX } from "../../binary/UINT32_MAX.js";
 import { array_copy } from "../../collection/array/array_copy.js";
 import { typed_array_copy } from "../../collection/array/typed/typed_array_copy.js";
 import { aabb3_compute_surface_area } from "../../geom/3d/aabb/aabb3_compute_surface_area.js";
@@ -51,6 +52,13 @@ export const ELEMENT_WORD_COUNT = 10;
  */
 const INITIAL_CAPACITY = 128;
 
+
+/**
+ * Tree can not contain more than this number of nodes
+ * @type {number}
+ */
+const NODE_CAPACITY_LIMIT = Math.floor(UINT32_MAX / (ELEMENT_WORD_COUNT * 4));
+
 /**
  * Bounding Volume Hierarchy implementation. Stores unsigned integer values at leaves, these are typically IDs or Index values.
  * Highly optimized both in terms of memory usage and CPU. Most of the code inlined. No allocation are performed during usage (except for growing the tree capacity).
@@ -145,17 +153,26 @@ export class BVH {
     }
 
     __grow_capacity() {
-        const new_capacity = Math.ceil(max2(
+        if (this.__capacity >= NODE_CAPACITY_LIMIT) {
+            throw new Error('Can not grow capacity, already at maximum platform limit');
+        }
+
+        let new_capacity = Math.ceil(max2(
             this.__capacity * CAPACITY_GROW_MULTIPLIER,
             this.__capacity + CAPACITY_GROW_MIN_STEP
         ));
 
+        if (new_capacity > NODE_CAPACITY_LIMIT) {
+            // can not grow as much as we'd like, but we can still grow up to the limit
+            new_capacity = NODE_CAPACITY_LIMIT;
+        }
+
         this.__set_capacity(new_capacity);
     }
 
     /**
      *
-     * @param {number} new_capacity
+     * @param {number} new_capacity in number of nodes
      * @private
      */
     __set_capacity(new_capacity) {
@@ -707,6 +724,9 @@ export class BVH {
             assert.notEqual(child1, NULL_NODE, 'child1 is null');
             assert.notEqual(child2, NULL_NODE, 'child2 is null');
 
+            assert.notEqual(child1, index, 'child1 is equal to parent');
+            assert.notEqual(child2, index, 'child2 is equal to parent');
+
             this.node_set_combined_aabb(index, child1, child2);
 
             index = uint32[address + COLUMN_PARENT];
@@ -734,6 +754,9 @@ export class BVH {
             assert.notEqual(child1, NULL_NODE, 'child1 is null');
             assert.notEqual(child2, NULL_NODE, 'child2 is null');
 
+            assert.notEqual(child1, index, 'child1 is equal to parent');
+            assert.notEqual(child2, index, 'child2 is equal to parent');
+
             uint32[node_address + COLUMN_HEIGHT] = 1 + max2(
                 uint32[child1 * ELEMENT_WORD_COUNT + COLUMN_HEIGHT],
                 uint32[child2 * ELEMENT_WORD_COUNT + COLUMN_HEIGHT],
@@ -815,6 +838,9 @@ export class BVH {
         const iB = uint32[iA * ELEMENT_WORD_COUNT + COLUMN_CHILD_1];
         const iC = uint32[iA * ELEMENT_WORD_COUNT + COLUMN_CHILD_2];
 
+        assert.notEqual(iA, iB, 'child1 equal to parent');
+        assert.notEqual(iA, iB, 'child2 equal to parent');
+
         assert.greaterThanOrEqual(iB, 0);
         assert.lessThan(iB, this.node_capacity);
         assert.greaterThanOrEqual(iC, 0);
@@ -830,6 +856,9 @@ export class BVH {
             const iF = uint32[iC * ELEMENT_WORD_COUNT + COLUMN_CHILD_1];
             const iG = uint32[iC * ELEMENT_WORD_COUNT + COLUMN_CHILD_2];
 
+            assert.notEqual(iC, iF, 'child1 equal to parent');
+            assert.notEqual(iC, iG, 'child2 equal to parent');
+
             // b2TreeNode* F = m_nodes + iF;
             // b2TreeNode* G = m_nodes + iG;
 
@@ -848,6 +877,7 @@ export class BVH {
 
             // A's old parent should point to C
             if (a_parent !== NULL_NODE) {
+                assert.notEqual(a_parent, iC);
                 if (uint32[a_parent * ELEMENT_WORD_COUNT + COLUMN_CHILD_1] === iA) {
                     uint32[a_parent * ELEMENT_WORD_COUNT + COLUMN_CHILD_1] = iC;
                 } else {
@@ -900,6 +930,9 @@ export class BVH {
 
             }
 
+            assert.notEqual(iC, uint32[iC * ELEMENT_WORD_COUNT + COLUMN_CHILD_1]);
+            assert.notEqual(iC, uint32[iC * ELEMENT_WORD_COUNT + COLUMN_CHILD_2]);
+
             return iC;
         }
 
@@ -908,6 +941,9 @@ export class BVH {
             const iD = uint32[iB * ELEMENT_WORD_COUNT + COLUMN_CHILD_1];
             const iE = uint32[iB * ELEMENT_WORD_COUNT + COLUMN_CHILD_2];
 
+            assert.notEqual(iB, iD, 'child1 equal to parent');
+            assert.notEqual(iB, iE, 'child2 equal to parent');
+
             assert.greaterThanOrEqual(iD, 0);
             assert.lessThan(iD, this.node_capacity);
             assert.greaterThanOrEqual(iE, 0);
@@ -974,9 +1010,15 @@ export class BVH {
 
             }
 
+            assert.notEqual(iB, uint32[iB * ELEMENT_WORD_COUNT + COLUMN_CHILD_1]);
+            assert.notEqual(iB, uint32[iB * ELEMENT_WORD_COUNT + COLUMN_CHILD_2]);
+
             return iB;
         }
 
+        assert.notEqual(iA, uint32[iA * ELEMENT_WORD_COUNT + COLUMN_CHILD_1]);
+        assert.notEqual(iA, uint32[iA * ELEMENT_WORD_COUNT + COLUMN_CHILD_2]);
+
         // no rotation
         return iA;
     }