@woosh/meep-engine 2.62.0 → 2.64.0

package/src/engine/ecs/terrain/TerrainPreview.js

@@ -1,66 +1,67 @@
 import Vector2 from "../../../core/geom/Vector2.js";
 
-export function TerrainPreview() {
+export class TerrainPreview {
     /**
      *
      * @type {String}
      */
-    this.url = "";
+    url = "";
 
     /**
      *
      * @type {Vector2}
      */
-    this.offset = new Vector2(0, 0);
+    offset = new Vector2(0, 0);
     /**
      *
      * @type {Vector2}
      */
-    this.scale = new Vector2(1, 1);
-}
+    scale = new Vector2(1, 1);
+
+    /**
+     *
+     * @param {TerrainPreview} other
+     */
+    copy(other) {
+        this.url = other.url;
+        this.scale.copy(other.scale);
+        this.offset.copy(other.offset);
+    }
 
-/**
- *
- * @param {TerrainPreview} other
- */
-TerrainPreview.prototype.copy = function (other) {
-    this.url = other.url;
-    this.scale.copy(other.scale);
-    this.offset.copy(other.offset);
-};
+    toJSON() {
+        return {
+            url: this.url,
+            offset: this.offset.toJSON(),
+            scale: this.scale.toJSON()
+        };
+    }
 
-TerrainPreview.prototype.toJSON = function () {
-    return {
-        url: this.url,
-        offset: this.offset.toJSON(),
-        scale: this.scale.toJSON()
-    };
-};
+    fromJSON(obj) {
+        this.url = obj.url;
+        this.offset.fromJSON(obj.offset);
+        this.scale.fromJSON(obj.scale);
+    }
 
-TerrainPreview.prototype.fromJSON = function (obj) {
-    this.url = obj.url;
-    this.offset.fromJSON(obj.offset);
-    this.scale.fromJSON(obj.scale);
-};
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     */
+    toBinaryBuffer(buffer) {
+        buffer.writeUTF8String(this.url);
 
-/**
- *
- * @param {BinaryBuffer} buffer
- */
-TerrainPreview.prototype.toBinaryBuffer = function (buffer) {
-    buffer.writeUTF8String(this.url);
+        this.offset.toBinaryBuffer(buffer);
+        this.scale.toBinaryBuffer(buffer);
+    }
 
-    this.offset.toBinaryBuffer(buffer);
-    this.scale.toBinaryBuffer(buffer);
-};
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     */
+    fromBinaryBuffer(buffer) {
+        this.url = buffer.readUTF8String();
 
-/**
- *
- * @param {BinaryBuffer} buffer
- */
-TerrainPreview.prototype.fromBinaryBuffer = function (buffer) {
-    this.url = buffer.readUTF8String();
+        this.offset.fromBinaryBuffer(buffer);
+        this.scale.fromBinaryBuffer(buffer);
+    }
+}
 
-    this.offset.fromBinaryBuffer(buffer);
-    this.scale.fromBinaryBuffer(buffer);
-};

package/src/engine/ecs/terrain/ecs/cling/ClingToTerrain.js

@@ -1,8 +1,8 @@
 /**
  * Created by Alex on 13/05/2016.
  */
-import Vector3 from "../../../../../core/geom/Vector3.js";
 import Quaternion from "../../../../../core/geom/Quaternion.js";
+import Vector3 from "../../../../../core/geom/Vector3.js";
 
 class ClingToTerrain {
     /**
@@ -13,12 +13,12 @@ class ClingToTerrain {
      * Used internally for caching updates
      * @type {Vector3}
      */
-    __lastPosition=new Vector3(0, 0, 0);
+    __lastPosition = new Vector3(0, 0, 0);
     /**
      *
      * @type {Quaternion}
      */
-    __lastRotation=new Quaternion(0, 0, 0, 1);
+    __lastRotation = new Quaternion(0, 0, 0, 1);
     /**
      * Speed in Rad/s (Radians/second) by which rotation can change
      * @type {number}
@@ -26,11 +26,29 @@ class ClingToTerrain {
     rotationSpeed = 3;
 
     constructor(opt) {
-        if(opt !== undefined){
+        if (opt !== undefined) {
             throw new Error("constructor options deprecated");
         }
     }
 
+    /**
+     *
+     * @param {ClingToTerrain} other
+     * @returns {boolean}
+     */
+    equals(other) {
+        return this.normalAlign === other.normalAlign
+            && this.rotationSpeed === other.rotationSpeed;
+    }
+
+    /**
+     *
+     * @returns {number}
+     */
+    hash() {
+        return this.normalAlign ? 1 : 0;
+    }
+
     toJSON() {
         return {
             normalAlign: this.normalAlign,

package/src/engine/ecs/terrain/tiles/TerrainTile.js

@@ -3,31 +3,36 @@
  */
 
 
+import { mat4 } from "gl-matrix";
 import {
     Box3 as ThreeBox3,
     BufferAttribute as ThreeBufferAttribute,
     BufferGeometry as ThreeBufferGeometry,
+    MeshBasicMaterial,
     Sphere as ThreeSphere,
     Vector3 as ThreeVector3
 } from 'three';
-import Vector2 from '../../../../core/geom/Vector2.js';
-import Vector3 from '../../../../core/geom/Vector3.js';
 
-import ThreeFactory from '../../../graphics/three/ThreeFactory.js';
+import IndexedBinaryBVH from '../../../../core/bvh2/binary/IndexedBinaryBVH.js';
 
 
 import { LeafNode } from '../../../../core/bvh2/LeafNode.js';
-
-import IndexedBinaryBVH from '../../../../core/bvh2/binary/IndexedBinaryBVH.js';
-import { BVHGeometryRaycaster } from "../../../graphics/geometry/bvh/buffered/BVHGeometryRaycaster.js";
-import ObservedInteger from "../../../../core/model/ObservedInteger.js";
-import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
+import { array_copy } from "../../../../core/collection/array/array_copy.js";
 import Signal from "../../../../core/events/signal/Signal.js";
-import { mat4 } from "gl-matrix";
+import { passThrough } from "../../../../core/function/Functions.js";
 import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
+import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
+import Vector2 from '../../../../core/geom/Vector2.js';
+import Vector3 from '../../../../core/geom/Vector3.js';
 import { NumericInterval } from "../../../../core/math/interval/NumericInterval.js";
-import { array_copy } from "../../../../core/collection/array/array_copy.js";
-import { passThrough } from "../../../../core/function/Functions.js";
+import ObservedInteger from "../../../../core/model/ObservedInteger.js";
+import { BVHGeometryRaycaster } from "../../../graphics/geometry/bvh/buffered/BVHGeometryRaycaster.js";
+
+import ThreeFactory from '../../../graphics/three/ThreeFactory.js';
+
+
+const EMPTY_GEOMETRY = new ThreeBufferGeometry();
+const DEFAULT_MATERIAL = new MeshBasicMaterial();
 
 /**
  * terrain tile is a part of a 2d array
@@ -44,7 +49,7 @@ class TerrainTile {
      * @type {Material}
      */
     material = null;
-    mesh = ThreeFactory.createMesh();
+    mesh = ThreeFactory.createMesh(EMPTY_GEOMETRY, DEFAULT_MATERIAL);
 
 
     /**

package/src/engine/graphics/ecs/mesh/Mesh.d.ts

@@ -5,10 +5,6 @@ import {LeafNode} from "../../../../core/bvh2/LeafNode";
 export default class Mesh {
     url: string
     mesh: Object3D
-    /**
-     * Managed by MeshSystem, do not change
-     */
-    bvh: LeafNode<Object3D>
 
     castShadow: boolean
     receiveShadow: boolean

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

@@ -51,12 +51,6 @@ class Mesh {
          */
         this.mesh = null;
 
-        /**
-         * Override Mesh data, if available. Typically set via plugins
-         * @type {Object3D|null}
-         */
-        this.override_mesh = null;
-
         /**
          * @transient
          * @type {Asset|null}
@@ -129,11 +123,6 @@ class Mesh {
         aabb3_matrix4_project(this.__bvh_leaf.bounds, this.boundingBox, _t.matrix);
 
         this.__bvh_leaf.write_bounds();
-
-        // override
-        if (this.override_mesh !== null) {
-            applyTransformToThreeObject(this.override_mesh, _t);
-        }
     }
 
     /**

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

@@ -4,9 +4,19 @@
 
 
 import { BoxBufferGeometry, MeshLambertMaterial } from "three";
+import { assert } from "../../../../core/assert.js";
+import {
+    ExplicitBinaryBoundingVolumeHierarchy
+} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import {
+    bvh_query_user_data_overlaps_frustum
+} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
 import { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
 
 import Vector3 from "../../../../core/geom/Vector3.js";
+import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
+import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { System } from "../../../ecs/System.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 
@@ -15,26 +25,16 @@ import checkerTexture from "../../texture/CheckersTexture.js";
 import ThreeFactory from "../../three/ThreeFactory.js";
 import { assetTypeByPath } from "./assetTypeByPath.js";
 import Mesh, { MeshFlags } from "./Mesh.js";
-import { applyComponentPropertiesToThreeObject, setMesh } from "./setMesh.js";
-import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { MeshEvents } from "./MeshEvents.js";
-import { assert } from "../../../../core/assert.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
-import {
-    bvh_query_user_data_overlaps_frustum
-} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+import { setMesh } from "./setMesh.js";
 
-const placeholderGeometry = new BoxBufferGeometry(1, 1, 1);
+const PLACEHOLDER_GEOMETRY = new BoxBufferGeometry(1, 1, 1);
 
-placeholderGeometry.computeBoundingSphere();
+PLACEHOLDER_GEOMETRY.computeBoundingSphere();
 
-const placeholderTexture = checkerTexture.create();
+const PLACEHOLDER_TEXTURE = checkerTexture.create();
 
-const placeholderMaterial = new MeshLambertMaterial({ map: placeholderTexture });
+const PLACEHOLDER_MATERIAL = new MeshLambertMaterial({ map: PLACEHOLDER_TEXTURE });
 
 const scratch_array = [];
 
@@ -134,13 +134,6 @@ export class MeshSystem extends System {
 
         component.setFlag(MeshFlags.Loaded);
 
-        // override
-        if (asset.override_mesh !== undefined) {
-            component.override_mesh = asset.override_mesh.clone();
-
-            applyComponentPropertiesToThreeObject(component, component.override_mesh, entity);
-        }
-
         setMesh(dataset, entity, component, mesh);
 
 
@@ -318,8 +311,6 @@ export class MeshSystem extends System {
             bScale
         ];
 
-        apply_transform();
-
         model.__bvh_leaf.link(this.__bvh_binary, entity);
     }
 
@@ -375,38 +366,6 @@ export class MeshSystem extends System {
 
         const dataset = em.dataset;
 
-        /**
-         *
-         * @param {Asset<Object3D>} asset
-         */
-        const assetLoaded = (asset) => {
-            if (!dataset.entityExists(entity)) {
-                //entity no longer exists, probably dataset has been switched, abort
-                return;
-            }
-
-            //check that component is still actual
-            const actualComponent = dataset.getComponent(entity, Mesh);
-
-            if (actualComponent === component) {
-                // scene.remove(component.mesh);
-                this.__set_mesh_from_asset(entity, dataset, asset, component);
-
-            } else {
-                //component is no longer in the manager. do nothing.
-                //console.warn("component is no longer in the manager");
-            }
-        }
-
-
-        function assetFailure(error) {
-            console.error("failed to load model " + component.url, error);
-
-            dataset.sendEvent(entity, MeshEvents.AssetLoadFailed, {
-                reason: error
-            });
-        }
-
         if (component.hasMesh()) {
             //do not re-run if mesh is set
             setMesh(dataset, entity, component, component.mesh);
@@ -425,28 +384,59 @@ export class MeshSystem extends System {
         if (asset !== null) {
             // asset is already loaded, use it
             this.__set_mesh_from_asset(entity, dataset, asset, component);
-        } else {
+            return;
+        }
+
+        // mesh was not found, use temp mesh and submit a request
+
+        if (this.__use_placeholder_mesh) {
+            // set placeholder mesh
+            const mesh = ThreeFactory.createMesh(PLACEHOLDER_GEOMETRY, PLACEHOLDER_MATERIAL);
+
+            setMesh(dataset, entity, component, mesh);
+        }
+
+        function assetFailure(error) {
+            console.error("failed to load model " + component.url, error);
+
+            dataset.sendEvent(entity, MeshEvents.AssetLoadFailed, {
+                reason: error
+            });
+        }
 
-            // mesh was not found, use temp mesh and submit a request
+        if (assetType === null) {
+            // couldn't figure out what the asset type is
+            assetFailure("no asset type deduced");
+            return;
+        }
 
-            if (this.__use_placeholder_mesh) {
-                // set placeholder mesh
-                const mesh = ThreeFactory.createMesh(placeholderGeometry, placeholderMaterial);
 
-                setMesh(dataset, entity, component, mesh);
+        /**
+         *
+         * @param {Asset<Object3D>} asset
+         */
+        const assetLoaded = (asset) => {
+            if (!dataset.entityExists(entity)) {
+                //entity no longer exists, probably dataset has been switched, abort
+                return;
             }
 
-            if (assetType === null) {
+            //check that component is still actual
+            const actualComponent = dataset.getComponent(entity, Mesh);
 
-                assetFailure("no asset type deduced");
+            if (actualComponent === component) {
+                // scene.remove(component.mesh);
+                this.__set_mesh_from_asset(entity, dataset, asset, component);
 
             } else {
-                // load the asset
-                am.get({ path: component.url, type: assetType, callback: assetLoaded, failure: assetFailure });
+                //component is no longer in the manager. do nothing.
+                //console.warn("component is no longer in the manager");
             }
         }
 
-        dataset.getComponentAsync(entity, Transform, component.internalApplyTransform, component);
+        // load the asset
+        am.get({ path: component.url, type: assetType, callback: assetLoaded, failure: assetFailure });
+
     }
 
     update(timeDelta) {