@woosh/meep-engine 2.33.59 → 2.33.63

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/animation/removeEntityGenericEffect.js

@@ -3,22 +3,7 @@ import { ParticleEmitter } from "../graphics/particles/particular/engine/emitter
 
 const lib = {
     'cloud-puff': {
-        "position": {
-            "x": 56.41791044776119,
-            "y": -8.887834661270745,
-            "z": 223.65671641791042
-        },
-        "scale": {
-            "x": 1,
-            "y": 1,
-            "z": 1
-        },
-        "rotation": {
-            "x": 0,
-            "y": 0,
-            "z": 0,
-            "w": 1
-        },
+        "receiveLight": true,
         "parameters": [
             {
                 "name": "scale",
@@ -80,24 +65,24 @@ const lib = {
                         "track": {
                             "itemSize": 4,
                             "data": [
-                                0.9803921568627451,
-                                0.9803921568627451,
-                                0.9803921568627451,
-                                0.3,
+                                0.6,
+                                0.6,
+                                0.6,
+                                0,
 
-                                0.9882352941176471,
-                                0.9882352941176471,
-                                0.9882352941176471,
-                                0.9880952380952381,
+                                0.6,
+                                0.6,
+                                0.6,
+                                1,
 
-                                0.9882352941176471,
-                                0.9882352941176471,
-                                0.9882352941176471,
+                                0.6,
+                                0.6,
+                                0.6,
                                 0.5,
 
-                                0.9882352941176471,
-                                0.9882352941176471,
-                                0.9882352941176471,
+                                0.6,
+                                0.6,
+                                0.6,
                                 0
                             ],
                             "positions": [
@@ -155,7 +140,13 @@ export function removeEntityGenericEffect(
     }
 ) {
 
-    const emitter = ParticleEmitter.fromJSON(lib[particles]);
+    const particle_json = lib[particles];
+
+    if (particle_json === undefined) {
+        throw new Error(`Unsupported particle ID '${particles}'`);
+    }
+
+    const emitter = ParticleEmitter.fromJSON(particle_json);
 
     const result = removeEntityWithEffect({
         entity,

package/engine/asset/Asset.js

@@ -4,51 +4,6 @@
  * @param {string} type
  * @constructor
  */
-import { assert } from "../../core/assert.js";
-import { computeStringHash } from "../../core/primitives/strings/computeStringHash.js";
-import { computeHashIntegerArray } from "../../core/collection/array/computeHashIntegerArray.js";
-
-export class AssetDescription {
-    /**
-     *
-     * @param {string} path
-     * @param {string} type
-     * @constructor
-     */
-    constructor(path, type) {
-        assert.typeOf(path, 'string', 'path');
-        assert.typeOf(type, 'string', 'type');
-
-        /**
-         * @type {string}
-         */
-        this.path = path;
-        /**
-         * @type {string}
-         */
-        this.type = type;
-    }
-
-    /**
-     *
-     * @param {AssetDescription} other
-     * @returns {boolean}
-     */
-    equals(other) {
-        return this.path === other.path && this.type === other.type;
-    }
-
-    /**
-     *
-     * @returns {number}
-     */
-    hash() {
-        return computeHashIntegerArray(
-            computeStringHash(this.path),
-            computeStringHash(this.type)
-        );
-    }
-}
 
 
 export class Asset {

package/engine/asset/AssetDescription.js

@@ -0,0 +1,51 @@
+import { assert } from "../../core/assert.js";
+import { computeHashIntegerArray } from "../../core/collection/array/computeHashIntegerArray.js";
+import { computeStringHash } from "../../core/primitives/strings/computeStringHash.js";
+
+export class AssetDescription {
+    /**
+     *
+     * @param {string} path
+     * @param {string} type
+     * @constructor
+     */
+    constructor(path, type) {
+        assert.isString(path, 'path');
+        assert.isString(type, 'type');
+
+        /**
+         * @type {string}
+         */
+        this.path = path;
+        /**
+         * @type {string}
+         */
+        this.type = type;
+    }
+
+    /**
+     *
+     * @param {AssetDescription} other
+     * @returns {boolean}
+     */
+    equals(other) {
+        return this.path === other.path
+            && this.type === other.type
+            ;
+    }
+
+    /**
+     *
+     * @returns {number}
+     */
+    hash() {
+        return computeHashIntegerArray(
+            computeStringHash(this.path),
+            computeStringHash(this.type)
+        );
+    }
+
+    toString() {
+        return `{ type: '${this.type}', path: '${this.path}' }`;
+    }
+}

package/engine/asset/AssetManager.d.ts

@@ -1,6 +1,7 @@
 import {AssetLoader} from "./loaders/AssetLoader";
 import {Asset} from "./Asset";
 import {CrossOriginConfig} from "./CORS/CrossOriginConfig";
+import {AssetTransformer} from "./AssetTransformer";
 
 export class AssetManager {
     public readonly crossOriginConfig: CrossOriginConfig
@@ -12,4 +13,10 @@ export class AssetManager {
     public clear(): void
 
     public registerLoader<T>(type: string, loader: AssetLoader<T>): Promise<void>
+
+    public unregisterLoader(type: string): Promise<void>
+
+    public registerTransformer<T extends Asset<X>, X = any>(type: string, transformer: AssetTransformer<T>): void
+
+    public unregisterTransformer<T extends Asset<X>, X = any>(type: string, transformer: AssetTransformer<T>): boolean
 }

package/engine/asset/AssetManager.js

@@ -5,12 +5,13 @@
 
 import BoundedValue from "../../core/model/BoundedValue.js";
 import { ObservedMap } from "../../core/collection/ObservedMap.js";
-import { AssetDescription } from "./Asset.js";
 import { HashMap } from "../../core/collection/HashMap.js";
 import { extractAssetListFromManager } from "./preloader/extractAssetListFromManager.js";
 import { assert } from "../../core/assert.js";
 import { HashSet } from "../../core/collection/HashSet.js";
 import { CrossOriginConfig } from "./CORS/CrossOriginConfig.js";
+import { array_remove_element } from "../../core/collection/array/array_remove_element.js";
+import { AssetDescription } from "./AssetDescription.js";
 
 /**
  *
@@ -62,6 +63,13 @@ function AssetManager(engine) {
      */
     this.loaders = {};
 
+    /**
+     * After asset is loaded, a chain of transforms can be applied to it, these are registered here
+     * Transformers are executed in the order in which they are added
+     * @type {Object<AssetTransformer[]>}
+     */
+    this.transformers = {};
+
     /**
      * Named links to specific assets. Useful to later re-mapping assets and having meaningful names for them
      * @type {Map<string, AssetDescription>}
@@ -209,7 +217,30 @@ AssetManager.prototype.submitRequest = function (path, type, request) {
     const assets = this.assets;
     const failures = this.failures;
 
-    function success(asset) {
+    /**
+     *
+     * @param {Asset} loaded_asset
+     */
+    const success = async (loaded_asset) => {
+        let asset = loaded_asset;
+
+        // apply transform chain
+        const transformers = this.transformers[type];
+        if (transformers !== undefined) {
+            const transformer_count = transformers.length;
+            for (let i = 0; i < transformer_count; i++) {
+                const transformer = transformers[i];
+
+                const transformed_asset = await transformer.transform(asset);
+
+                if (typeof transformed_asset !== "object") {
+                    console.error('Transformer produced invalid result. Ignoring result.', transformer, assetDescription);
+                } else {
+                    asset = transformed_asset;
+                }
+            }
+        }
+
         //link asset description
         asset.description = assetDescription;
 
@@ -298,6 +329,71 @@ AssetManager.prototype.getLoaderByType = function (type) {
     return this.loaders[type];
 };
 
+/**
+ *
+ * @param {string} type
+ * @return {AssetDescription[]}
+ * @private
+ */
+AssetManager.prototype.__getLoadedAssetDescriptorsByType = function (type) {
+    const loaded_assets = Array.from(this.assets.keys());
+    return loaded_assets.filter(t => t.type === type);
+}
+
+/**
+ * @template T
+ * @param {string} type
+ * @param {AssetTransformer<T>} transformer
+ */
+AssetManager.prototype.registerTransformer = function (type, transformer) {
+    let transformers = this.transformers[type];
+
+    if (transformers === undefined) {
+        transformers = [];
+
+        this.transformers[type] = transformers;
+    }
+
+    transformers.push(transformer);
+
+    // check for loaded assets
+    const matching_assets = this.__getLoadedAssetDescriptorsByType(type);
+
+    if (matching_assets.length > 0) {
+        console.warn(`Following assets of matching type '${type}' are already loaded and transform is not applied to them:\n\t${matching_assets.join('\n\t')}`);
+    }
+
+};
+
+/**
+ * @template T
+ * @param {string} type
+ * @param {AssetTransformer<T>} transformer
+ */
+AssetManager.prototype.unregisterTransformer = function (type, transformer) {
+
+    const transformers = this.transformers[type];
+
+    if (transformers === undefined) {
+        // not found
+        return false;
+    }
+
+    if (!array_remove_element(transformers, 0, transformers.length, transformer)) {
+        // not found
+        return false;
+    }
+
+    // check for loaded assets
+    const matching_assets = this.__getLoadedAssetDescriptorsByType(type);
+
+    if (matching_assets.length > 0) {
+        console.warn(`Following assets of matching type '${type}' are already loaded and transform was probably already applied to them:\n\t${matching_assets.join('\n\t')}`);
+    }
+
+    return true;
+}
+
 /**
  * @template T
  * @param {string} type

package/engine/asset/AssetTransformer.d.ts

@@ -0,0 +1,5 @@
+import {Asset} from "./Asset";
+
+export class AssetTransformer<A extends Asset<T>, T = any> {
+    transform(source: A): Promise<A>
+}

package/engine/asset/AssetTransformer.js

@@ -0,0 +1,15 @@
+/**
+ * Applies a transformation to an asset. Such as performing mesh simplification for example.
+ * Transformation is executed by the {@link AssetManager}
+ * @template {Asset<T>} A
+ * @template T
+ */
+export class AssetTransformer {
+    /**
+     * @param {A} source
+     * @returns {A}
+     */
+    async transform(source) {
+        throw new Error('Not Implemented');
+    }
+}