@woosh/meep-engine 2.33.60 → 2.33.64

package/core/geom/3d/SurfacePoint3.js

@@ -1,5 +1,6 @@
 import Quaternion from "../Quaternion.js";
 import Vector3 from "../Vector3.js";
+import { v3_length } from "../v3_length.js";
 
 const q = new Quaternion();
 
@@ -14,14 +15,52 @@ export class SurfacePoint3 {
 
     /**
      *
-     * @param {THREE.Matrix4} matrix4
+     * @param {number[]|mat4|Float32Array} m4
      */
-    applyMatrix4_three(matrix4) {
-        this.position.applyMatrix4_three(matrix4);
+    applyMatrix4(m4) {
+        // transform position
+        const p = this.position;
+
+        const p_x = p.x;
+        const p_y = p.y;
+        const p_z = p.z;
+
+        const result_p_x = m4[0] * p_x + m4[4] * p_y + m4[8] * p_z + m4[12];
+        const result_p_y = m4[1] * p_x + m4[5] * p_y + m4[9] * p_z + m4[13];
+        const result_p_z = m4[2] * p_x + m4[6] * p_y + m4[10] * p_z + m4[14];
+
+        this.position.set(
+            result_p_x,
+            result_p_y,
+            result_p_z
+        );
+
+        // transform normal
+        const n = this.normal;
+
+        const n_x = n.x;
+        const n_y = n.y;
+        const n_z = n.z;
+
+        const result_n_x = m4[0] * n_x + m4[4] * n_y + m4[8] * n_z;
+        const result_n_y = m4[1] * n_x + m4[5] * n_y + m4[9] * n_z;
+        const result_n_z = m4[2] * n_x + m4[6] * n_y + m4[10] * n_z;
 
-        q.setFromRotationMatrix(matrix4);
+        const normal_multiplier = 1 / v3_length(result_n_x, result_n_y, result_n_z);
 
-        this.normal.applyQuaternion(q);
+        this.normal.set(
+            result_n_x * normal_multiplier,
+            result_n_y * normal_multiplier,
+            result_n_z * normal_multiplier,
+        );
+    }
+
+    /**
+     *
+     * @param {THREE.Matrix4} matrix4
+     */
+    applyMatrix4_three(matrix4) {
+        this.applyMatrix4(matrix4.elements);
     }
 
     /**

package/core/geom/Vector2.d.ts

@@ -30,6 +30,8 @@ export default class Vector2 {
 
     copy(other: Vector2): void
 
+    clone(): Vector2
+
     distanceTo(other: Vector2): number
 
     isZero(): boolean

package/core/geom/packing/MaxRectangles.js

@@ -12,9 +12,10 @@ import Vector2 from "../Vector2.js";
  * @param {AABB2[]} boxes
  */
 function removeRedundantBoxesArray(boxes) {
+    let i, j;
     let numBoxes = boxes.length;
 
-    loop_a: for (let i = 0; i < numBoxes; i++) {
+    loop_a: for (i = 0; i < numBoxes; i++) {
         const a = boxes[i];
 
         const ax0 = a.x0;
@@ -22,7 +23,7 @@ function removeRedundantBoxesArray(boxes) {
         const ax1 = a.x1;
         const ay1 = a.y1;
 
-        for (let j = i + 1; j < numBoxes; j++) {
+        for (j = i + 1; j < numBoxes; j++) {
             const b = boxes[j];
 
             const bx0 = b.x0;
@@ -157,7 +158,7 @@ function findBestContainer(width, height, boxes, costFunction) {
     let best = null;
     let bestScore = Number.POSITIVE_INFINITY;
 
-    boxes.traversePreOrder(node => {
+    const visitor = (node) => {
 
         if (node.getWidth() < width) {
             //too small, don't traverse deeper
@@ -195,7 +196,11 @@ function findBestContainer(width, height, boxes, costFunction) {
                 best = box;
             }
         }
-    });
+
+        return true;
+    };
+
+    boxes.traversePreOrder(visitor);
 
     return best;
 }
@@ -337,6 +342,10 @@ export class MaxRectanglesPacker {
         this.free = new QuadTreeNode(0, 0, width, height);
         this.free.add(null, 0, 0, width, height);
 
+        /**
+         *
+         * @type {AABB2[]}
+         */
         this.boxes = [];
     }
 

package/core/math/hash/murmur3_32.js

@@ -9,9 +9,9 @@ export function murmur3_32(key, seed) {
     let k1;
     let i = 0;
 
-    const bytes = key.length;
+    const key_length = key.length;
 
-    while (i < bytes) {
+    while (i < key_length) {
         k1 = key[i];
         ++i;
 
@@ -26,7 +26,7 @@ export function murmur3_32(key, seed) {
     }
 
     // mix in array length
-    h1 ^= bytes;
+    h1 ^= key_length;
 
     h1 ^= h1 >>> 16;
     h1 = (((h1 & 0xffff) * 0x85ebca6b) + ((((h1 >>> 16) * 0x85ebca6b) & 0xffff) << 16));

package/ecs/grid/pick.js

@@ -0,0 +1,44 @@
+import { assert } from "../../core/assert.js";
+import Vector3 from "../../core/geom/Vector3.js";
+import { SurfacePoint3 } from "../../core/geom/3d/SurfacePoint3.js";
+import Vector2 from "../../core/geom/Vector2.js";
+
+/**
+ *
+ * @param {number} x
+ * @param {number} y
+ * @param {GraphicsEngine} graphicsEngine
+ * @param {Terrain} terrain
+ * @param {function(gridPosition:Vector2,worldPosition:Vector3,normal:Vector3)} callback
+ */
+export function pick(x, y, graphicsEngine, terrain, callback) {
+
+    assert.isNumber(x, 'x');
+    assert.isNumber(y, 'y');
+
+    assert.defined(terrain, 'terrain');
+    assert.notNull(terrain, 'terrain');
+
+    assert.isFunction(callback, 'callback');
+
+    const vSource = new Vector3(x, y, 0);
+    const vTarget = new Vector3();
+
+    graphicsEngine.normalizeViewportPoint(vSource, vSource);
+    graphicsEngine.viewportProjectionRay(vSource.x, vSource.y, vSource, vTarget);
+
+    const surfacePoint3 = new SurfacePoint3();
+
+    const hitFound = terrain.raycastFirstSync(surfacePoint3, vSource.x, vSource.y, vSource.z, vTarget.x, vTarget.y, vTarget.z);
+
+    if (!hitFound) {
+        // nothing found
+    } else {
+
+        const gridPosition = new Vector2();
+        terrain.mapPointWorld2Grid(surfacePoint3.position, gridPosition);
+        gridPosition._add(0.5, 0.5);
+        callback(gridPosition, surfacePoint3.position, surfacePoint3.normal);
+    }
+
+}

package/editor/actions/concrete/PaintTerrainOverlayAction.js

@@ -1,6 +1,6 @@
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import Vector4 from "../../../core/geom/Vector4.js";
 import { Action } from "../../../core/process/undo/Action.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class PaintTerrainOverlayAction extends Action {
     /**

package/editor/process/ObstacleGridDisplayProcess.js

@@ -1,8 +1,8 @@
 import { EditorProcess } from "./EditorProcess.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import GridObstacle from "../../engine/grid/components/GridObstacle.js";
 import GridPosition from "../../engine/grid/components/GridPosition.js";
 import { Sampler2D } from "../../engine/graphics/texture/sampler/Sampler2D.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class ObstacleGridDisplayProcess extends EditorProcess {
 

package/editor/process/symbolic/makeGridPositionSymbolDisplay.js

@@ -4,7 +4,6 @@ import Task from "../../../core/process/task/Task.js";
 import TaskSignal from "../../../core/process/task/TaskSignal.js";
 import EntityBuilder from "../../../engine/ecs/EntityBuilder.js";
 import { BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial } from "three";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import Renderable from "../../../engine/ecs/components/Renderable.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import Vector3 from "../../../core/geom/Vector3.js";
@@ -14,6 +13,7 @@ import { EventType } from "../../../engine/ecs/EntityManager.js";
 import { make3DSymbolicDisplay } from "./make3DSymbolicDisplay.js";
 import GridPosition from "../../../engine/grid/components/GridPosition.js";
 import { ProcessState } from "../../../core/process/ProcessState.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 /**
  *

package/editor/tools/FoliagePaintTool.js

@@ -1,12 +1,12 @@
 import Tool from "./engine/Tool.js";
 import Vector1 from "../../core/geom/Vector1.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import ObservedValue from "../../core/model/ObservedValue.js";
 import Vector4 from "../../core/geom/Vector4.js";
 import loadSampler2D from "../../engine/graphics/texture/sampler/loadSampler2D.js";
 import convertSampler2D2Canvas from "../../engine/graphics/texture/sampler/Sampler2D2Canvas.js";
 import { InstancedMeshComponent } from "../../engine/ecs/foliage/ecs/InstancedMeshComponent.js";
 import { parseHex } from "../../core/color/parseHex.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class FoliagePaintTool extends Tool {
     constructor() {

package/editor/tools/GridPaintTool.js

@@ -1,17 +1,17 @@
 import Tool from "./engine/Tool.js";
 import GridPosition from "../../engine/grid/components/GridPosition.js";
 import GridObstacle from "../../engine/grid/components/GridObstacle.js";
-import { pick } from "../../../model/game/util/ScreenGridPicker.js";
 import Vector4 from "../../core/geom/Vector4.js";
 import ObservedValue from "../../core/model/ObservedValue.js";
 import Vector1 from "../../core/geom/Vector1.js";
 import WriteGridValueAction from "../actions/concrete/WriteGridValueAction.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import PaintTerrainOverlayAction from "../actions/concrete/PaintTerrainOverlayAction.js";
 import { decodeMouseEventButtons, PointerDevice } from "../../engine/input/devices/PointerDevice.js";
 import Vector2 from "../../core/geom/Vector2.js";
 import TopDownCameraControllerSystem from "../../engine/graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
 import { parseHex } from "../../core/color/parseHex.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
+import { pick } from "../../ecs/grid/pick.js";
 
 class GridPaintTool extends Tool {
     constructor() {

package/editor/tools/paint/TerrainPaintTool.js

@@ -1,14 +1,14 @@
 import { max2 } from "../../../core/math/max2.js";
 import Tool from "../engine/Tool.js";
 import { Color } from "../../../core/color/Color.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 import Vector2 from "../../../core/geom/Vector2.js";
-import { pick } from "../../../../model/game/util/ScreenGridPicker.js";
 import convertSampler2D2Canvas from "../../../engine/graphics/texture/sampler/Sampler2D2Canvas.js";
 import ObservedString from "../../../core/model/ObservedString.js";
 import { GameAssetType } from "../../../engine/asset/GameAssetType.js";
 import Vector1 from "../../../core/geom/Vector1.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
+import { pick } from "../../../ecs/grid/pick.js";
 
 export class TerrainPaintTool extends Tool {
     constructor() {

package/editor/tools/paint/TerrainTexturePaintTool.js

@@ -4,7 +4,7 @@ import { TerrainPaintTool } from "./TerrainPaintTool.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 import { PatchTerrainTextureAction } from "../../actions/concrete/PatchTerrainTextureAction.js";
 import { convertSampler2D2DataURL } from "../../../engine/graphics/texture/sampler/convertSampler2D2DataURL.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 export class TerrainTexturePaintTool extends TerrainPaintTool {
     constructor() {

package/editor/view/EditorView.js

@@ -22,7 +22,6 @@ import MeshLibraryView from "./library/MeshLibraryView.js";
 import BottomLeftResizeHandleView from "../../view/elements/BottomLeftResizeHandleView.js";
 import Vector2 from "../../core/geom/Vector2.js";
 import Vector3 from "../../core/geom/Vector3.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import Mesh from "../../engine/graphics/ecs/mesh/Mesh.js";
 import { Transform } from "../../engine/ecs/transform/Transform.js";
 import SelectionClearAction from "../actions/concrete/SelectionClearAction.js";
@@ -32,6 +31,7 @@ import SelectionAddAction from "../actions/concrete/SelectionAddAction.js";
 import { noop, passThrough } from "../../core/function/Functions.js";
 import { ProcessState } from "../../core/process/ProcessState.js";
 import { MeshEvents } from "../../engine/graphics/ecs/mesh/MeshEvents.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class ViewManager extends View {
     constructor() {

package/editor/view/GridPickCoordinateView.js

@@ -1,8 +1,8 @@
 import View from "../../view/View.js";
-import { pick } from "../../../model/game/util/ScreenGridPicker.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import domify from "../../view/DOM.js";
 import { PointerDevice } from "../../engine/input/devices/PointerDevice.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
+import { pick } from "../../ecs/grid/pick.js";
 
 class GridPickCoordinateView extends View {
     /**

package/engine/asset/loaders/material/computeTextureHash.js

@@ -1,7 +1,7 @@
-import { max2 } from "../../../../core/math/max2.js";
 import { computeImageBitmapHash } from "./computeImageBitmapHash.js";
 import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
+import { murmur3_32 } from "../../../../core/math/hash/murmur3_32.js";
 
 /**
  *
@@ -59,6 +59,7 @@ export function computeImageDataHash(image) {
  */
 function computeSpecificHash(texture) {
     let dataHash = 0;
+    let i;
 
     if (texture.image !== null && texture.image !== undefined) {
 
@@ -73,25 +74,18 @@ function computeSpecificHash(texture) {
     if (Array.isArray(mipmaps)) {
         const nMipmaps = mipmaps.length;
 
-        for (let i = 0; i < nMipmaps; i++) {
+        for (i = 0; i < nMipmaps; i++) {
             const mipmap = mipmaps[i];
 
-            if (mipmap.width > 16) {
-                continue;
-            }
-
             const data = mipmap.data;
-
             const dataSize = data.length;
 
-            const dataStride = max2(1, Math.floor(dataSize / 31));
-
-            for (let i = 0; i < dataSize; i += dataStride) {
-                const datum = data[i];
-
-                dataHash = ((dataHash << 5) - dataHash) + datum;
+            if (dataSize > 1024) {
+                continue;
             }
 
+            dataHash = ((dataHash << 5) - dataHash) + murmur3_32(data, 1337);
+
             break;
         }
 

package/engine/ecs/animation/InverseKinematicsSystem.js

@@ -3,9 +3,9 @@ import { InverseKinematics } from "./InverseKinematics.js";
 import Mesh, { MeshFlags } from "../../graphics/ecs/mesh/Mesh.js";
 import { TwoBoneInverseKinematicsSolver } from "./TwoBoneInverseKinematicsSolver.js";
 import { extractSkeletonFromMeshComponent } from "../../graphics/ecs/mesh/SkeletonUtils.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import { OneBoneSurfaceAlignmentSolver } from "./OneBoneSurfaceAlignmentSolver.js";
 import { IKProblem } from "./IKProblem.js";
+import { obtainTerrain } from "../terrain/util/obtainTerrain.js";
 
 
 export class InverseKinematicsSystem extends System {

package/engine/ecs/attachment/AttachmentSystem.js

@@ -6,39 +6,6 @@ import { assert } from "../../../core/assert.js";
 import Mesh from "../../graphics/ecs/mesh/Mesh.js";
 import { BoneAttachmentBinding } from "./BoneAttachmentBinding.js";
 import { TransformAttachmentBinding } from "./TransformAttachmentBinding.js";
-import { MeshSystem } from "../../graphics/ecs/mesh/MeshSystem.js";
-
-/**
- * @readonly
- * @enum {number}
- */
-const WaitingType = {
-    Entity: 0,
-    Socket: 1,
-    Mesh: 2,
-    Transform: 3
-};
-
-class WaitingEntry {
-    /**
-     *
-     * @param {number} entity
-     * @param {WaitingType} type
-     */
-    constructor(entity, type) {
-        /**
-         *
-         * @type {number}
-         */
-        this.entity = entity;
-        /**
-         *
-         * @type {WaitingType}
-         */
-        this.type = type;
-    }
-}
-
 
 export class AttachmentSystem extends System {
     constructor() {
@@ -316,17 +283,10 @@ export class AttachmentSystem extends System {
         }
     }
 
-    /**
-     *
-     * @param {Mesh} mesh
-     * @param {number} entity
-     */
-    visitVisibleMesh(mesh, entity) {
-        const bindings = this.parentBindingIndex.get(entity);
+    __updateAll() {
+        for (const [entity, bindings] of this.parentBindingIndex) {
 
-        if (bindings !== undefined) {
             const n = bindings.length;
-
             for (let i = 0; i < n; i++) {
                 const binding = bindings[i];
 
@@ -339,21 +299,14 @@ export class AttachmentSystem extends System {
         //process wait queue
         this.processWaiting();
 
-        /**
-         *
-         * @type {MeshSystem}
-         */
-        const meshSystem = this.entityManager.getSystem(MeshSystem);
+        const em = this.entityManager;
 
-        meshSystem.traverseVisible(this.visitVisibleMesh, this);
+        const ecd = em.dataset;
 
-    }
-}
+        if (ecd === null) {
+            return;
+        }
 
-/**
- *
- * @param {AttachmentBinding} binding
- */
-function updateBinding(binding) {
-    binding.update();
+        this.__updateAll();
+    }
 }

package/engine/ecs/evaluation/world/ReadTerrainLayerWeightPointFitness.js

@@ -1,8 +1,8 @@
 import { PointFitnessFunction } from "../PointFitnessFunction.js";
-import { obtainTerrain } from "../../../../../model/game/scenes/SceneUtils.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
 import { assert } from "../../../../core/assert.js";
+import { obtainTerrain } from "../../terrain/util/obtainTerrain.js";
 
 
 const v3 = new Vector3();

package/engine/ecs/fow/FogOfWarRevealerSystem.js

@@ -2,10 +2,10 @@ import { System } from "../System.js";
 import { FogOfWarRevealer } from "./FogOfWarRevealer.js";
 import { SignalBinding } from "../../../core/events/signal/SignalBinding.js";
 import { FogOfWar } from "./FogOfWar.js";
-import Team from "../../../../model/game/ecs/component/Team.js";
+import Team from "../team/Team.js";
 import { Transform } from "../transform/Transform.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import Vector2 from "../../../core/geom/Vector2.js";
+import { obtainTerrain } from "../terrain/util/obtainTerrain.js";
 
 const v2 = new Vector2();
 

package/engine/ecs/grid/HeightMap2NormalMap.js

@@ -5,7 +5,7 @@
 import { Sampler2D } from '../../graphics/texture/sampler/Sampler2D.js';
 import NormalMapShader from '../../graphics/shaders/NormalMapShader2.js';
 import ImageFilter from '../../graphics/filter/ImageFilter.js';
-import { sampler2DtoFloat32Texture } from "./sampler2DToFloat32Texture.js";
+import { sampler2DtoFloat32Texture } from "../../graphics/texture/sampler/sampler2DToFloat32Texture.js";
 
 
 function convertChannel(v) {

package/engine/ecs/grid/NormalMap2AOMap.js

@@ -9,7 +9,7 @@ import sampler2D2Texture from '../../graphics/texture/sampler/Sampler2D2Texture.
 import AmbientOcclusionShader from '../../graphics/shaders/AmbientOcclusionShader.js';
 import GaussianBlurShader from '../../graphics/shaders/GaussianBlurShader.js';
 import ImageFilter from '../../graphics/filter/ImageFilter.js';
-import { sampler2DtoFloat32Texture } from "./sampler2DToFloat32Texture.js";
+import { sampler2DtoFloat32Texture } from "../../graphics/texture/sampler/sampler2DToFloat32Texture.js";
 
 function filterResult2Texture(data, width, height) {
     const result = new DataTexture();

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

@@ -5,7 +5,6 @@ import { System } from '../../System.js';
 import ViewportPosition from './ViewportPosition.js';
 import GUIElement from "../GUIElement.js";
 import { assert } from "../../../../core/assert.js";
-import Vector2 from "../../../../core/geom/Vector2.js";
 import { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
 import { EPSILON } from "../../../../core/math/MathUtils.js";
 import AABB2 from "../../../../core/geom/AABB2.js";
@@ -202,8 +201,9 @@ function setElementPosition(view, bounds, viewportSize, vp) {
     if (vp.stickToScreenEdge) {
 
 
-        const clipEdgeX = vp.screenEdgeWidth / viewportSize.x;
-        const clipEdgeY = vp.screenEdgeWidth / viewportSize.y;
+        const screenEdgeWidth = vp.screenEdgeWidth;
+        const clipEdgeX = screenEdgeWidth / viewportSize.x;
+        const clipEdgeY = screenEdgeWidth / viewportSize.y;
 
 
         stickyBounds.set(clipEdgeX, clipEdgeY, 1 - clipEdgeX, 1 - clipEdgeY);
@@ -241,8 +241,8 @@ function setElementPosition(view, bounds, viewportSize, vp) {
     }
 
 
-    const targetX = (x) * (viewportSize.x);
-    const targetY = (y) * (viewportSize.y);
+    const targetX = x * (viewportSize.x);
+    const targetY = y * (viewportSize.y);
 
     const viewPosition = view.position;
 

package/engine/ecs/parent/EntityNode.d.ts

@@ -0,0 +1,20 @@
+import EntityBuilder from "../EntityBuilder";
+import {EntityComponentDataset} from "../EntityComponentDataset";
+import {Transform} from "../transform/Transform";
+
+export class EntityNode {
+    constructor(entity?: EntityBuilder)
+
+    parent: EntityNode | null
+    entity: EntityBuilder
+
+    transform: Transform
+
+    addChild(node: EntityNode): boolean
+
+    removeChild(node: EntityNode): boolean
+
+    build(ecd: EntityComponentDataset): void
+
+    destroy(): void
+}