@woosh/meep-engine 2.61.0 → 2.62.0

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

@@ -3,22 +3,24 @@
  */
 
 
-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 {assert} from "../../../assert.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_intersects_point } from "./aabb3_array_intersects_point.js";
+import {aabb3_array_intersects_point} from "./aabb3_array_intersects_point.js";
+import {aabb3_build_corners} from "./aabb3_build_corners.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 {aabb3_compute_surface_area} from "./aabb3_compute_surface_area.js";
+import {aabb3_intersects_frustum_array} from "./aabb3_intersects_frustum_array.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_matrix4_project} from "./aabb3_matrix4_project.js";
+import {aabb3_signed_distance_sqr_to_point} from "./aabb3_signed_distance_sqr_to_point.js";
+import {aabb3_signed_distance_to_aabb3} from "./aabb3_signed_distance_to_aabb3.js";
 
 /**
  * Axis-Aligned bounding box in 3D
+ * NOTE: In cases where all you want is raw performance - prefer to use typed arrays instead along with `aabb3_` functions
  */
 export class AABB3 {
     /**
@@ -238,7 +240,12 @@ export class AABB3 {
      * @returns {boolean}
      */
     _equals(x0, y0, z0, x1, y1, z1) {
-        return this.x0 === x0 && this.y0 === y0 && this.z0 === z0 && this.x1 === x1 && this.y1 === y1 && this.z1 === z1;
+        return this.x0 === x0
+            && this.y0 === y0
+            && this.z0 === z0
+            && this.x1 === x1
+            && this.y1 === y1
+            && this.z1 === z1;
     }
 
     /**
@@ -332,28 +339,10 @@ export class AABB3 {
         const _y1 = this.y1;
         const _z1 = this.z1;
 
-        //do projection
-        const xp0 = _x0 - x1;
-        const xp1 = x0 - _x1;
-        const yp0 = _y0 - y1;
-        const yp1 = y0 - _y1;
-        const zp0 = _z0 - z1;
-        const zp1 = z0 - _z1;
-
-        //calculate separation in each axis
-        const dx = Math.max(xp0, xp1);
-        const dy = Math.max(yp0, yp1);
-        const dz = Math.max(zp0, zp1);
-
-        //straight-line distance
-        let distance = Math.sqrt(dx * dx + dy * dy + dz * dz);
-
-        if (dx < 0 && dy < 0 && dz < 0) {
-            //penetration
-            return -distance;
-        } else {
-            return distance;
-        }
+        return aabb3_signed_distance_to_aabb3(
+            _x0, _y0, _z0, _x1, _y1, _z1,
+            x0, y0, z0, x1, y1, z1
+        );
     }
 
     /**
@@ -778,7 +767,6 @@ export class AABB3 {
     }
 
     /**
-     *
      * @param {Plane[]} clippingPlanes
      * @returns {boolean}
      */

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

@@ -0,0 +1,22 @@
+/**
+ *
+ * @param {number[]} output
+ * @param {number} output_offset
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @param {number} radius
+ */
+export function aabb3_array_compute_from_sphere(
+    output, output_offset,
+    x, y, z, radius
+) {
+
+    output[output_offset] = x - radius;
+    output[output_offset + 1] = y - radius;
+    output[output_offset + 2] = z - radius;
+    output[output_offset + 3] = x + radius;
+    output[output_offset + 4] = y + radius;
+    output[output_offset + 5] = z + radius;
+
+}

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

@@ -0,0 +1,22 @@
+import {aabb3_signed_distance_sqr_to_point} from "./aabb3_signed_distance_sqr_to_point.js";
+
+/**
+ *
+ * @param {number[]} aabb
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @param {number} radius
+ * @returns {boolean}
+ */
+export function aabb3_array_intersects_sphere(aabb, x, y, z, radius) {
+    const distance_sqr = aabb3_signed_distance_sqr_to_point(
+        aabb[0], aabb[1], aabb[2],
+        aabb[3], aabb[4], aabb[5],
+        x, y, z
+    );
+
+    const radius2 = radius * radius;
+
+    return distance_sqr <= radius2;
+}

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

@@ -0,0 +1,11 @@
+import {aabb3_array_intersects_sphere} from "./aabb3_array_intersects_sphere.js";
+
+/**
+ *
+ * @param {number[]|Float32Array} aabb
+ * @param {number[]|Float32Array} sphere [x,y,z, radius]
+ * @returns {boolean}
+ */
+export function aabb3_array_intersects_sphere_array(aabb, sphere) {
+    return aabb3_array_intersects_sphere(aabb, sphere[0], sphere[1], sphere[2], sphere[3]);
+}

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

@@ -0,0 +1,28 @@
+export function aabb3_signed_distance_to_aabb3(
+    ax0,ay0,az0,ax1,ay1,az1,
+    bx0,by0,bz0, bx1,by1,bz1
+){
+
+    //do projection
+    const xp0 = bx0 - ax1;
+    const xp1 = ax0 - bx1;
+    const yp0 = by0 - ay1;
+    const yp1 = ay0 - by1;
+    const zp0 = bz0 - az1;
+    const zp1 = az0 - bz1;
+
+    //calculate separation in each axis
+    const dx = Math.max(xp0, xp1);
+    const dy = Math.max(yp0, yp1);
+    const dz = Math.max(zp0, zp1);
+
+    //straight-line distance
+    let distance = Math.sqrt(dx * dx + dy * dy + dz * dz);
+
+    if (dx < 0 && dy < 0 && dz < 0) {
+        //penetration
+        return -distance;
+    } else {
+        return distance;
+    }
+}

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

@@ -9,20 +9,29 @@
  * @param {number} y1
  * @param {number} z1
  */
-export function serializeAABB3Quantized16Uint(buffer, box, x0, y0, z0, x1, y1, z1) {
+export function serializeAABB3Quantized16Uint(
+    buffer, box,
+    x0, y0, z0, x1, y1, z1
+) {
+
     //compute value ranges
-    const xD = x1 - x0;
-    const yD = y1 - y0;
-    const zD = z1 - z0;
+    const dx = x1 - x0;
+    const dy = y1 - y0;
+    const dz = z1 - z0;
+
+    // scale delta to Uin16 range, and avoid division by 0
+    const mx = dx > 0 ? 65535 / dx : 0;
+    const my = dy > 0 ? 65535 / dy : 0;
+    const mz = dz > 0 ? 65535 / dz : 0;
 
     //quantize all values
-    const _x0 = (((box.x0 - x0) / xD) * 65535) | 0;
-    const _y0 = (((box.y0 - y0) / yD) * 65535) | 0;
-    const _z0 = (((box.z0 - z0) / zD) * 65535) | 0;
+    const _x0 = Math.floor((box.x0 - x0) * mx);
+    const _y0 = Math.floor((box.y0 - y0) * my);
+    const _z0 = Math.floor((box.z0 - z0) * mz);
 
-    const _x1 = (((box.x1 - x0) / xD) * 65535) | 0;
-    const _y1 = (((box.y1 - y0) / yD) * 65535) | 0;
-    const _z1 = (((box.z1 - z0) / zD) * 65535) | 0;
+    const _x1 = Math.ceil((box.x1 - x0) * mx);
+    const _y1 = Math.ceil((box.y1 - y0) * my);
+    const _z1 = Math.ceil((box.z1 - z0) * mz);
 
     buffer.writeUint16(_x0);
     buffer.writeUint16(_y0);

package/src/core/geom/3d/tetrahedra/delaunay/Cavity.js

@@ -1,5 +1,8 @@
 import { assert } from "../../../../assert.js";
 
+/**
+ * Represents cavity or "ball" formed when carving out "triangles" to accommodate inserted point
+ */
 export class Cavity {
     constructor() {
         /**
@@ -52,10 +55,6 @@ export class Cavity {
         this.__boundary_size++;
     }
 
-    update() {
-        // compute in/out state for each side of each tetra
-    }
-
     /**
      *
      * @param {number} i

package/src/engine/ecs/foliage/ecs/Foliage2System.js

@@ -74,6 +74,9 @@ function obtainLayer(layer, cache, assetManager) {
     }
 }
 
+/**
+ * @deprecated
+ */
 export class Foliage2System extends System {
     /**
      *

package/src/engine/ecs/foliage/ecs/InstancedMeshComponent.js

@@ -1,7 +1,10 @@
 import List from "../../../../core/collection/list/List.js";
-import { InstancedMeshLayer } from "./InstancedMeshLayer.js";
+import {InstancedMeshLayer} from "./InstancedMeshLayer.js";
 
 
+/**
+ * @deprecated use {@link ShadedGeometry} instead with instanced rendering
+ */
 export class InstancedMeshComponent {
     constructor() {
         /**

package/src/engine/ecs/foliage/ecs/convertInstancedMeshComponents2Entities.js

@@ -0,0 +1,64 @@
+import {assert} from "../../../../core/assert.js";
+import Mesh from "../../../graphics/ecs/mesh/Mesh.js";
+import Entity from "../../Entity.js";
+import {Transform} from "../../transform/Transform.js";
+import {loadFoliageLayer} from "./Foliage2System.js";
+import {InstancedMeshComponent} from "./InstancedMeshComponent.js";
+
+/**
+ * Convert all existing instanced mesh components to individual Transform+Mesh pairs
+ * @param {EntityComponentDataset} dataset
+ * @param assetManager
+ */
+export function convertInstancedMeshComponents2Entities(dataset, assetManager) {
+    assert.notEqual(dataset, undefined, 'dataset is undefined');
+    assert.notEqual(assetManager, undefined, 'assetManager is undefined');
+
+    const entitiesToStrip = [];
+
+    /**
+     *
+     * @param {InstancedMeshComponent} foliage2
+     * @param entity
+     */
+    function visitFoliageEntities(foliage2, entity) {
+        foliage2.layers.forEach(function (layer) {
+            const modelURL = layer.modelURL.getValue();
+
+            loadFoliageLayer(layer, assetManager)
+                .then(function (instancedFoliage) {
+
+                    const data = instancedFoliage.data;
+                    const numInstances = data.length;
+
+                    for (let i = 0; i < numInstances; i++) {
+                        const transform = new Transform();
+
+                        instancedFoliage.read(i, transform.position, transform.rotation, transform.scale);
+
+                        const mesh = new Mesh();
+                        mesh.url = modelURL;
+
+                        mesh.castShadow = layer.castShadow.getValue();
+                        mesh.receiveShadow = layer.receiveShadow.getValue();
+
+                        //TODO Consider moving BVH info here also, to make this process faster
+
+                        const entityBuilder = new Entity();
+
+                        entityBuilder.add(transform).add(mesh).build(dataset);
+                    }
+                });
+        });
+
+        entitiesToStrip.push(entity);
+    }
+
+    dataset.traverseEntities([InstancedMeshComponent], visitFoliageEntities);
+
+    //remove converted foliage components
+    entitiesToStrip.forEach(function (entity) {
+        dataset.removeComponentFromEntity(entity, InstancedMeshComponent);
+    });
+}
+

package/src/engine/ecs/foliage/ecs/{InstancedMeshUtils.js → optimizeIndividualMeshesEntitiesToInstances.js}

@@ -1,73 +1,14 @@
-import Entity from "../../Entity.js";
-import { loadFoliageLayer } from "./Foliage2System.js";
-import Mesh, { MeshFlags } from "../../../graphics/ecs/mesh/Mesh.js";
-import { Transform } from "../../transform/Transform.js";
-import { InstancedMeshComponent } from "./InstancedMeshComponent.js";
-import { InstancedFoliage } from "../InstancedFoliage.js";
-import { buildTreeOptimizationTask } from "../../../../core/bvh2/BVHTasks.js";
+import {buildTreeOptimizationTask} from "../../../../core/bvh2/BVHTasks.js";
 import Task from "../../../../core/process/task/Task.js";
-import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
-import { assert } from "../../../../core/assert.js";
-import { InstancedMeshLayer } from "./InstancedMeshLayer.js";
-import { countTask } from "../../../../core/process/task/util/countTask.js";
-import { promiseTask } from "../../../../core/process/task/util/promiseTask.js";
-
-/**
- * Convert all existing instanced mesh components to individual Transform+Mesh pairs
- * @param {EntityComponentDataset} dataset
- * @param assetManager
- */
-export function convertInstancedMeshComponents2Entities(dataset, assetManager) {
-    assert.notEqual(dataset, undefined, 'dataset is undefined');
-    assert.notEqual(assetManager, undefined, 'assetManager is undefined');
-
-    const entitiesToStrip = [];
-
-    /**
-     *
-     * @param {InstancedMeshComponent} foliage2
-     * @param entity
-     */
-    function visitFoliageEntities(foliage2, entity) {
-        foliage2.layers.forEach(function (layer) {
-            const modelURL = layer.modelURL.getValue();
-
-            loadFoliageLayer(layer, assetManager)
-                .then(function (instancedFoliage) {
-
-                    const data = instancedFoliage.data;
-                    const numInstances = data.length;
-
-                    for (let i = 0; i < numInstances; i++) {
-                        const transform = new Transform();
-
-                        instancedFoliage.read(i, transform.position, transform.rotation, transform.scale);
-
-                        const mesh = new Mesh();
-                        mesh.url = modelURL;
-
-                        mesh.castShadow = layer.castShadow.getValue();
-                        mesh.receiveShadow = layer.receiveShadow.getValue();
-
-                        //TODO Consider moving BVH info here also, to make this process faster
-
-                        const entityBuilder = new Entity();
-
-                        entityBuilder.add(transform).add(mesh).build(dataset);
-                    }
-                });
-        });
-
-        entitiesToStrip.push(entity);
-    }
-
-    dataset.traverseEntities([InstancedMeshComponent], visitFoliageEntities);
-
-    //remove converted foliage components
-    entitiesToStrip.forEach(function (entity) {
-        dataset.removeComponentFromEntity(entity, InstancedMeshComponent);
-    });
-}
+import {TaskSignal} from "../../../../core/process/task/TaskSignal.js";
+import {countTask} from "../../../../core/process/task/util/countTask.js";
+import {promiseTask} from "../../../../core/process/task/util/promiseTask.js";
+import Mesh, {MeshFlags} from "../../../graphics/ecs/mesh/Mesh.js";
+import Entity from "../../Entity.js";
+import {Transform} from "../../transform/Transform.js";
+import {InstancedFoliage} from "../InstancedFoliage.js";
+import {InstancedMeshComponent} from "./InstancedMeshComponent.js";
+import {InstancedMeshLayer} from "./InstancedMeshLayer.js";
 
 /**
  *
@@ -289,4 +230,4 @@ export function optimizeIndividualMeshesEntitiesToInstances(dataset, threshold =
         main: tBuild,
         tasks
     };
-}
+}

package/src/engine/graphics/camera/testClippingPlaneComputation.js

@@ -1,26 +1,25 @@
-import {Frustum, OrthographicCamera} from "three";
+import { Frustum, OrthographicCamera } from "three";
 import FacingDirectionSystem from "../../../../../model/game/ecs/system/FacingDirectionSystem.js";
-import {makeEngineOptionsModel} from "../../../../../model/game/options/makeEngineOptionsModel.js";
-import {enableEditor} from "../../../../editor/enableEditor.js";
+import { makeEngineOptionsModel } from "../../../../../model/game/options/makeEngineOptionsModel.js";
+import { enableEditor } from "../../../../editor/enableEditor.js";
 import {
     ThreeClippingPlaneComputingBVHVisitor
 } from "../../../core/bvh2/traversal/ThreeClippingPlaneComputingBVHVisitor.js";
-import {RingBuffer} from "../../../core/collection/RingBuffer.js";
-import {convex_hull_jarvis_2d} from "../../../core/geom/2d/convex-hull/convex_hull_jarvis_2d.js";
+import { RingBuffer } from "../../../core/collection/RingBuffer.js";
+import { convex_hull_jarvis_2d } from "../../../core/geom/2d/convex-hull/convex_hull_jarvis_2d.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import Vector3 from "../../../core/geom/Vector3.js";
-import {computeStatisticalMean} from "../../../core/math/statistics/computeStatisticalMean.js";
-import {CanvasView} from "../../../view/elements/CanvasView.js";
+import { computeStatisticalMean } from "../../../core/math/statistics/computeStatisticalMean.js";
+import { CanvasView } from "../../../view/elements/CanvasView.js";
 import Entity from "../../ecs/Entity.js";
-import {Foliage2System} from "../../ecs/foliage/ecs/Foliage2System.js";
-import {FogOfWarRevealerSystem} from "../../ecs/fow/FogOfWarRevealerSystem.js";
-import {FogOfWarSystem} from "../../ecs/fow/FogOfWarSystem.js";
+import { FogOfWarRevealerSystem } from "../../ecs/fow/FogOfWarRevealerSystem.js";
+import { FogOfWarSystem } from "../../ecs/fow/FogOfWarSystem.js";
 import GUIElement from "../../ecs/gui/GUIElement.js";
 import GUIElementSystem from "../../ecs/gui/GUIElementSystem.js";
 import HeadsUpDisplaySystem from "../../ecs/gui/hud/HeadsUpDisplaySystem.js";
 import ViewportPosition from "../../ecs/gui/position/ViewportPosition.js";
 import ViewportPositionSystem from "../../ecs/gui/position/ViewportPositionSystem.js";
-import {InverseKinematicsSystem} from "../../ecs/ik/InverseKinematicsSystem.js";
+import { InverseKinematicsSystem } from "../../ecs/ik/InverseKinematicsSystem.js";
 import AnimationSystem from "../../ecs/systems/AnimationSystem.js";
 import MotionSystem from "../../ecs/systems/MotionSystem.js";
 import RenderSystem from "../../ecs/systems/RenderSystem.js";
@@ -30,33 +29,33 @@ import TagSystem from "../../ecs/systems/TagSystem.js";
 import TimerSystem from "../../ecs/systems/TimerSystem.js";
 import ClingToTerrainSystem from "../../ecs/terrain/ecs/cling/ClingToTerrainSystem.js";
 import TerrainSystem from "../../ecs/terrain/ecs/TerrainSystem.js";
-import {Transform} from "../../ecs/transform/Transform.js";
-import {EngineConfiguration} from "../../EngineConfiguration.js";
-import {EngineHarness} from "../../EngineHarness.js";
-import {GridPosition2TransformSystem} from "../../grid/grid2transform/GridPosition2TransformSystem.js";
+import { Transform } from "../../ecs/transform/Transform.js";
+import { EngineConfiguration } from "../../EngineConfiguration.js";
+import { EngineHarness } from "../../EngineHarness.js";
+import { GridPosition2TransformSystem } from "../../grid/grid2transform/GridPosition2TransformSystem.js";
 import GridPositionSystem from "../../grid/position/GridPositionSystem.js";
-import {Transform2GridPositionSystem} from "../../grid/transform2grid/Transform2GridPositionSystem.js";
+import { Transform2GridPositionSystem } from "../../grid/transform2grid/Transform2GridPositionSystem.js";
 import InputControllerSystem from "../../input/ecs/systems/InputControllerSystem.js";
-import {InputSystem} from "../../input/ecs/systems/InputSystem.js";
-import {BehaviorSystem} from "../../intelligence/behavior/ecs/BehaviorSystem.js";
+import { InputSystem } from "../../input/ecs/systems/InputSystem.js";
+import { BehaviorSystem } from "../../intelligence/behavior/ecs/BehaviorSystem.js";
 import PathFollowingSystem from "../../navigation/ecs/path_following/PathFollowingSystem.js";
-import {SoundEmitterSystem} from "../../sound/ecs/emitter/SoundEmitterSystem.js";
+import { SoundEmitterSystem } from "../../sound/ecs/emitter/SoundEmitterSystem.js";
 import SoundControllerSystem from "../../sound/ecs/SoundControllerSystem.js";
 import SoundListenerSystem from "../../sound/ecs/SoundListenerSystem.js";
 import AnimationControllerSystem from "../ecs/animation/AnimationControllerSystem.js";
-import {AnimationGraphSystem} from "../ecs/animation/animator/AnimationGraphSystem.js";
-import {CameraSystem} from "../ecs/camera/CameraSystem.js";
-import {frustum_from_camera} from "../ecs/camera/frustum_from_camera.js";
+import { AnimationGraphSystem } from "../ecs/animation/animator/AnimationGraphSystem.js";
+import { CameraSystem } from "../ecs/camera/CameraSystem.js";
+import { frustum_from_camera } from "../ecs/camera/frustum_from_camera.js";
 import TopDownCameraControllerSystem from "../ecs/camera/topdown/TopDownCameraControllerSystem.js";
-import {TopDownCameraLanderSystem} from "../ecs/camera/topdown/TopDownCameraLanderSystem.js";
+import { TopDownCameraLanderSystem } from "../ecs/camera/topdown/TopDownCameraLanderSystem.js";
 import MeshHighlightSystem from "../ecs/highlight/system/MeshHighlightSystem.js";
 import LightSystem from "../ecs/light/LightSystem.js";
 import Mesh from "../ecs/mesh/Mesh.js";
-import {MeshSystem} from "../ecs/mesh/MeshSystem.js";
-import {PathDisplaySystem} from "../ecs/path/PathDisplaySystem.js";
+import { MeshSystem } from "../ecs/mesh/MeshSystem.js";
+import { PathDisplaySystem } from "../ecs/path/PathDisplaySystem.js";
 import Trail2DSystem from "../ecs/trail2d/Trail2DSystem.js";
 import WaterSystem from "../ecs/water/WaterSystem.js";
-import {computeFrustumCorners} from "../render/forward_plus/computeFrustumCorners.js";
+import { computeFrustumCorners } from "../render/forward_plus/computeFrustumCorners.js";
 
 const engineHarness = new EngineHarness();
 
@@ -97,7 +96,6 @@ function makeConfig(engine) {
         new TerrainSystem(graphics, assetManager),
         new WaterSystem(graphics),
         new Trail2DSystem(engine),
-        new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new GridPosition2TransformSystem(),
         new Transform2GridPositionSystem(),