@woosh/meep-engine 2.48.21 → 2.48.23

package/src/engine/graphics/ecs/light/LightSystem.js

@@ -13,7 +13,7 @@ import { CameraClippingPlaneComputer } from "../camera/CameraClippingPlaneComput
 import { assert } from "../../../../core/assert.js";
 import { ForwardPlusRenderingPlugin } from "../../render/forward_plus/plugin/ForwardPlusRenderingPlugin.js";
 import { ThreeLightCache } from "./three/ThreeLightCache.js";
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { ShadowManager } from "./shadow/ShadowManager.js";
 import { AbstractContextSystem } from "../../../ecs/system/AbstractContextSystem.js";
 import { LightContext } from "./LightContext.js";

package/src/engine/graphics/ecs/mesh/Mesh.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 Mesh {

package/src/engine/graphics/ecs/mesh/Mesh.js

@@ -1,7 +1,7 @@
 /**
  * Created by Alex Goldring on 25.02.2015.
  */
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { LeafNode } from "../../../../core/bvh2/LeafNode.js";
 import { getSkeletonBoneByType } from "./SkeletonUtils.js";
 import { assert } from "../../../../core/assert.js";

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.d.ts

@@ -1,5 +1,5 @@
 import {BufferGeometry, Material} from "three";
-import {AABB3} from "../../../../core/bvh2/aabb3/AABB3";
+import {AABB3} from "../../../../core/geom/3d/aabb/AABB3";
 import {DrawMode} from "./DrawMode";
 
 export class ShadedGeometry {

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.js

@@ -1,4 +1,4 @@
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { DrawMode } from "./DrawMode.js";
 import { ShadedGeometryFlags } from "./ShadedGeometryFlags.js";
 import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMesh.d.ts

@@ -1,4 +1,4 @@
-import {AABB3} from "../../../../../core/bvh2/aabb3/AABB3";
+import {AABB3} from "../../../../../core/geom/3d/aabb/AABB3";
 
 export class SGMesh {
     url: string

package/src/engine/graphics/ecs/mesh-v2/sample/load_gltf.js

@@ -6,7 +6,6 @@ import { GLTFAssetLoader } from "../../../../asset/loaders/GLTFAssetLoader.js";
 import { three_object_to_entity_composition } from "../three_object_to_entity_composition.js";
 import { TransformAttachmentSystem } from "../../../../ecs/transform-attachment/TransformAttachmentSystem.js";
 import { Camera } from "../../camera/Camera.js";
-import { MicronRenderPlugin } from "../../../micron/plugin/MicronRenderPlugin.js";
 import { enableEditor } from "../../../../../../editor/enableEditor.js";
 import { MeshSystem } from "../../mesh/MeshSystem.js";
 
@@ -31,8 +30,6 @@ async function init(harness) {
     config.addLoader(GameAssetType.ModelGLTF_JSON, gltfAssetLoader);
     config.addLoader(GameAssetType.ModelGLTF, gltfAssetLoader);
 
-    config.addPlugin(MicronRenderPlugin);
-
     await config.apply(engine);
 
     enableEditor(engine);

package/src/engine/graphics/ecs/mesh-v2/sg_hierarchy_compute_bounding_box_via_parent_entity.d.ts

@@ -1,4 +1,4 @@
-import {AABB3} from "../../../../core/bvh2/aabb3/AABB3";
+import {AABB3} from "../../../../core/geom/3d/aabb/AABB3";
 import {EntityComponentDataset} from "../../../ecs/EntityComponentDataset";
 
 export function sg_hierarchy_compute_bounding_box_via_parent_entity(result: AABB3, root_entity: number, ecd: EntityComponentDataset): void

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/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/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/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/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/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/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/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/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";
 
 /**

package/src/core/geom/2d/AABB2Math.js

@@ -1,40 +0,0 @@
-import { max3 } from "../../math/max3.js";
-
-/**
- *
- * @param {number} x0
- * @param {number} y0
- * @param {number} x1
- * @param {number} y1
- * @param {number} px
- * @param {number} py
- * @returns {number}
- */
-export function aabb2_distanceToPoint(x0, y0, x1, y1, px, py) {
-    const sqrD = aabb2_sqrDistanceToPoint(x0, y0, x1, y1, px, py);
-    return Math.sqrt(sqrD);
-}
-
-/**
- *
- * @param {number} x0
- * @param {number} y0
- * @param {number} x1
- * @param {number} y1
- * @param {number} px
- * @param {number} py
- * @returns {number}
- */
-export function aabb2_sqrDistanceToPoint(x0, y0, x1, y1, px, py) {
-
-    const dxLeft = x0 - px;
-    const dxRight = px - x1;
-
-    const dyTop = y0 - py;
-    const dyBottom = py - y1;
-
-    var dx = max3(dxLeft, 0, dxRight);
-    var dy = max3(dyTop, 0, dyBottom);
-
-    return dx * dx + dy * dy;
-}

package/src/core/geom/2d/AABB2Math.spec.js

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