@woosh/meep-engine 2.48.21 → 2.48.23

package/src/core/geom/2d/aabb/aabb2_distance_to_point.js

@@ -0,0 +1,17 @@
+import { aabb2_distance_sqr_to_point } from "./aabb2_distance_sqr_to_point.js";
+
+/**
+ *
+ * @param {number} x0
+ * @param {number} y0
+ * @param {number} x1
+ * @param {number} y1
+ * @param {number} px
+ * @param {number} py
+ * @returns {number}
+ */
+export function aabb2_distance_to_point(x0, y0, x1, y1, px, py) {
+    const sqrD = aabb2_distance_sqr_to_point(x0, y0, x1, y1, px, py);
+    return Math.sqrt(sqrD);
+}
+

package/src/core/geom/2d/aabb/aabb2_distance_to_point.spec.js

@@ -0,0 +1,17 @@
+import { aabb2_distance_to_point } from "./aabb2_distance_to_point.js";
+
+test('aabb2_distance_to_point', () => {
+    expect(aabb2_distance_to_point(0, 0, 0, 0, 0, 0)).toBeCloseTo(0);
+
+    expect(aabb2_distance_to_point(0, 0, 0, 0, 1, 0)).toBeCloseTo(1);
+    expect(aabb2_distance_to_point(0, 0, 0, 0, 0, 1)).toBeCloseTo(1);
+
+    expect(aabb2_distance_to_point(0, 0, 0, 0, 1, 1)).toBeCloseTo(1.41421356237);
+
+
+    expect(aabb2_distance_to_point(0, 0, 1, 1, 2, 0.5)).toBeCloseTo(1);
+    expect(aabb2_distance_to_point(0, 0, 1, 1, 0.5, 2)).toBeCloseTo(1);
+
+    expect(aabb2_distance_to_point(0, 0, 1, 1, -1, 0.5)).toBeCloseTo(1);
+    expect(aabb2_distance_to_point(0, 0, 1, 1, 0.5, -1)).toBeCloseTo(1);
+});

package/src/core/geom/2d/aabb/aabb2_overlap_exists.js

@@ -0,0 +1,18 @@
+import { overlap1D } from "../../../math/interval/overlap1D.js";
+
+/**
+ *
+ * @param {number} ax0
+ * @param {number} ay0
+ * @param {number} ax1
+ * @param {number} ay1
+ * @param {number} bx0
+ * @param {number} by0
+ * @param {number} bx1
+ * @param {number} by1
+ * @returns {boolean} true if overlap exists, false if no overlap
+ */
+export function aabb2_overlap_exists(ax0, ay0, ax1, ay1, bx0, by0, bx1, by1) {
+    return overlap1D(ax0, ax1, bx0, bx1)
+        && overlap1D(ay0, ay1, by0, by1);
+}

package/src/core/geom/2d/aabb/aabb2_signed_distance_sqr_to_point.js

@@ -0,0 +1,45 @@
+import { max2 } from "../../../math/max2.js";
+
+/**
+ * Compute squared distance to point, value is negative if the point is inside the box
+ * @param {number} x0
+ * @param {number} y0
+ * @param {number} x1
+ * @param {number} y1
+ * @param {number} point_x
+ * @param {number} point_y
+ * @returns {number}
+ */
+export function aabb2_signed_distance_sqr_to_point(
+    x0, y0,
+    x1, y1,
+    point_x, point_y
+) {
+    //do projection
+    const xp0 = x0 - point_x;
+    const xp1 = point_x - x1;
+    const yp0 = y0 - point_y;
+    const yp1 = point_y - y1;
+
+    //calculate separation in each axis
+    let dx = max2(xp0, xp1);
+    let dy = max2(yp0, yp1);
+
+    if (dx >= 0 || dy >= 0) {
+        // non-penetrating, clamp axis
+        dx = max2(dx, 0);
+        dy = max2(dy, 0);
+
+        //straight-line distance
+        return (dx * dx + dy * dy);
+    } else {
+
+        //penetration, negative distance, pick nearest axis
+        if (Math.abs(dx) > Math.abs(dy)) {
+            return -(dy * dy)
+        } else {
+            return -dx * dx;
+        }
+
+    }
+}

package/src/core/geom/2d/aabb/aabb2_signed_distance_sqr_to_point.spec.js

@@ -0,0 +1,40 @@
+import { aabb2_signed_distance_sqr_to_point } from "./aabb2_signed_distance_sqr_to_point.js";
+
+test("0 size bounding box", () => {
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, 0, 0))
+        .toEqual(0);
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, 1, 0))
+        .toEqual(1);
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, -1, 0))
+        .toEqual(1);
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, 0, 1))
+        .toEqual(1);
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, 0, -1))
+        .toEqual(1);
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, 1, 1))
+        .toEqual(2);
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, 1, -1))
+        .toEqual(2);
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, -1, 1))
+        .toEqual(2);
+
+    expect(aabb2_signed_distance_sqr_to_point(0, 0, 0, 0, -1, -1))
+        .toEqual(2);
+
+});
+
+
+test("inside the box", () => {
+
+    expect(aabb2_signed_distance_sqr_to_point(-1, -1, 1, 1, 0, 0))
+        .toBeCloseTo(-1);
+
+});

package/src/core/geom/2d/aabb/aabb2_signed_distance_to_point.js

@@ -0,0 +1,27 @@
+//
+
+import { aabb2_signed_distance_sqr_to_point } from "./aabb2_signed_distance_sqr_to_point.js";
+
+/**
+ * Compute squared distance to point, value is negative if the point is inside the box
+ * @param {number} x0
+ * @param {number} y0
+ * @param {number} x1
+ * @param {number} y1
+ * @param {number} point_x
+ * @param {number} point_y
+ * @returns {number}
+ */
+export function aabb2_signed_distance_to_point(
+    x0, y0,
+    x1, y1,
+    point_x, point_y
+) {
+    const sqr = aabb2_signed_distance_sqr_to_point(x0, y0, x1, y1, point_x, point_y);
+
+    if (sqr < 0) {
+        return -Math.sqrt(-sqr);
+    } else {
+        return Math.sqrt(sqr);
+    }
+}

package/src/core/geom/2d/convex-hull/fixed_convex_hull_humus.js

@@ -41,6 +41,10 @@ export function fixed_convex_hull_humus(
 
     const ArrayConstructor = UintArrayForCount(k);
 
+    /**
+     *
+     * @type {number[]}
+     */
     const s = new ArrayConstructor(k);
 
     let combos = 0;

package/src/core/geom/2d/quad-tree/PointQuadTree.js

@@ -71,6 +71,9 @@ Element.prototype.remove = function () {
     this.parentNode.removeElement(this);
 };
 
+/**
+ * Prefer to use {@link QuadTreeNode} instead as that is more robust and has better performance
+ */
 class PointQuadTree {
     /**
      * @param {number} [x0]

package/src/core/geom/2d/quad-tree/QuadTreeDatum.js

@@ -1,5 +1,5 @@
 import { assert } from "../../../assert.js";
-import AABB2 from "../../AABB2.js";
+import AABB2 from "../../2d/aabb/AABB2.js";
 
 /**
  * @template D

package/src/core/geom/2d/quad-tree/QuadTreeNode.js

@@ -1,7 +1,7 @@
 import { assert } from "../../../assert.js";
 import { max2 } from "../../../math/max2.js";
 import { min2 } from "../../../math/min2.js";
-import AABB2 from "../../AABB2.js";
+import AABB2 from "../../2d/aabb/AABB2.js";
 import { QuadTreeDatum } from "./QuadTreeDatum.js";
 
 
@@ -241,8 +241,8 @@ export class QuadTreeNode extends AABB2 {
         const x1 = this.x1;
         const y1 = this.y1;
 
-        const xm = (x0 + x1) / 2;
-        const ym = (y0 + y1) / 2;
+        const xm = (x0 + x1) * 0.5;
+        const ym = (y0 + y1) * 0.5;
 
         this.topLeft = new QuadTreeNode(x0, y0, xm, ym);
         this.topLeft.parentNode = this;

package/src/core/geom/2d/quad-tree/qt_collect_by_circle.js

@@ -1,4 +1,4 @@
-import { aabb2_sqrDistanceToPoint } from "../AABB2Math.js";
+import { aabb2_signed_distance_sqr_to_point } from "../aabb/aabb2_signed_distance_sqr_to_point.js";
 
 /**
  *
@@ -23,19 +23,17 @@ export function qt_collect_by_circle(
 ) {
     let result_cursor = result_offset;
 
-    let stack_pointer = 0;
+    let stack_pointer = 1;
 
     const r2 = radius * radius;
 
-    node_stack[stack_pointer] = tree;
-    stack_pointer++;
+    node_stack[0] = tree;
 
-    while (stack_pointer > 0) {
+    while (stack_pointer-- > 0) {
 
-        --stack_pointer;
         const node = node_stack[stack_pointer];
 
-        const d2 = aabb2_sqrDistanceToPoint(node.x0, node.y0, node.x1, node.y1, x, y);
+        const d2 = aabb2_signed_distance_sqr_to_point(node.x0, node.y0, node.x1, node.y1, x, y);
 
         if (d2 > r2) {
             // not a match
@@ -48,7 +46,7 @@ export function qt_collect_by_circle(
         for (let i = 0; i < data_count; i++) {
             const datum = data[i];
 
-            const d2_to_datum = aabb2_sqrDistanceToPoint(datum.x0, datum.y0, datum.x1, datum.y1, x, y);
+            const d2_to_datum = aabb2_signed_distance_sqr_to_point(datum.x0, datum.y0, datum.x1, datum.y1, x, y);
 
             if (d2_to_datum <= r2) {
                 result[result_cursor++] = datum;

package/src/core/geom/2d/quad-tree/qt_match_data_by_circle.js

@@ -1,4 +1,4 @@
-import { aabb2_sqrDistanceToPoint } from "../AABB2Math.js";
+import { aabb2_distance_sqr_to_point } from "../aabb/aabb2_distance_sqr_to_point.js";
 
 /**
  *
@@ -38,7 +38,7 @@ export function qt_match_data_by_circle(
         --stack_pointer;
         const node = node_stack[stack_pointer];
 
-        const d2 = aabb2_sqrDistanceToPoint(node.x0, node.y0, node.x1, node.y1, x, y);
+        const d2 = aabb2_distance_sqr_to_point(node.x0, node.y0, node.x1, node.y1, x, y);
 
         if (d2 > r2) {
             // not a match
@@ -51,7 +51,7 @@ export function qt_match_data_by_circle(
         for (let i = 0; i < data_count; i++) {
             const datum = data[i];
 
-            const d2_to_datum = aabb2_sqrDistanceToPoint(datum.x0, datum.y0, datum.x1, datum.y1, x, y);
+            const d2_to_datum = aabb2_distance_sqr_to_point(datum.x0, datum.y0, datum.x1, datum.y1, x, y);
 
             if (d2_to_datum <= r2 && predicate.call(predicateContext, datum.data)) {
                 result[result_cursor++] = datum;

package/src/core/geom/2d/quad-tree/qt_query_data_nearest_to_point.js

@@ -1,5 +1,5 @@
-import { aabb2_sqrDistanceToPoint } from "../AABB2Math.js";
 import { max2 } from "../../../math/max2.js";
+import { aabb2_distance_sqr_to_point } from "../aabb/aabb2_distance_sqr_to_point.js";
 
 /**
  *
@@ -30,7 +30,7 @@ export function qt_query_data_nearest_to_point(tree, x, y, max_distance = Infini
         --stack_pointer;
         const node = node_stack[stack_pointer];
 
-        const distance_sqr = max2(0, aabb2_sqrDistanceToPoint(node.x0, node.y0, node.x1, node.y1, x, y));
+        const distance_sqr = max2(0, aabb2_distance_sqr_to_point(node.x0, node.y0, node.x1, node.y1, x, y));
 
         if (distance_sqr >= best_distance_sqr) {
             // too far
@@ -42,7 +42,7 @@ export function qt_query_data_nearest_to_point(tree, x, y, max_distance = Infini
         for (let i = 0; i < data.length; i++) {
             const datum = data[i];
 
-            const distance_sqr = max2(0, aabb2_sqrDistanceToPoint(datum.x0, datum.y0, datum.x1, datum.y1, x, y));
+            const distance_sqr = max2(0, aabb2_distance_sqr_to_point(datum.x0, datum.y0, datum.x1, datum.y1, x, y));
 
             if (distance_sqr < best_distance_sqr) {
                 best_leaf_data = datum;

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/AABB3.d.ts

@@ -1,4 +1,4 @@
-import Vector3 from "../../geom/Vector3";
+import Vector3 from "../../Vector3";
 
 export class AABB3 {
     x0: number

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/AABB3.js

@@ -3,19 +3,19 @@
  */
 
 
-import { aabb3_compute_distance_above_plane_max } from "../../geom/3d/aabb/aabb3_compute_distance_above_plane_max.js";
-import { aabb3_compute_plane_side } from "../../geom/3d/aabb/aabb3_compute_plane_side.js";
-import computeMortonCode from "../../geom/3d/morton/Morton.js";
-import { aabb3_build_corners } from "../../geom/3d/aabb/aabb3_build_corners.js";
-import { assert } from "../../assert.js";
-import { aabb3_intersects_frustum_degree } from "../../geom/3d/aabb/aabb3_intersects_frustum_degree.js";
-import { aabb3_intersects_line_segment } from "../../geom/3d/aabb/aabb3_intersects_line_segment.js";
-import { aabb3_intersects_ray } from "../../geom/3d/aabb/aabb3_intersects_ray.js";
-import { aabb3_compute_surface_area } from "../../geom/3d/aabb/aabb3_compute_surface_area.js";
-import { aabb3_intersects_frustum_array } from "../../geom/3d/aabb/aabb3_intersects_frustum_array.js";
-import { aabb3_matrix4_project } from "../../geom/3d/aabb/aabb3_matrix4_project.js";
-import { aabb3_signed_distance_sqr_to_point } from "../../geom/3d/aabb/aabb3_signed_distance_sqr_to_point.js";
-import { aabb3_array_contains_point } from "../../geom/3d/aabb/aabb3_array_contains_point.js";
+import { aabb3_compute_distance_above_plane_max } from "./aabb3_compute_distance_above_plane_max.js";
+import { aabb3_compute_plane_side } from "./aabb3_compute_plane_side.js";
+import computeMortonCode from "../morton/Morton.js";
+import { aabb3_build_corners } from "./aabb3_build_corners.js";
+import { assert } from "../../../assert.js";
+import { aabb3_intersects_frustum_degree } from "./aabb3_intersects_frustum_degree.js";
+import { aabb3_intersects_line_segment } from "./aabb3_intersects_line_segment.js";
+import { aabb3_intersects_ray } from "./aabb3_intersects_ray.js";
+import { aabb3_compute_surface_area } from "./aabb3_compute_surface_area.js";
+import { aabb3_intersects_frustum_array } from "./aabb3_intersects_frustum_array.js";
+import { aabb3_matrix4_project } from "./aabb3_matrix4_project.js";
+import { aabb3_signed_distance_sqr_to_point } from "./aabb3_signed_distance_sqr_to_point.js";
+import { aabb3_array_contains_point } from "./aabb3_array_contains_point.js";
 
 
 export class AABB3 {

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/AABB3.spec.js

@@ -1,4 +1,4 @@
-import { BinaryBuffer } from "../../binary/BinaryBuffer.js";
+import { BinaryBuffer } from "../../../binary/BinaryBuffer.js";
 import { AABB3 } from "./AABB3.js";
 import { serializeAABB3Quantized16Uint } from "./serializeAABB3Quantized16Uint.js";
 import { deserializeAABB3Quantized16Uint } from "./deserializeAABB3Quantized16Uint.js";

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

@@ -23,17 +23,21 @@ export function aabb3_signed_distance_sqr_to_point(x0, y0, z0, x1, y1, z1, point
     const zp1 = point_z - z1;
 
     //calculate separation in each axis
-    const dx = max2(xp0, xp1);
-    const dy = max2(yp0, yp1);
-    const dz = max2(zp0, zp1);
+    let dx = max2(xp0, xp1);
+    let dy = max2(yp0, yp1);
+    let dz = max2(zp0, zp1);
 
-    //straight-line distance
-    const distance_sqr = dx * dx + dy * dy + dz * dz;
 
-    if (dx < 0 && dy < 0 && dz < 0) {
-        //penetration, negative distance
-        return -distance_sqr;
+    if (dx > 0 || dy > 0 || dz > 0) {
+        // non-penetrating, clamp axis
+        dx = max2(dx, 0);
+        dy = max2(dy, 0);
+        dz = max2(dz, 0);
+
+        //straight-line distance
+        return dx * dx + dy * dy + dz * dz;
     } else {
-        return distance_sqr;
+        //penetration, negative distance
+        return -(dx * dx + dy * dy + dz * dz);
     }
 }

package/src/core/geom/3d/topology/util/compute_face_connection_weight.js

@@ -0,0 +1,40 @@
+import { v3_distance_sqr } from "../../../v3_distance_sqr";
+import { v3_dot } from "../../../v3_dot.js";
+
+/**
+ *
+ * @param {TopoTriangle} f0
+ * @param {TopoTriangle} f1
+ * @returns {number}
+ */
+export function compute_face_connection_weight(f0, f1) {
+    const vertices_0 = f0.vertices;
+    const vertices_1 = f1.vertices;
+
+    // compute center
+    const f0_center_x = (vertices_0[0].x + vertices_0[1].x + vertices_0[2].x) * 0.333;
+    const f0_center_y = (vertices_0[0].y + vertices_0[1].y + vertices_0[2].y) * 0.333;
+    const f0_center_z = (vertices_0[0].z + vertices_0[1].z + vertices_0[2].z) * 0.333;
+
+    const f1_center_x = (vertices_1[0].x + vertices_1[1].x + vertices_1[2].x) * 0.333;
+    const f1_center_y = (vertices_1[0].y + vertices_1[1].y + vertices_1[2].y) * 0.333;
+    const f1_center_z = (vertices_1[0].z + vertices_1[1].z + vertices_1[2].z) * 0.333;
+
+    const distance_sqr = v3_distance_sqr(
+        f0_center_x, f0_center_y, f0_center_z,
+        f1_center_x, f1_center_y, f1_center_z
+    );
+
+    // compute normal dot
+    const n0 = f0.normal;
+    const n1 = f1.normal;
+
+    const dot = v3_dot(
+        n0[0], n0[1], n0[2],
+        n1[0], n1[1], n1[2],
+    );
+
+    const distance_weight = distance_sqr !== 0 ? 0.01 / distance_sqr : 10000;
+
+    return 2 + distance_weight + dot * 0.1;
+}

package/src/core/geom/packing/max-rect/MaxRectangles.js

@@ -4,7 +4,7 @@ import { max2 } from "../../../math/max2.js";
 import { min2 } from "../../../math/min2.js";
 import { QuadTreeDatum } from "../../2d/quad-tree/QuadTreeDatum.js";
 import { QuadTreeNode } from "../../2d/quad-tree/QuadTreeNode.js";
-import AABB2 from "../../AABB2.js";
+import AABB2 from "../../2d/aabb/AABB2.js";
 import Vector2 from "../../Vector2.js";
 import { removeRedundantBoxesArray } from "./removeRedundantBoxesArray.js";
 import { removeRedundantBoxes } from "./removeRedundantBoxes.js";

package/src/core/geom/{GeometryMath.js → rayTriangleIntersection.js}

@@ -15,7 +15,11 @@ const sp3 = new SurfacePoint3();
  * @param {Vector3} c
  * @returns {boolean}
  */
-export function rayTriangleIntersection(result, rayOrigin, rayDirection, a, b, c) {
+export function rayTriangleIntersection(
+    result,
+    rayOrigin, rayDirection,
+    a, b, c
+) {
 
     const hit_found = computeTriangleRayIntersection(
         sp3,

package/src/core/graph/GraphUtils.js

@@ -3,7 +3,7 @@
  */
 
 
-import { computeLine2Intersection } from "../geom/LineSegment2.js";
+import { computeLine2Intersection } from "../geom/2d/LineSegment2.js";
 
 const Utils = {};
 

package/src/core/graph/build_face_graph_from_mesh.js

@@ -1,8 +1,6 @@
 import { Graph } from "./v2/Graph.js";
 import { MultiNode } from "./MultiNode.js";
-import {
-    compute_face_connection_weight
-} from "../../engine/graphics/micron/build/clustering/compute_face_connection_weight.js";
+import { compute_face_connection_weight } from "../geom/3d/topology/util/compute_face_connection_weight.js";
 import { WeightedEdge } from "./WeightedEdge.js";
 import { graph_compute_disconnected_clusters } from "./graph_compute_disconnected_clusters.js";
 

package/src/core/graph/layout/BoxLayouter.js

@@ -4,7 +4,7 @@
  */
 
 
-import AABB2 from "../../geom/AABB2.js";
+import AABB2 from "../../geom/2d/aabb/AABB2.js";
 import Vector2 from "../../geom/Vector2.js";
 import { computeDisconnectedSubGraphs } from "./computeDisconnectedSubGraphs.js";
 import { Connection } from "./Connection.js";

package/src/core/graph/layout/CircleLayout.js

@@ -5,8 +5,8 @@
  */
 import { assert } from "../../assert.js";
 import Circle from "../../geom/2d/circle/Circle.js";
-import AABB2 from "../../geom/AABB2.js";
-import { line2SegmentsIntersect } from "../../geom/LineSegment2.js";
+import AABB2 from "../../geom/2d/aabb/AABB2.js";
+import { line2SegmentsIntersect } from "../../geom/2d/LineSegment2.js";
 import Vector2, { v2_distance } from "../../geom/Vector2.js";
 import { max2 } from "../../math/max2.js";
 import { min2 } from "../../math/min2.js";

package/src/core/model/node-graph/visual/NodeVisualData.js

@@ -1,5 +1,5 @@
 import List from "../../../collection/list/List.js";
-import Rectangle from "../../../geom/Rectangle.js";
+import Rectangle from "../../../geom/2d/Rectangle.js";
 import { PortVisualData } from "./PortVisualData.js";
 
 export class NodeVisualData {

package/src/engine/asset/loaders/GLTFAssetLoader.js

@@ -2,7 +2,7 @@ import { Transform } from "../../ecs/transform/Transform.js";
 import { Asset } from "../Asset.js";
 import { prepareMaterial, prepareObject } from "../../graphics/three/ThreeFactory.js";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
-import { AABB3 } from "../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../core/geom/3d/aabb/AABB3.js";
 import { StaticMaterialCache } from "./material/StaticMaterialCache.js";
 import { DDSLoader } from "three/examples/jsm/loaders/DDSLoader.js";
 import { AnimationOptimizer } from "../../ecs/animation/AnimationOptimizer.js";

package/src/engine/asset/loaders/image/ImageRGBADataLoader.js

@@ -23,10 +23,10 @@ export class ImageRGBADataLoader extends AssetLoader {
     async link(assetManager, engine) {
 
         if (assetManager.getLoaderByType(ASSET_TYPE_ARRAY_BUFFER) === undefined) {
-            assetManager.registerLoader(ASSET_TYPE_ARRAY_BUFFER, new ArrayBufferLoader());
+            await assetManager.registerLoader(ASSET_TYPE_ARRAY_BUFFER, new ArrayBufferLoader());
         }
 
-        super.link(assetManager, engine);
+        await super.link(assetManager, engine);
     }
 
     /**

package/src/engine/asset/preloader/Preloader.js

@@ -86,7 +86,7 @@ Preloader.prototype.add = function (uri, type, level, priority) {
     }
     assets[level].push(def);
     this.totalAssetCount++;
-    this.on.added.dispatch(def, level);
+    this.on.added.send2(def, level);
     return this;
 };
 
@@ -108,7 +108,7 @@ Preloader.prototype.load = function (assetManager) {
             count: batch.length
         };
     });
-    on.loadStart.dispatch(initEvent);
+    on.loadStart.send1(initEvent);
     const numAssets = this.totalAssetCount;
     let numAssetsLoaded = 0;
 
@@ -178,7 +178,7 @@ Preloader.prototype.load = function (assetManager) {
             // console.log("requesting load of level ",levelToLoad);
             loadBatch(levelToLoad);
         } else {
-            on.completed.dispatch();
+            on.completed.send0();
         }
     }
 

package/src/engine/ecs/components/Renderable.d.ts

@@ -1,5 +1,5 @@
 import {Object3D} from "three";
-import {AABB3} from "../../../core/bvh2/aabb3/AABB3";
+import {AABB3} from "../../../core/geom/3d/aabb/AABB3";
 import {LeafNode} from "../../../core/bvh2/LeafNode";
 
 export default class Renderable {

package/src/engine/ecs/components/Renderable.js

@@ -4,7 +4,7 @@
 
 
 import { LeafNode } from "../../../core/bvh2/LeafNode.js";
-import { AABB3 } from "../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../core/geom/3d/aabb/AABB3.js";
 import { Vector3 as ThreeVector3 } from "three";
 import { max2 } from "../../../core/math/max2.js";
 import { min2 } from "../../../core/math/min2.js";

package/src/engine/ecs/gui/position/ViewportPositionSystem.js

@@ -6,7 +6,7 @@ import ViewportPosition from './ViewportPosition.js';
 import GUIElement from "../GUIElement.js";
 import { assert } from "../../../../core/assert.js";
 import { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
-import AABB2 from "../../../../core/geom/AABB2.js";
+import AABB2 from "../../../../core/geom/2d/aabb/AABB2.js";
 import { GUIElementEvent } from "../GUIElementEvent.js";
 import { EPSILON } from "../../../../core/math/EPSILON.js";
 import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";

package/src/engine/ecs/terrain/tiles/TerrainTile.js

@@ -24,7 +24,7 @@ import ObservedInteger from "../../../../core/model/ObservedInteger.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import Signal from "../../../../core/events/signal/Signal.js";
 import { mat4 } from "gl-matrix";
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { NumericInterval } from "../../../../core/math/interval/NumericInterval.js";
 import { array_copy } from "../../../../core/collection/array/copyArray.js";
 import { passThrough } from "../../../../core/function/Functions.js";

package/src/engine/ecs/terrain/tiles/TerrainTileManager.js

@@ -19,12 +19,12 @@ import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import { RaycastBVHVisitor } from "../../../../core/bvh2/traversal/RaycastBVHVisitor.js";
 import { FirstRayIntersectionTerrainBVHVisitor } from "./FirstRayIntersectionTerrainBVHVisitor.js";
 import { traverseBinaryNodeUsingVisitor } from "../../../../core/bvh2/traversal/traverseBinaryNodeUsingVisitor.js";
-import { aabb2_overlapExists } from "../../../../core/geom/AABB2.js";
 import ObservedInteger from "../../../../core/model/ObservedInteger.js";
 import { NumericInterval } from "../../../../core/math/interval/NumericInterval.js";
 import { randomFloatBetween } from "../../../../core/math/random/randomFloatBetween.js";
 import { mat4, vec3 } from "gl-matrix";
 import { isArrayEqualStrict } from "../../../../core/collection/array/isArrayEqualStrict.js";
+import { aabb2_overlap_exists } from "../../../../core/geom/2d/aabb/aabb2_overlap_exists.js";
 
 class TerrainTileManager {
     /**
@@ -296,7 +296,7 @@ class TerrainTileManager {
             const tx1 = tx0 + tile.size.x;
             const ty1 = ty0 + tile.size.y;
             if (
-                aabb2_overlapExists(
+                aabb2_overlap_exists(
                     x0, y0, x1, y1,
                     tx0, ty0, tx1, ty1
                 )

package/src/engine/ecs/tooltip/TooltipComponentSystem.js

@@ -4,7 +4,7 @@ import Vector3 from "../../../core/geom/Vector3.js";
 import { MeshSystem } from "../../graphics/ecs/mesh/MeshSystem.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import { VisualTip } from "../../../view/tooltip/VisualTip.js";
-import Rectangle from "../../../core/geom/Rectangle.js";
+import Rectangle from "../../../core/geom/2d/Rectangle.js";
 import { modelHitTest } from "../../graphics/util/modelHitTest.js";
 import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";

package/src/engine/graphics/camera/makeScreenScissorFrustum.d.ts

@@ -1,4 +1,4 @@
 import {Camera, Frustum} from "three";
-import AABB2 from "../../../core/geom/AABB2";
+import AABB2 from "../../../core/geom/2d/aabb/AABB2";
 
 export function makeScreenScissorFrustum(frustum: Frustum, box: AABB2, camera: Camera)