@woosh/meep-engine 2.48.22 → 2.49.0

package/src/engine/graphics/geometry/bvh/buffered/BVHGeometryRaycaster.js

@@ -1,7 +1,7 @@
 import Vector3 from "../../../../../core/geom/Vector3.js";
 
 import { Vector3 as ThreeVector3 } from 'three';
-import { rayTriangleIntersection } from "../../../../../core/geom/GeometryMath.js";
+import { rayTriangleIntersection } from "../../../../../core/geom/3d/triangle/rayTriangleIntersection.js";
 import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
 import { assert } from "../../../../../core/assert.js";
 import { v3_length } from "../../../../../core/geom/v3_length.js";

package/src/engine/graphics/geometry/skining/computeSkinnedMeshBoundingVolumes.js

@@ -1,5 +1,5 @@
 import { computeSkinnedMeshVertices } from "./computeSkinnedMeshVertices.js";
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import Vector4 from "../../../../core/geom/Vector4.js";
 import { computeBoundingSphereFromVertexData } from "../computeBoundingSphereFromVertexData.js";
 import { Box3, Sphere as ThreeSphere, Vector3 as ThreeVector3 } from "three";

package/src/engine/graphics/material/optimization/MaterialOptimizationContext.js

@@ -22,7 +22,7 @@ import { BUFFER_GEOMETRY_UVS } from "./BUFFER_GEOMETRY_UVS.js";
 import { is_compliant_mesh } from "./is_compliant_mesh.js";
 import { MaterialDescriptor } from "./MaterialDescriptor.js";
 import { computeThreeTextureTypeFromDataType } from "../../texture/computeThreeTextureTypeFromDataType.js";
-import { typedArrayToDataType } from "../../../../core/collection/array/typedArrayToDataType.js";
+import { typedArrayToDataType } from "../../../../core/collection/array/typed/typedArrayToDataType.js";
 import { BinaryDataType } from "../../../../core/binary/type/BinaryDataType.js";
 import {
     compute_typed_array_constructor_from_data_type

package/src/engine/graphics/particles/particular/engine/MovingBoundingBox.js

@@ -1,4 +1,4 @@
-import { AABB3 } from "../../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../../core/geom/3d/aabb/AABB3.js";
 import { RowFirstTable } from "../../../../../core/collection/table/RowFirstTable.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
 import { BinaryDataType } from "../../../../../core/binary/type/BinaryDataType.js";

package/src/engine/graphics/particles/particular/engine/emitter/ParticleEmitter.js

@@ -14,7 +14,7 @@ import { ParticleParameters } from "./ParticleParameters.js";
 import { BlendingType } from "../../../../texture/sampler/BlendingType.js";
 import Quaternion from "../../../../../../core/geom/Quaternion.js";
 import { ParticleEmitterFlag } from "./ParticleEmitterFlag.js";
-import { AABB3 } from "../../../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../../../core/geom/3d/aabb/AABB3.js";
 import {
     PARTICLE_ATTRIBUTE_AGE,
     PARTICLE_ATTRIBUTE_BLEND,

package/src/engine/graphics/particles/particular/engine/emitter/ParticleLayer.js

@@ -1,7 +1,7 @@
 import Vector3 from "../../../../../../core/geom/Vector3.js";
 import { NumericInterval } from "../../../../../../core/math/interval/NumericInterval.js";
 import { ParameterTrackSet } from "../parameter/ParameterTrackSet.js";
-import { AABB3 } from "../../../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../../../core/geom/3d/aabb/AABB3.js";
 import { ParticleParameters } from "./ParticleParameters.js";
 import { ConicRay } from "../../../../../../core/geom/ConicRay.js";
 import { SimulationStepDefinition } from "../simulator/SimulationStepDefinition.js";

package/src/engine/graphics/particles/particular/engine/parameter/ParameterLookupTable.js

@@ -125,6 +125,7 @@ export class ParameterLookupTable {
      */
     sample(position, result) {
         assert.isNumber(position, 'position');
+        assert.notNaN(position, 'position');
         // assert.greaterThanOrEqual(position, 0, 'position');
         // assert.ok(position >= 0 && position <= 1, `position must be between 0 and 1, instead was ${position}`);
 

package/src/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -77,7 +77,7 @@ import TopDownCameraController from "../../../../../ecs/camera/topdown/TopDownCa
 import { randomFloatBetween } from "../../../../../../../core/math/random/randomFloatBetween.js";
 import { MicronRenderPlugin } from "../../../../../micron/plugin/MicronRenderPlugin.js";
 import { obtainTerrain } from "../../../../../../ecs/terrain/util/obtainTerrain.js";
-import { pick } from "../../../../../../../ecs/grid/pick.js";
+import { pick } from "../../../../../../ecs/grid/pick.js";
 import { clamp01 } from "../../../../../../../core/math/clamp01.js";
 import { randomFromArray } from "../../../../../../../core/math/random/randomFromArray.js";
 import { SamplingFunctionKind } from "./SamplingFunctionKind.js";

package/src/engine/graphics/postprocess/threejs/postprocessing/TexturePass.js

@@ -1,7 +1,7 @@
 /**
  * @author alteredq / http://alteredqualia.com/
  */
-import * as THREE from 'TRHEE" ;
+import * as THREE from 'TRHEE';
 import CopyShader from "../shaders/CopyShader.js";
 
 const TexturePass = function (texture, opacity) {
@@ -14,7 +14,7 @@ const TexturePass = function (texture, opacity) {
     this.uniforms = THREE.UniformsUtils.clone(shader.uniforms);
 
     this.uniforms["opacity"].value = (opacity !== undefined) ? opacity : 1.0;
-    this.uniforms["tDiffuse'].value = texture;
+    this.uniforms["tDiffuse"].value = texture;
 
     this.material = new THREE.ShaderMaterial({
 

package/src/engine/graphics/render/forward_plus/debug/createScreenGrid.js

@@ -3,7 +3,7 @@ import { MouseEvents } from "../../../../input/devices/events/MouseEvents.js";
 import { readPositionFromMouseEvent } from "../../../../input/devices/PointerDevice.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
 import { VisualTip } from "../../../../../view/tooltip/VisualTip.js";
-import Rectangle from "../../../../../core/geom/Rectangle.js";
+import Rectangle from "../../../../../core/geom/2d/Rectangle.js";
 import LabelView from "../../../../../view/common/LabelView.js";
 import { CanvasView } from "../../../../../view/elements/CanvasView.js";
 import EmptyView from "../../../../../view/elements/EmptyView.js";

package/src/engine/graphics/render/view/CameraView.js

@@ -1,5 +1,5 @@
 import { IncrementalDeltaSet } from "../visibility/IncrementalDeltaSet.js";
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { CameraViewFlags } from "./CameraViewFlags.js";
 import { Frustum } from "three";
 import { read_frustum_planes_to_array } from "../../../../core/geom/3d/frustum/read_frustum_planes_to_array.js";

package/src/engine/graphics/sh3/path_tracer/GeometryBVHBatched.js

@@ -5,10 +5,10 @@ import { bvh_query_leaves_ray } from "../../../../core/bvh2/bvh3/query/bvh_query
 import {
     aabb3_signed_distance_sqr_to_point
 } from "../../../../core/geom/3d/aabb/aabb3_signed_distance_sqr_to_point.js";
+import { ebvh_build_for_geometry_morton } from "../../../../core/bvh2/bvh3/ebvh_build_for_geometry_morton.js";
 import {
     computeTriangleRayIntersectionBarycentric
-} from "../../../../core/geom/3d/triangle/computeTriangleRayIntersection.js";
-import { ebvh_build_for_geometry_morton } from "../../../../core/bvh2/bvh3/ebvh_build_for_geometry_morton.js";
+} from "../../../../core/geom/3d/triangle/computeTriangleRayIntersectionBarycentric.js";
 
 /**
  *

package/src/engine/graphics/texture/atlas/AtlasPatch.js

@@ -1,6 +1,6 @@
 import Vector2 from "../../../../core/geom/Vector2.js";
-import Rectangle from "../../../../core/geom/Rectangle.js";
-import AABB2 from "../../../../core/geom/AABB2.js";
+import Rectangle from "../../../../core/geom/2d/Rectangle.js";
+import AABB2 from "../../../../core/geom/2d/aabb/AABB2.js";
 
 export class AtlasPatch {
     constructor() {

package/src/engine/graphics/texture/atlas/TextureAtlas.spec.js

@@ -2,7 +2,7 @@ import { TextureAtlas } from "./TextureAtlas.js";
 import { Sampler2D } from "../sampler/Sampler2D.js";
 import { AtlasPatchFlag } from "./AtlasPatchFlag.js";
 import { AtlasPatch } from "./AtlasPatch.js";
-import { aabb2_overlapExists } from "../../../../core/geom/AABB2.js";
+import { aabb2_overlap_exists } from "../../../../core/geom/2d/aabb/aabb2_overlap_exists.js";
 
 expect.extend({
     toBeContainedInAtlas(patch, atlas) {
@@ -204,7 +204,7 @@ function isPackingValid(patches, atlas) {
             const _x1 = _x0 + patch1.size.x + patch1.padding * 2;
             const _y1 = _y0 + patch1.size.y + patch1.padding * 2;
 
-            if (aabb2_overlapExists(x0, y0, x1, y1, _x0, _y0, _x1, _y1)) {
+            if (aabb2_overlap_exists(x0, y0, x1, y1, _x0, _y0, _x1, _y1)) {
                 return false;
             }
         }

package/src/engine/graphics/texture/sampler/Sampler2D.js

@@ -10,7 +10,7 @@ import { mix } from "../../../../core/math/mix.js";
 import { BlendingType } from "./BlendingType.js";
 import { assert } from "../../../../core/assert.js";
 import { typedArrayConstructorByInstance } from "./typedArrayConstructorByInstance.js";
-import { typedArrayToDataType } from "../../../../core/collection/array/typedArrayToDataType.js";
+import { typedArrayToDataType } from "../../../../core/collection/array/typed/typedArrayToDataType.js";
 import {
     compute_typed_array_constructor_from_data_type
 } from "../../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";

package/src/engine/graphics/texture/sampler/sampler2d_compute_texel_value_conversion_scale_to_uint8.js

@@ -2,7 +2,7 @@ import { BinaryDataType } from "../../../../core/binary/type/BinaryDataType.js";
 import { min2 } from "../../../../core/math/min2.js";
 import { max2 } from "../../../../core/math/max2.js";
 import { isTypedArray } from "../../../../core/collection/array/typed/isTypedArray.js";
-import { typedArrayToDataType } from "../../../../core/collection/array/typedArrayToDataType.js";
+import { typedArrayToDataType } from "../../../../core/collection/array/typed/typedArrayToDataType.js";
 import { sampler2d_channel_compute_max } from "./sampler2d_channel_compute_max.js";
 import { sampler2d_channel_compute_min } from "./sampler2d_channel_compute_min.js";
 

package/src/engine/graphics/util/makeMeshPreviewScene.js

@@ -11,7 +11,7 @@ import { rootObject3DFastMatrixUpdate } from "../ecs/mesh/rootObject3DFastMatrix
 import { camera_compute_distance_to_fit_length } from "../camera/camera_compute_distance_to_fit_length.js";
 import { scaleObject3ToBox } from "./ScaleObject3ToBox.js";
 import { DEG_TO_RAD } from "../../../core/math/DEG_TO_RAD.js";
-import AABB2 from "../../../core/geom/AABB2.js";
+import AABB2 from "../../../core/geom/2d/aabb/AABB2.js";
 
 /**
  *

package/src/engine/graphics/util/renderObjectToSampler2D.js

@@ -1,5 +1,5 @@
 import { LinearFilter, RGBAFormat, WebGLRenderTarget } from "three";
-import AABB2 from "../../../core/geom/AABB2.js";
+import AABB2 from "../../../core/geom/2d/aabb/AABB2.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import { WebGLRendererPool } from "../render/RendererPool.js";
 import { makeMeshPreviewScene } from "./makeMeshPreviewScene.js";

package/src/engine/intelligence/behavior/Behavior.spec.js

@@ -0,0 +1,15 @@
+import { Behavior } from "./Behavior.js";
+
+test("constructor does not throw", () => {
+    expect(() => new Behavior()).not.toThrow();
+});
+
+test("context propagated from initialization method", () => {
+    const b = new Behavior();
+
+    const context = { test: "hello" };
+
+    b.initialize(context);
+
+    expect(b.context).toBe(context);
+});

package/src/engine/intelligence/mcts/MoveEdge.js

@@ -17,7 +17,7 @@ export class MoveEdge {
      * @returns S output state
      */
     move(inputState) {
-
+        throw new Error("Abstract method, needs to be overridden");
     }
 
     /**

package/src/engine/reference/v1/ReferenceManager.js

@@ -18,6 +18,9 @@ function Reference(target) {
     this.count = 0;
 }
 
+/**
+ * Prefer to use v2 reference system instead as it has simpler design is safer
+ */
 export class ReferenceManager {
     /**
      * @template Key, Value

package/src/engine/reference/v2/Reference.js

@@ -6,39 +6,34 @@ import Signal from "../../../core/events/signal/Signal.js";
 export class Reference {
 
     /**
-     * @template T
+     *
+     * @type {Signal<this,T>}
+     * @private
      */
-    constructor() {
-
-        /**
-         *
-         * @type {Signal}
-         * @private
-         */
-        this.__onReleased = new Signal();
-
-        /**
-         *
-         * @type {T}
-         * @private
-         */
-        this.__value = null;
-
-
-        /**
-         *
-         * @type {boolean}
-         * @private
-         */
-        this.__is_bound = false;
-    }
+    #onReleased = new Signal();
+
+    /**
+     *
+     * @type {T}
+     * @private
+     */
+    #value = null;
+
+
+    /**
+     *
+     * @type {boolean}
+     * @private
+     */
+    #is_bound = false;
+
 
     /**
      *
-     * @returns {Signal}
+     * @returns {Signal<this,T>}
      */
     get onReleased() {
-        return this.__onReleased;
+        return this.#onReleased;
     }
 
     /**
@@ -46,17 +41,17 @@ export class Reference {
      * @param {T} value
      */
     bind(value) {
-        if (value === this.__value) {
+        if (value === this.#value) {
             return;
         }
 
-        if (this.__is_bound) {
+        if (this.#is_bound) {
             throw new Error(`Reference is already bound, must release before binding to a new value`);
         }
 
-        this.__value = value;
+        this.#value = value;
 
-        this.__is_bound = true;
+        this.#is_bound = true;
     }
 
     /**
@@ -64,27 +59,28 @@ export class Reference {
      * @returns {T}
      */
     getValue() {
-        return this.__value;
+        return this.#value;
     }
 
     release() {
-        if (!this.__is_bound) {
+        if (!this.#is_bound) {
             // not bound
             return;
         }
 
-        const v = this.__value;
+        const v = this.#value;
 
         // prevent further usage of the reference
-        this.__value = null;
+        this.#value = null;
 
-        this.__is_bound = false;
+        this.#is_bound = false;
 
-        this.__onReleased.send2(this,v);
+        this.#onReleased.send2(this, v);
     }
 }
 
 /**
+ * Special NULL reference that can be used to indicate lack of reference
  * @readonly
  * @type {Readonly<Reference>}
  */

package/src/engine/sound/sopra/README.md

@@ -1 +1,7 @@
+## Sopra
+
+Object-oriented sound engine
+
+---
+
 Loosely based on concepts from FMOD and Wwise

package/src/engine/ui/tiles2d/computeTileGridMove.js

@@ -3,7 +3,8 @@ import { max2 } from "../../../core/math/max2.js";
 import { min2 } from "../../../core/math/min2.js";
 import { TileMoveProgram } from "./TileMoveProgram.js";
 import { TileMoveInstruction } from "./TileMoveInstruction.js";
-import { aabb2_contains, aabb2_overlapExists } from "../../../core/geom/AABB2.js";
+import { aabb2_overlap_exists } from "../../../core/geom/2d/aabb/aabb2_overlap_exists.js";
+import { aabb2_contains } from "../../../core/geom/2d/aabb/aabb2_contains.js";
 
 
 /**
@@ -121,7 +122,7 @@ export function computeTileGridMove(tile, targetX, targetY, source, target) {
             const x1 = x0 + sourceTile.size.x;
             const y1 = y0 + sourceTile.size.y;
 
-            if (!aabb2_overlapExists(sourceOcclusionRegionX0, sourceOcclusionRegionY0, sourceOcclusionRegionX1, sourceOcclusionRegionY1, x0, y0, x1, y1)) {
+            if (!aabb2_overlap_exists(sourceOcclusionRegionX0, sourceOcclusionRegionY0, sourceOcclusionRegionX1, sourceOcclusionRegionY1, x0, y0, x1, y1)) {
                 //tile is outside of the transfer area
                 continue;
             }

package/src/engine/ui/tiles2d/computeTileGridMove.spec.js

@@ -1,5 +1,5 @@
 import TileGrid from "./TileGrid.js";
-import Rectangle from "../../../core/geom/Rectangle.js";
+import Rectangle from "../../../core/geom/2d/Rectangle.js";
 import { computeTileGridMove } from "./computeTileGridMove.js";
 
 test("move to empty space works as intended", () => {

package/src/generation/automata/CaveGeneratorCellularAutomata.js

@@ -5,7 +5,6 @@ import { CellularAutomata } from "./CellularAutomata.js";
 export class CaveGeneratorCellularAutomata extends CellularAutomata {
     step(data, width, height) {
 
-
         const maxY = height - 1;
         const maxX = width - 1;
 
@@ -21,20 +20,24 @@ export class CaveGeneratorCellularAutomata extends CellularAutomata {
                 const columnLeft = max2(x - 1, 0);
                 const columnRight = min2(x + 1, maxX);
 
-                //
+                // read top row
+                const topLeft = data[rowIndexTop + columnLeft];
                 const top = data[rowIndexTop + x];
-                const bottom = data[rowIndexBottom + x];
+                const topRight = data[rowIndexTop + columnRight];
+
+                // read middle row
                 const left = data[rowIndex + columnLeft];
+                const cellValue = data[cellIndex];
                 const right = data[rowIndex + columnRight];
-                //
-                const topLeft = data[rowIndexTop + columnLeft];
-                const topRight = data[rowIndexTop + columnRight];
+
+                // read bottom row
                 const bottomLeft = data[rowIndexBottom + columnLeft];
+                const bottom = data[rowIndexBottom + x];
                 const bottomRight = data[rowIndexBottom + columnRight];
 
                 //count neighbours
                 const neighbourSum = top + bottom + left + right + topLeft + topRight + bottomLeft + bottomRight;
-                const cellValue = data[cellIndex];
+
 
                 if (cellValue > 0) {
                     //cell is alive

package/src/generation/automata/CaveGeneratorCellularAutomata.spec.js

@@ -0,0 +1,12 @@
+import { CaveGeneratorCellularAutomata } from "./CaveGeneratorCellularAutomata.js";
+
+test("single cell execution", () => {
+    const automata = new CaveGeneratorCellularAutomata();
+
+    const array = new Uint8Array([0]);
+
+    automata.step(array, 1, 1);
+
+    // cell should stay dead, no live neighbours
+    expect(array[0]).toBe(0);
+});

package/src/generation/automata/CellularAutomata.js

@@ -1,10 +1,11 @@
 import { seededRandom } from "../../core/math/random/seededRandom.js";
 
 export class CellularAutomata {
-    constructor() {
-
-        this.random = seededRandom(1);
-    }
+    /**
+     *
+     * @type {function(): number}
+     */
+    random = seededRandom(1);
 
     /**
      *

package/src/generation/filtering/numeric/complex/CellFilterGaussianBlur.js

@@ -86,6 +86,20 @@ export class CellFilterGaussianBlur extends CellFilter {
          * @private
          */
         this.__inv_kernel_total_power = 0;
+
+        /**
+         * Written by 'initialize' stage
+         * @type {number}
+         * @private
+         */
+        this.__local_u_scale = 0;
+
+        /**
+         * Written by 'initialize' stage
+         * @type {number}
+         * @private
+         */
+        this.__local_v_scale = 0;
     }
 
     initialize(grid, seed) {
@@ -105,6 +119,11 @@ export class CellFilterGaussianBlur extends CellFilter {
         // store inverse, to be able to use multiply instead of division in execution
         this.__inv_kernel_total_power = 1 / this.__kernel_total_power;
 
+
+        // precompute scaling for the sampling(execute) stage
+        this.__local_u_scale = this.size_x / (this.samples_x - 1);
+        this.__local_v_scale = this.size_y / (this.samples_y - 1);
+
         super.initialize(grid, seed);
     }
 
@@ -140,11 +159,8 @@ export class CellFilterGaussianBlur extends CellFilter {
         const half_samples_x = (samplesX - 1) * 0.5;
         const half_samples_y = (samplesY - 1) * 0.5;
 
-        const sizeX = this.size_x;
-        const sizeY = this.size_y;
-
-        const local_u_scale = sizeX / (samplesX - 1);
-        const local_v_scale = sizeY / (samplesY - 1);
+        const local_u_scale = this.__local_u_scale;
+        const local_v_scale = this.__local_v_scale;
 
         let sum = 0;
         let ix, iy = 0;
@@ -157,7 +173,7 @@ export class CellFilterGaussianBlur extends CellFilter {
         for (; iy < samplesY; iy++) {
             const local_y = iy - half_samples_y;
 
-            const offset_y = y + local_y * local_v_scale;
+            const sample_y = y + local_y * local_v_scale;
 
             const row_address = iy * i_samples_x;
 
@@ -165,13 +181,13 @@ export class CellFilterGaussianBlur extends CellFilter {
 
                 const local_x = ix - half_samples_x;
 
-                const offset_x = local_x * local_u_scale;
+                const sample_x = x + local_x * local_u_scale;
 
                 const power = kernel[row_address + ix];
 
-                const sourceValue = source.execute(grid, x + offset_x, offset_y, 0);
+                const source_value = source.execute(grid, sample_x, sample_y, 0);
 
-                const sample_contribution = sourceValue * power;
+                const sample_contribution = source_value * power;
 
                 sum += sample_contribution;
 

package/src/generation/theme/AreaMask.js

@@ -1,5 +1,5 @@
 import { Sampler2D } from "../../engine/graphics/texture/sampler/Sampler2D.js";
-import AABB2 from "../../core/geom/AABB2.js";
+import AABB2 from "../../core/geom/2d/aabb/AABB2.js";
 import { computeUnsignedDistanceField } from "../../engine/graphics/texture/sampler/distanceField.js";
 
 export class AreaMask {

package/src/view/View.js

@@ -5,7 +5,7 @@
 
 import Vector2 from "../core/geom/Vector2.js";
 
-import AABB2 from "../core/geom/AABB2.js";
+import AABB2 from "../core/geom/2d/aabb/AABB2.js";
 import Signal from "../core/events/signal/Signal.js";
 import { SignalBinding } from "../core/events/signal/SignalBinding.js";
 import { assert } from "../core/assert.js";

package/src/view/elements/progress/RectangularPieProgressView.js

@@ -1,6 +1,6 @@
 import View from "../../View.js";
 import SVG from "../../SVG.js";
-import { line2_line2_intersection } from "../../../core/geom/LineSegment2.js";
+import { line2_line2_intersection } from "../../../core/geom/2d/LineSegment2.js";
 import Vector1 from "../../../core/geom/Vector1.js";
 
 export class RectangularPieProgressView extends View {

package/src/view/minimap/Minimap.js

@@ -12,7 +12,7 @@ import { Camera } from "../../engine/graphics/ecs/camera/Camera.js";
 import { PointerDevice } from "../../engine/input/devices/PointerDevice.js";
 import TopDownCameraController from "../../engine/graphics/ecs/camera/topdown/TopDownCameraController.js";
 import { MinimapMarkersGL } from "./gl/MinimapMarkersGL.js";
-import Rectangle from "../../core/geom/Rectangle.js";
+import Rectangle from "../../core/geom/2d/Rectangle.js";
 import { EntityObserver } from "../../engine/ecs/EntityObserver.js";
 import { Transform } from "../../engine/ecs/transform/Transform.js";
 import { MinimapWorldGL } from "./gl/MinimapWorldGL.js";

package/src/view/minimap/dom/MinimapCameraView.js

@@ -1,9 +1,9 @@
 import View from "../../View.js";
 import Vector3 from "../../../core/geom/Vector3.js";
-import { computePlaneRayIntersection } from "../../../core/geom/Plane.js";
 import ObservedValue from "../../../core/model/ObservedValue.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import SVG from "../../SVG.js";
+import { computePlaneRayIntersection } from "../../../core/geom/3d/plane/computePlaneRayIntersection.js";
 
 
 const rayContact = new SurfacePoint3();

package/src/view/minimap/gl/MinimapFogOfWar.js

@@ -4,7 +4,7 @@ import { Mesh, PlaneBufferGeometry } from "three";
 import { buildScreenSpaceFogOfWarShader } from "../../../engine/ecs/fow/shader/screenSpaceFogOfWarShader.js";
 import { computeUvTransformFromFogOfWar } from "../../../engine/ecs/fow/shader/FogOfWarRenderer.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";
 
 
 /**

package/src/view/tooltip/DomTooltipObserver.js

@@ -1,4 +1,4 @@
-import Rectangle from "../../core/geom/Rectangle.js";
+import Rectangle from "../../core/geom/2d/Rectangle.js";
 import { VisualTip } from "./VisualTip.js";
 import Signal from "../../core/events/signal/Signal.js";
 import ObservedBoolean from "../../core/model/ObservedBoolean.js";

package/src/view/tooltip/TooltipManager.js

@@ -1,5 +1,5 @@
 import EmptyView from "../elements/EmptyView.js";
-import AABB2 from "../../core/geom/AABB2.js";
+import AABB2 from "../../core/geom/2d/aabb/AABB2.js";
 import Task from "../../core/process/task/Task.js";
 import ConcurrentExecutor from "../../core/process/executor/ConcurrentExecutor.js";
 import { TaskSignal } from "../../core/process/task/TaskSignal.js";

package/src/view/tooltip/TooltipView.js

@@ -1,6 +1,6 @@
 import View from "../View.js";
 import Vector2 from "../../core/geom/Vector2.js";
-import AABB2 from "../../core/geom/AABB2.js";
+import AABB2 from "../../core/geom/2d/aabb/AABB2.js";
 import { CompassArrowView } from "../elements/CompassArrowView.js";
 import EmptyView from "../elements/EmptyView.js";
 import { forceIntoBox } from "../../core/graph/layout/box/forceIntoBox.js";

package/src/view/util/DomSizeObserver.js

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