@woosh/meep-engine 2.33.61 → 2.33.65

package/core/FilePath.js

@@ -1,3 +1,5 @@
+const PATH_SEPARATOR = '/';
+
 /**
  * Strips all directories from the path.
  * @example 'a/b/c' -> 'c'
@@ -9,7 +11,7 @@ function computePathBase(path) {
         throw new Error('path is not a string');
     }
 
-    const lastSlashIndex = path.lastIndexOf('/');
+    const lastSlashIndex = path.lastIndexOf(PATH_SEPARATOR);
 
     if (lastSlashIndex !== -1) {
         return path.substring(lastSlashIndex + 1);
@@ -18,6 +20,30 @@ function computePathBase(path) {
     }
 }
 
+/**
+ * Returns the directory name of a path, similar to the Unix dirname command.
+ * @param {string} path
+ * @return {string}
+ */
+export function computePathDirectory(path) {
+    if (typeof path !== "string") {
+        throw new Error('path is not a string');
+    }
+
+    let lastSlashIndex = path.lastIndexOf(PATH_SEPARATOR);
+
+    //rewind in case of trailing slashes
+    while (lastSlashIndex > 0 && path.charAt(lastSlashIndex - 1) === PATH_SEPARATOR) {
+        lastSlashIndex--;
+    }
+
+    if (lastSlashIndex !== -1) {
+        return path.substring(0, lastSlashIndex);
+    } else {
+        return path;
+    }
+}
+
 /**
  *
  * @param {string} path
@@ -44,4 +70,4 @@ function computeFileExtension(path) {
 export {
     computePathBase,
     computeFileExtension
-};
+};

package/core/binary/BinaryBuffer.js

@@ -57,6 +57,19 @@ BinaryBuffer.prototype.fromArrayBuffer = function (arrayBuffer) {
     this.position = 0;
 };
 
+/**
+ *
+ * @param {ArrayBuffer} v
+ * @return {BinaryBuffer}
+ */
+BinaryBuffer.fromArrayBuffer = function (v) {
+    const r = new BinaryBuffer();
+
+    r.fromArrayBuffer(v);
+
+    return r;
+};
+
 /**
  *
  * @returns {BinaryBuffer}

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/AssetManager.js

@@ -231,7 +231,7 @@ AssetManager.prototype.submitRequest = function (path, type, request) {
             for (let i = 0; i < transformer_count; i++) {
                 const transformer = transformers[i];
 
-                const transformed_asset = await transformer.transform(asset);
+                const transformed_asset = await transformer.transform(asset, assetDescription);
 
                 if (typeof transformed_asset !== "object") {
                     console.error('Transformer produced invalid result. Ignoring result.', transformer, assetDescription);

package/engine/asset/AssetTransformer.js

@@ -7,9 +7,10 @@
 export class AssetTransformer {
     /**
      * @param {A} source
+     * @param {AssetDescription} asset_description
      * @returns {A}
      */
-    async transform(source) {
+    async transform(source, asset_description) {
         throw new Error('Not Implemented');
     }
 }

package/engine/asset/loaders/GLTFAssetLoader.js

@@ -25,6 +25,8 @@ import { computeGeometryEquality } from "./geometry/geometry/computeGeometryEqua
 import { traverseThreeObject } from "../../graphics/ecs/highlight/renderer/traverseThreeObject.js";
 import { computeTextureHash } from "./material/computeTextureHash.js";
 import { computeTextureEquality } from "./material/computeTextureEquality.js";
+import { async_traverse_three_object } from "./async_traverse_three_object.js";
+import { deinterleaveBufferGeometry } from "../../graphics/geometry/buffered/deinterleaveBufferGeometry.js";
 
 const animationOptimizer = new AnimationOptimizer();
 const materialCache = StaticMaterialCache.Global;
@@ -130,26 +132,6 @@ function buildDracoDecoderPath() {
     return `${pathname}/libs/draco/`;
 }
 
-/**
- *
- * @param {THREE.Object3D} object
- * @param {function} callback
- * @param {*} [thisArg]
- */
-async function async_traverse(object, callback, thisArg) {
-    await callback.call(thisArg, object);
-
-    const children = object.children;
-    const n = children.length;
-
-    for (let i = 0; i < n; i++) {
-        const child = children[i];
-
-        // TODO we can parallelize this if necessary
-        await async_traverse(child, callback, thisArg);
-    }
-}
-
 export class GLTFAssetLoader extends AssetLoader {
 
     constructor() {
@@ -312,6 +294,8 @@ export class GLTFAssetLoader extends AssetLoader {
                 mesh.geometry = geometry;
             }
 
+            mesh.geometry = deinterleaveBufferGeometry(geometry);
+
 
             if (this.__enable_texture_cache) {
                 // replace textures from cache
@@ -387,7 +371,7 @@ export class GLTFAssetLoader extends AssetLoader {
             }
 
 
-            await async_traverse(root, process_object);
+            await async_traverse_three_object(root, process_object);
 
 
             // compute object bounding sphere

package/engine/asset/loaders/async_traverse_three_object.js

@@ -0,0 +1,24 @@
+/**
+ *
+ * @param {THREE.Object3D} object
+ * @param {function} callback
+ * @param {*} [thisArg]
+ * @param {*} [ctx]
+ */
+export async function async_traverse_three_object(object, callback, thisArg, ctx) {
+    await callback.call(thisArg, object, ctx);
+
+    const children = object.children;
+    const n = children.length;
+
+    const child_promises = [];
+
+    for (let i = 0; i < n; i++) {
+        const child = children[i];
+
+        child_promises.push(async_traverse_three_object(child, callback, thisArg, ctx));
+    }
+
+    // wait for all children at the same time
+    await Promise.all(child_promises);
+}

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

@@ -7,38 +7,6 @@ import Mesh from "../../graphics/ecs/mesh/Mesh.js";
 import { BoneAttachmentBinding } from "./BoneAttachmentBinding.js";
 import { TransformAttachmentBinding } from "./TransformAttachmentBinding.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() {
         super();
@@ -315,17 +283,10 @@ export class AttachmentSystem extends System {
         }
     }
 
-    /**
-     *
-     * @param {number} entity
-     * @private
-     */
-    __update_entity(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];
 
@@ -334,15 +295,6 @@ export class AttachmentSystem extends System {
         }
     }
 
-    /**
-     *
-     * @param {Mesh} mesh
-     * @param {number} entity
-     */
-    visitComponent(mesh, entity) {
-        this.__update_entity(entity);
-    }
-
     update(timeDelta) {
         //process wait queue
         this.processWaiting();
@@ -355,6 +307,6 @@ export class AttachmentSystem extends System {
             return;
         }
 
-        ecd.traverseComponents(Attachment, this.visitComponent, this);
+        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/team/Team.js

@@ -0,0 +1,82 @@
+/**
+ * Created by Alex on 13/04/2016.
+ */
+import ObservedInteger from "../../../core/model/ObservedInteger.js";
+import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
+
+class Team extends ObservedInteger {
+    /**
+     *
+     * @param value
+     * @constructor
+     */
+    constructor(value = 0) {
+        super(value);
+    }
+
+    clone() {
+        return new Team(this.getValue());
+    }
+
+    /**
+     *
+     * @param {object} json
+     * @returns {Team}
+     */
+    static fromJSON(json) {
+        const t = new Team();
+
+        t.fromJSON(json);
+
+        return t;
+    }
+}
+
+Team.typeName = "Team";
+
+
+export default Team;
+
+export class TeamSerializationAdapter extends BinaryClassSerializationAdapter{
+    constructor(){
+        super();
+
+        this.klass = Team;
+        this.version = 0;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Team} value
+     */
+    serialize(buffer, value) {
+        const v = value.getValue();
+
+        if (v === Infinity) {
+            buffer.writeInt32(2147483647);
+        } else if (v === -Infinity) {
+            buffer.writeInt32(-2147483648);
+        } else {
+            //TODO it's possible to write encoded Infinity values by accident
+            buffer.writeInt32(v);
+        }
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Team} value
+     */
+    deserialize(buffer, value) {
+        const v = buffer.readInt32();
+
+        if (v === 2147483647) {
+            value.set(Infinity);
+        } else if (v === -2147483648) {
+            value.set(-Infinity);
+        } else {
+            value.set(v);
+        }
+    }
+}

package/engine/ecs/terrain/ecs/ClingToTerrainSystem.js

@@ -9,13 +9,13 @@ import { Transform } from '../../transform/Transform.js';
 import ClingToTerrain from './ClingToTerrain.js';
 
 import Vector3 from '../../../../core/geom/Vector3.js';
-import { obtainTerrain } from "../../../../../model/game/scenes/SceneUtils.js";
 import Quaternion from "../../../../core/geom/Quaternion.js";
-import { EPSILON} from "../../../../core/math/MathUtils.js";
+import { EPSILON } from "../../../../core/math/MathUtils.js";
 import { Matrix4 } from "three";
 import { assert } from "../../../../core/assert.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import { Deque } from "../../../../core/collection/queue/Deque.js";
+import { obtainTerrain } from "../util/obtainTerrain.js";
 
 
 /**