@woosh/meep-engine 2.58.0 → 2.59.1

package/src/engine/ui/notification/NotificationManager.js

@@ -160,7 +160,7 @@ export class NotificationManager {
             //find existing entry
             for (const [view, builder] of views) {
 
-                if (builder.entity === entity) {
+                if (builder.id === entity) {
                     //clear from the map
                     views.delete(view);
                     break;

package/src/generation/markers/actions/placement/MarkerNodeEntityProcessor.js

@@ -10,7 +10,7 @@ export class MarkerNodeEntityProcessor {
 
     /**
      *
-     * @param {EntityBuilder} entity
+     * @param {Entity} entity
      * @param {MarkerNode} node
      * @param {GridData} data
      * @param {EntityComponentDataset} ecd

package/src/view/tooltip/gml/TooltipParser.js

@@ -1,33 +1,26 @@
-import { Cache } from "../../../core/cache/Cache.js";
-import { strictEquals } from "../../../core/function/Functions.js";
-import { parseTooltipString } from "./parser/parseTooltipString.js";
-import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
-import { string_compute_byte_size } from "../../../core/primitives/strings/string_compute_byte_size.js";
+import {Cache} from "../../../core/cache/Cache.js";
+import {strictEquals} from "../../../core/function/Functions.js";
+import {parseTooltipString} from "./parser/parseTooltipString.js";
+import {computeStringHash} from "../../../core/primitives/strings/computeStringHash.js";
+import {string_compute_byte_size} from "../../../core/primitives/strings/string_compute_byte_size.js";
 
 export class TooltipParser {
 
-    constructor() {
-
-        /**
-         *
-         * @type {Cache<String,Token[]>}
-         * @private
-         */
-        this.__cache = new Cache({
-            maxWeight: 1048576,
-            keyWeigher: string_compute_byte_size,
-            valueWeigher(tokens) {
-                return tokens.length * 256;
-            },
-            keyHashFunction: computeStringHash,
-            keyEqualityFunction: strictEquals
-        });
 
-    }
-
-    resetCache() {
-        this.__cache.clear();
-    }
+    /**
+     *
+     * @type {Cache<String,Token[]>}
+     * @private
+     */
+    #cache = new Cache({
+        maxWeight: 1048576,
+        keyWeigher: string_compute_byte_size,
+        valueWeigher(tokens) {
+            return tokens.length * 256;
+        },
+        keyHashFunction: computeStringHash,
+        keyEqualityFunction: strictEquals
+    });
 
     /**
      *
@@ -36,7 +29,7 @@ export class TooltipParser {
      */
     parse(code) {
 
-        const existing = this.__cache.get(code);
+        const existing = this.#cache.get(code);
 
         if (existing !== null) {
             // result is cached, reuse
@@ -47,7 +40,7 @@ export class TooltipParser {
         const tokens = parseTooltipString(code);
 
         // cache result
-        this.__cache.put(code, tokens);
+        this.#cache.put(code, tokens);
 
         return tokens;
     }

package/src/view/tooltip/gml/compiler/GMLReferenceCompiler.js

@@ -1,4 +1,4 @@
-import { assert } from "../../../../core/assert.js";
+import {assert} from "../../../../core/assert.js";
 
 /**
  * @template T
@@ -14,7 +14,8 @@ export class GMLReferenceCompiler {
      * @returns {T}
      */
     compile(options, database, localization, gml, tooltips) {
-
+        // override when implementing
+        throw new Error('Not Implemented');
     }
 
 

package/src/core/geom/3d/aabb/aabb3_intersects_ray_branchless.js

@@ -1,52 +0,0 @@
-import { min2 } from "../../../math/min2.js";
-import { max2 } from "../../../math/max2.js";
-
-/**
- * SLOW, don't use in production
- * It is branchless on systems where min/max instructions exist.
- * Unfortunately in JS that's not the case, so this is just a curiosity
- * @see https://tavianator.com/2011/ray_box.html
- * @param {number} x0
- * @param {number} y0
- * @param {number} z0
- * @param {number} x1
- * @param {number} y1
- * @param {number} z1
- * @param {number} oX
- * @param {number} oY
- * @param {number} oZ
- * @param {number} dirX
- * @param {number} dirY
- * @param {number} dirZ
- * @returns {boolean}
- */
-export function aabb3_intersects_ray_branchless(
-    x0, y0, z0,
-    x1, y1, z1,
-    oX, oY, oZ,
-    dirX, dirY, dirZ
-) {
-    const inv_dir_x = 1 / dirX;
-    const inv_dir_y = 1 / dirY;
-    const inv_dir_z = 1 / dirZ;
-
-    const tx1 = (x0 - oX) * inv_dir_x;
-    const tx2 = (x1 - oX) * inv_dir_x;
-
-    let tmin = min2(tx1, tx2);
-    let tmax = max2(tx1, tx2);
-
-    const ty1 = (y0 - oY) * inv_dir_y;
-    const ty2 = (y1 - oY) * inv_dir_y;
-
-    tmin = max2(tmin, min2(ty1, ty2));
-    tmax = min2(tmax, max2(ty1, ty2));
-
-    const tz1 = (z0 - oZ) * inv_dir_z;
-    const tz2 = (z1 - oZ) * inv_dir_z;
-
-    tmin = max2(tmin, min2(tz1, tz2));
-    tmax = min2(tmax, max2(tz1, tz2));
-
-    return tmax >= tmin;
-}

package/src/core/geom/3d/aabb/aabb3_intersects_ray_fast.js

@@ -1,176 +0,0 @@
-/**
- * Fast Ray-Box intersection
- * From "Graphics Gems", Academic Press, 1990
- * ported from C
- * see: https://web.archive.org/web/20090803054252/http://tog.acm.org/resources/GraphicsGems/gems/RayBox.c
- * @param {number} x0
- * @param {number} y0
- * @param {number} z0
- * @param {number} x1
- * @param {number} y1
- * @param {number} z1
- * @param {number} oX
- * @param {number} oY
- * @param {number} oZ
- * @param {number} dirX
- * @param {number} dirY
- * @param {number} dirZ
- * @returns {boolean}
- */
-export function aabb3_intersects_ray_fast(x0, y0, z0, x1, y1, z1, oX, oY, oZ, dirX, dirY, dirZ) {
-    let inside = true;
-
-    let quadrantX = 0;
-    let quadrantY = 0;
-    let quadrantZ = 0;
-
-    let maxTX = 0;
-    let maxTY = 0;
-    let maxTZ = 0;
-
-    let maxT = 0;
-
-    let candidatePlaneX = 0;
-    let candidatePlaneY = 0;
-    let candidatePlaneZ = 0;
-
-    let coordX = 0;
-    let coordY = 0;
-    let coordZ = 0;
-
-    /*
-        find candidate planes
-     */
-    if (oX < x0) {
-        quadrantX = 1; //LEFT
-        candidatePlaneX = x0;
-        inside = false;
-    } else if (oX > x1) {
-        quadrantX = 0; //RIGHT
-        candidatePlaneX = x1;
-        inside = false;
-    } else {
-        quadrantX = 2; //MIDDLE
-    }
-
-    if (oY < y0) {
-        quadrantY = 1; //LEFT
-        candidatePlaneY = y0;
-        inside = false;
-    } else if (oY > y1) {
-        quadrantY = 0; //RIGHT
-        candidatePlaneY = y1;
-        inside = false;
-    } else {
-        quadrantY = 2; //MIDDLE
-    }
-
-    if (oZ < z0) {
-        quadrantZ = 1; //LEFT
-        candidatePlaneZ = z0;
-        inside = false;
-    } else if (oZ > z1) {
-        quadrantZ = 0; //RIGHT
-        candidatePlaneZ = z1;
-        inside = false;
-    } else {
-        quadrantZ = 2; //MIDDLE
-    }
-
-    // Ray origin inside the bounding box
-    if (inside) {
-        return true;
-    }
-
-    // Calculate T distances to candidate planes
-    if (quadrantX !== 2 && dirX !== 0) {
-        maxTX = (candidatePlaneX - oX) / dirX;
-    } else {
-        maxTX = -1;
-    }
-
-    if (quadrantY !== 2 && dirY !== 0) {
-        maxTY = (candidatePlaneY - oY) / dirY;
-    } else {
-        maxTY = -1;
-    }
-
-    if (quadrantZ !== 2 && dirZ !== 0) {
-        maxTZ = (candidatePlaneZ - oZ) / dirZ;
-    } else {
-        maxTZ = -1;
-    }
-
-    // Get largest of maxT's for final choice of intersection
-    if (maxTX < maxTY) {
-        if (maxTY < maxTZ) {
-            maxT = maxTZ;
-            // Check if final candidate actually inside the box
-            if (maxT < 0) {
-                return false;
-            }
-
-            coordX = oX + maxT * dirX;
-            if (coordX < x0 || coordX > x1) {
-                return false;
-            }
-
-            coordY = oY + maxT * dirY;
-            if (coordY < y0 || coordY > y1) {
-                return false;
-            }
-
-        } else {
-            maxT = maxTY;
-            // Check if final candidate actually inside the box
-            if (maxT < 0) {
-                return false;
-            }
-
-            coordX = oX + maxT * dirX;
-            if (coordX < x0 || coordX > x1) {
-                return false;
-            }
-
-            coordZ = oZ + maxT * dirZ;
-            if (coordZ < z0 || coordZ > z1) {
-                return false;
-            }
-        }
-    } else if (maxTX < maxTZ) {
-        maxT = maxTZ;
-        // Check if final candidate actually inside the box
-        if (maxT < 0) {
-            return false;
-        }
-
-        coordX = oX + maxT * dirX;
-        if (coordX < x0 || coordX > x1) {
-            return false;
-        }
-
-        coordY = oY + maxT * dirY;
-        if (coordY < y0 || coordY > y1) {
-            return false;
-        }
-    } else {
-        maxT = maxTX;
-        // Check if final candidate actually inside the box
-        if (maxT < 0) {
-            return false;
-        }
-
-        coordY = oY + maxT * dirY;
-        if (coordY < y0 || coordY > y1) {
-            return false;
-        }
-
-        coordZ = oZ + maxT * dirZ;
-        if (coordZ < z0 || coordZ > z1) {
-            return false;
-        }
-    }
-
-    //ray hits the box
-    return true;
-}

package/src/core/geom/3d/aabb/aabb3_intersects_ray_slab.js

@@ -1,91 +0,0 @@
-import { max3 } from "../../../math/max3.js";
-import { min3 } from "../../../math/min3.js";
-
-/**
- * @see https://tavianator.com/fast-branchless-raybounding-box-intersections-part-2-nans/
- * NOTE: this solution forgoes consistent handling of NaNs in favor of execution speed
- * @param {number} x0
- * @param {number} y0
- * @param {number} z0
- * @param {number} x1
- * @param {number} y1
- * @param {number} z1
- * @param {number} oX
- * @param {number} oY
- * @param {number} oZ
- * @param {number} dirX
- * @param {number} dirY
- * @param {number} dirZ
- * @returns {boolean}
- */
-export function aabb3_intersects_ray_slab(
-    x0, y0, z0,
-    x1, y1, z1,
-    oX, oY, oZ,
-    dirX, dirY, dirZ
-) {
-    /*
-    Java CODE:
-        bool intersection(box b, ray r) {
-            double t1 = (b.min[0] - r.origin[0])*r.dir_inv[0];
-            double t2 = (b.max[0] - r.origin[0])*r.dir_inv[0];
-
-            double tmin = min(t1, t2);
-            double tmax = max(t1, t2);
-
-            for (int i = 1; i < 3; ++i) {
-                t1 = (b.min[i] - r.origin[i])*r.dir_inv[i];
-                t2 = (b.max[i] - r.origin[i])*r.dir_inv[i];
-
-                tmin = max(tmin, min(t1, t2));
-                tmax = min(tmax, max(t1, t2));
-            }
-
-            return tmax > max(tmin, 0.0);
-        }
-
-     */
-
-    let tmin_x, tmax_x, tmin_y, tmax_y, tmin_z, tmax_z;
-    const dir_inv_x = 1 / dirX;
-    const dir_inv_y = 1 / dirY;
-    const dir_inv_z = 1 / dirZ;
-
-    const t1_x = (x0 - oX) * dir_inv_x;
-    const t2_x = (x1 - oX) * dir_inv_x;
-
-    const t1_y = (y0 - oY) * dir_inv_y;
-    const t2_y = (y1 - oY) * dir_inv_y;
-
-    const t1_z = (z0 - oZ) * dir_inv_z;
-    const t2_z = (z1 - oZ) * dir_inv_z;
-
-
-    if (t1_x > t2_x) {
-        tmin_x = t2_x;
-        tmax_x = t1_x;
-    } else {
-        tmin_x = t1_x;
-        tmax_x = t2_x;
-    }
-    if (t1_y > t2_y) {
-        tmin_y = t2_y;
-        tmax_y = t1_y;
-    } else {
-        tmin_y = t1_y;
-        tmax_y = t2_y;
-    }
-    if (t1_z > t2_z) {
-        tmin_z = t2_z;
-        tmax_z = t1_z;
-    } else {
-        tmin_z = t1_z;
-        tmax_z = t2_z;
-    }
-
-    const tmin = max3(tmin_x, tmin_y, tmin_z);
-    const tmax = min3(tmax_x, tmax_y, tmax_z);
-
-
-    return tmax >= tmin;
-}