@woosh/meep-engine 2.69.0 → 2.71.0

package/src/engine/ecs/gui/position/ViewportPositionSerializationAdapter.js

@@ -0,0 +1,42 @@
+import { BinaryClassSerializationAdapter } from "../../storage/binary/BinaryClassSerializationAdapter.js";
+import ViewportPosition from "./ViewportPosition.js";
+
+export class ViewportPositionSerializationAdapter extends BinaryClassSerializationAdapter {
+
+    version = 0;
+    klass = ViewportPosition;
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {ViewportPosition} value
+     */
+    serialize(buffer, value) {
+        value.position.toBinaryBufferFloat32(buffer);
+        value.offset.toBinaryBufferFloat32(buffer);
+        value.anchor.toBinaryBufferFloat32(buffer);
+
+        buffer.writeFloat32(value.screenEdgeWidth);
+
+        buffer.writeUint8(value.resolveGuiCollisions ? 1 : 0);
+        buffer.writeUint8(value.stickToScreenEdge ? 1 : 0);
+        buffer.writeUint8(value.enabled.getValue() ? 1 : 0);
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {ViewportPosition} value
+     */
+    deserialize(buffer, value) {
+        value.position.fromBinaryBufferFloat32(buffer);
+        value.offset.fromBinaryBufferFloat32(buffer);
+        value.anchor.fromBinaryBufferFloat32(buffer);
+
+        value.screenEdgeWidth = buffer.readFloat32();
+
+        value.resolveGuiCollisions = buffer.readUint8() !== 0;
+        value.stickToScreenEdge = buffer.readUint8() !== 0;
+        value.enabled.set(buffer.readUint8() !== 0);
+    }
+}

package/src/engine/ecs/transform/Transform.js

@@ -2,15 +2,15 @@
  * Created by Alex on 02/04/2014.
  */
 
-import {assert} from "../../../core/assert.js";
-import {compose_matrix4_array} from "../../../core/geom/3d/compose_matrix4_array.js";
-import {decompose_matrix_4_array} from "../../../core/geom/3d/decompose_matrix_4_array.js";
-import {allocate_transform_m4} from "../../../core/geom/3d/matrix/allocate_transform_m4.js";
-import {m4_multiply} from "../../../core/geom/3d/matrix/m4_multiply.js";
-import {MATRIX_4_IDENTITY} from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+import { assert } from "../../../core/assert.js";
+import { compose_matrix4_array } from "../../../core/geom/3d/compose_matrix4_array.js";
+import { decompose_matrix_4_array } from "../../../core/geom/3d/decompose_matrix_4_array.js";
+import { allocate_transform_m4 } from "../../../core/geom/3d/matrix/allocate_transform_m4.js";
+import { m4_multiply } from "../../../core/geom/3d/matrix/m4_multiply.js";
+import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import Vector3 from "../../../core/geom/Vector3.js";
-import {TransformFlags} from "./TransformFlags.js";
+import { TransformFlags } from "./TransformFlags.js";
 
 /**
  *
@@ -261,8 +261,7 @@ export class Transform {
      * @returns {boolean}
      */
     equals(other) {
-        return other.isTransform
-            && this.position.equals(other.position)
+        return this.position.equals(other.position)
             && this.rotation.equals(other.rotation)
             && this.scale.equals(other.scale);
     }

package/src/engine/ecs/transform/TransformSerializationAdapter.js

@@ -1,3 +1,7 @@
+import { quat_decode_from_uint32 } from "../../../core/geom/3d/quaternion/quat_decode_from_uint32.js";
+import { quat_encode_to_uint32 } from "../../../core/geom/3d/quaternion/quat_encode_to_uint32.js";
+import { v3_binary_equality_decode } from "../../../core/geom/vec3/v3_binary_equality_decode.js";
+import { v3_binary_equality_encode } from "../../../core/geom/vec3/v3_binary_equality_encode.js";
 import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
 import { Transform } from "./Transform.js";
 
@@ -14,20 +18,23 @@ export class TransformSerializationAdapter extends BinaryClassSerializationAdapt
     serialize(buffer, value) {
 
         const position = value.position;
+        const rotation = value.rotation;
+        const scale = value.scale;
 
-        const positionX = position.x;
-        const positionY = position.y;
-        const positionZ = position.z;
+        buffer.writeFloat64(position.x);
+        buffer.writeFloat64(position.y);
+        buffer.writeFloat64(position.z);
 
-        buffer.writeFloat64(positionX);
-        buffer.writeFloat64(positionY);
-        buffer.writeFloat64(positionZ);
+        const encoded_rotation = quat_encode_to_uint32(
+            rotation.x,
+            rotation.y,
+            rotation.z,
+            rotation.w
+        );
 
-        const encodedRotation = value.rotation.encodeToUint32();
+        buffer.writeUint32(encoded_rotation);
 
-        buffer.writeUint32(encodedRotation);
-
-        value.scale.toBinaryBufferFloat32_EqualityEncoded(buffer);
+        v3_binary_equality_encode(buffer, scale.x, scale.y, scale.z);
     }
 
     /**
@@ -40,12 +47,11 @@ export class TransformSerializationAdapter extends BinaryClassSerializationAdapt
         const positionY = buffer.readFloat64();
         const positionZ = buffer.readFloat64();
 
-        const encodedRotation = buffer.readUint32();
+        const encoded_rotation = buffer.readUint32();
 
-        value.scale.fromBinaryBufferFloat32_EqualityEncoded(buffer);
+        v3_binary_equality_decode(buffer, value.scale, 0);
 
+        quat_decode_from_uint32(value.rotation, 0, encoded_rotation);
         value.position.set(positionX, positionY, positionZ);
-
-        value.rotation.decodeFromUint32(encodedRotation);
     }
 }

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

@@ -3,10 +3,8 @@
  */
 import { assert } from "../../../../core/assert.js";
 import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
-import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
-import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 import { applyTransformToThreeObject } from "./applyTransformToThreeObject.js";
@@ -25,6 +23,15 @@ export const MeshFlags = {
 
 const DEFAULT_FLAGS = 0;
 
+/**
+ *
+ * @type {number}
+ */
+const EQUALITY_FLAGS =
+    MeshFlags.CastShadow
+    | MeshFlags.ReceiveShadow
+;
+
 /**
  * Traversal stack
  * @type {Object3D[]}
@@ -255,13 +262,7 @@ class Mesh {
     }
 
     hash() {
-        let urlHash = computeStringHash(this.url);
-        return computeHashIntegerArray(
-            urlHash,
-            this.castShadow ? 1 : 0,
-            this.receiveShadow ? 1 : 0,
-            computeHashFloat(this.opacity)
-        );
+        return computeStringHash(this.url) ^ this.flags;
     }
 
     /**
@@ -271,9 +272,8 @@ class Mesh {
      */
     equals(other) {
         return this.url === other.url
+            && (this.flags & EQUALITY_FLAGS) === (other.flags & EQUALITY_FLAGS)
             && this.opacity === other.opacity
-            && this.castShadow === other.castShadow
-            && this.receiveShadow === other.receiveShadow
             ;
     }
 

package/src/engine/graphics/impostors/octahedral/prototypeBaker.js

@@ -1,32 +1,32 @@
-import { EngineHarness } from "../../../EngineHarness.js";
-import { ImpostorBaker } from "./ImpostorBaker.js";
-import { ShadedGeometry } from "../../ecs/mesh-v2/ShadedGeometry.js";
+import Quaternion from "../../../../core/geom/Quaternion.js";
+import Vector2 from "../../../../core/geom/Vector2.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
+import { DEG_TO_RAD } from "../../../../core/math/DEG_TO_RAD.js";
+import { GameAssetType } from "../../../asset/GameAssetType.js";
+import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import Entity from "../../../ecs/Entity.js";
-import ViewportPosition from "../../../ecs/gui/position/ViewportPosition.js";
 import GUIElement from "../../../ecs/gui/GUIElement.js";
 import GUIElementSystem from "../../../ecs/gui/GUIElementSystem.js";
+import ViewportPosition from "../../../ecs/gui/position/ViewportPosition.js";
 import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
-import Vector2 from "../../../../core/geom/Vector2.js";
-import { GameAssetType } from "../../../asset/GameAssetType.js";
-import { Transform } from "../../../ecs/transform/Transform.js";
-import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
-import { ImpostorCaptureType } from "./ImpostorCaptureType.js";
-import { ShadedGeometrySystem } from "../../ecs/mesh-v2/ShadedGeometrySystem.js";
-import { ImpostorShaderV0 } from "./shader/ImpostorShaderV0.js";
-import Quaternion from "../../../../core/geom/Quaternion.js";
-import { SGMesh } from "../../ecs/mesh-v2/aggregate/SGMesh.js";
-import { SGMeshSystem } from "../../ecs/mesh-v2/aggregate/SGMeshSystem.js";
-import { ShadedGeometryFlags } from "../../ecs/mesh-v2/ShadedGeometryFlags.js";
 import { TransformAttachmentSystem } from "../../../ecs/transform-attachment/TransformAttachmentSystem.js";
+import { Transform } from "../../../ecs/transform/Transform.js";
+import { EngineHarness } from "../../../EngineHarness.js";
 import { BehaviorComponent } from "../../../intelligence/behavior/ecs/BehaviorComponent.js";
-import Vector3 from "../../../../core/geom/Vector3.js";
 import { BehaviorSystem } from "../../../intelligence/behavior/ecs/BehaviorSystem.js";
 import { RotationBehavior } from "../../../intelligence/behavior/util/RotationBehavior.js";
-import { DEG_TO_RAD } from "../../../../core/math/DEG_TO_RAD.js";
+import { SGMesh } from "../../ecs/mesh-v2/aggregate/SGMesh.js";
+import { SGMeshSystem } from "../../ecs/mesh-v2/aggregate/SGMeshSystem.js";
+import { ShadedGeometry } from "../../ecs/mesh-v2/ShadedGeometry.js";
+import { ShadedGeometryFlags } from "../../ecs/mesh-v2/ShadedGeometryFlags.js";
+import { ShadedGeometrySystem } from "../../ecs/mesh-v2/ShadedGeometrySystem.js";
+import { ImpostorBaker } from "./ImpostorBaker.js";
+import { ImpostorCaptureType } from "./ImpostorCaptureType.js";
+import { ImpostorShaderV0 } from "./shader/ImpostorShaderV0.js";
 import { ImpostorShaderWireframeV0 } from "./shader/ImpostorShaderWireframeV0.js";
-import { makeImpostorAtlasPreview } from "./util/makeImpostorAtlasPreview.js";
-import { load_mesh_for_bake } from "./util/load_mesh_for_bake.js";
 import { build_geometry_from_cutout_shape } from "./util/build_geometry_from_cutout_shape.js";
+import { load_mesh_for_bake } from "./util/load_mesh_for_bake.js";
+import { makeImpostorAtlasPreview } from "./util/makeImpostorAtlasPreview.js";
 
 /**
  *
@@ -80,7 +80,7 @@ async function main(engine) {
     });
 
     new Entity()
-        .add(new ViewportPosition({
+        .add(ViewportPosition.fromJSON({
             offset: new Vector2(0, 0)
         }))
         .add(GUIElement.fromView(ctrl))

package/src/engine/graphics/texture/sprite/prototypeSpriteCutoutGeometry.js

@@ -1,20 +1,20 @@
-import { EngineHarness } from "../../../EngineHarness.js";
-import GUIElementSystem from "../../../ecs/gui/GUIElementSystem.js";
-import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
+import { compute_polygon_area_2d } from "../../../../core/geom/2d/compute_polygon_area_2d.js";
+import { convex_hull_jarvis_2d } from "../../../../core/geom/2d/convex-hull/convex_hull_jarvis_2d.js";
+import { fixed_convex_hull_humus } from "../../../../core/geom/2d/convex-hull/fixed_convex_hull_humus.js";
+import Vector2 from "../../../../core/geom/Vector2.js";
+import { CanvasView } from "../../../../view/elements/CanvasView.js";
 import EmptyView from "../../../../view/elements/EmptyView.js";
+import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
 import Entity from "../../../ecs/Entity.js";
 import GUIElement from "../../../ecs/gui/GUIElement.js";
-import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
-import { CanvasView } from "../../../../view/elements/CanvasView.js";
-import sampler2D2Canvas from "../sampler/Sampler2D2Canvas.js";
+import GUIElementSystem from "../../../ecs/gui/GUIElementSystem.js";
 import ViewportPosition from "../../../ecs/gui/position/ViewportPosition.js";
-import Vector2 from "../../../../core/geom/Vector2.js";
-import { convex_hull_jarvis_2d } from "../../../../core/geom/2d/convex-hull/convex_hull_jarvis_2d.js";
+import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
+import { EngineHarness } from "../../../EngineHarness.js";
 import { Sampler2D } from "../sampler/Sampler2D.js";
-import { compute_polygon_area_2d } from "../../../../core/geom/2d/compute_polygon_area_2d.js";
-import { sampler2d_find_pixels } from "../sampler/search/sampler2d_find_pixels.js";
+import sampler2D2Canvas from "../sampler/Sampler2D2Canvas.js";
 import { make_edge_condition_channel_threshold } from "../sampler/search/make_edge_condition_channel_threshold.js";
-import { fixed_convex_hull_humus } from "../../../../core/geom/2d/convex-hull/fixed_convex_hull_humus.js";
+import { sampler2d_find_pixels } from "../sampler/search/sampler2d_find_pixels.js";
 
 const edge_condition_alpha0 = make_edge_condition_channel_threshold(3, 0);
 
@@ -195,7 +195,7 @@ async function main(engine) {
 
     new Entity()
         .add(GUIElement.fromView(vContainer))
-        .add(new ViewportPosition({
+        .add(ViewportPosition.fromJSON({
             offset: new Vector2(100, 100)
         }))
         .build(engine.entityManager.dataset);

package/src/engine/navigation/ecs/components/PathSerializationAdapter.js

@@ -1,5 +1,5 @@
-import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
+import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 import Path from "./Path.js";
 
 
@@ -54,8 +54,5 @@ export class PathSerializationAdapter extends BinaryClassSerializationAdapter {
 
             value.setPosition(i, x, y, z);
         }
-
-        // mark length for update
-        value.__length = -1;
     }
 }

package/src/core/binary/ValidatingBitSetWrapper.js

@@ -1,81 +0,0 @@
-//
-
-/**
- * Debug tool to verify correct behavior of a BitSet
- */
-export class ValidatingBitSetWrapper {
-    /**
-     *
-     * @param {BitSet} source
-     */
-    constructor(source) {
-        this.__source = source;
-    }
-
-    preventShrink() {
-        this.__source.preventShrink();
-    }
-
-    setShrinkFactor(x) {
-        this.__source.setShrinkFactor(x);
-    }
-
-    setCapacity(x) {
-        this.__source.setCapacity(x);
-    }
-
-    size() {
-        return this.__source.size();
-    }
-
-    capacity() {
-        return this.__source.capacity();
-    }
-
-    previousSetBit(i) {
-        const bit = this.__source.previousSetBit(i);
-
-        if (bit !== -1 && (this.__source.get(bit) !== true || bit > i)) {
-            debugger;
-        }
-
-        return bit;
-    }
-
-    nextSetBit(i) {
-        const bit = this.__source.nextSetBit(i);
-
-        if (bit !== -1 && (this.__source.get(bit) !== true || bit < i)) {
-            debugger;
-        }
-
-        return bit;
-    }
-
-    nextClearBit(i) {
-        const bit = this.__source.nextClearBit(i);
-
-        if (bit !== -1 && (this.__source.get(bit) !== false || bit < i)) {
-            debugger;
-        }
-
-        return bit;
-    }
-
-    set(x, y) {
-        this.__source.set(x, y);
-    }
-
-    clear(i) {
-        this.__source.clear(i);
-    }
-
-    get(i) {
-        return this.__source.get(i);
-    }
-
-
-    reset() {
-        this.__source.reset();
-    }
-}

package/src/core/binary/jsonToStringToByteArray.js

@@ -1,27 +0,0 @@
-import {stringifyStream} from "../json/JsonUtils.js";
-
-/**
- *
- * @param {Object} json
- * @returns {number[]}
- */
-function jsonToStringToByteArray(json) {
-    const output = [];
-    let p = 0;
-
-    function addToOutput(str) {
-        for (let i = 0; i < str.length; i++) {
-            let c = str.charCodeAt(i);
-            while (c > 0xff) {
-                output[p++] = c & 0xff;
-                c >>= 8;
-            }
-            output[p++] = c;
-        }
-    }
-
-    stringifyStream(json, addToOutput);
-    return output;
-}
-
-export {jsonToStringToByteArray};

package/src/engine/ecs/components/AreaOfEffect.js

@@ -1,12 +0,0 @@
-/**
- * Created by Alex on 11/08/2014.
- */
-
-
-function AreaOfEffect(options) {
-    this.tags = options.tags.slice();
-    this.radius = options.radius || new THREE.Vector3(1, 1, 1);
-    this.action = options.action || void 0;
-}
-
-export default AreaOfEffect;

package/src/engine/ecs/components/Mortality.js

@@ -1,27 +0,0 @@
-/**
- * User: Alex Goldring
- * Date: 17/6/2014
- * Time: 21:26
- */
-
-
-/**
- * @deprecated entirely superseded by the {@link BehaviorSystem}
- * @param actions
- * @constructor
- */
-function Mortality(actions) {
-    if (actions === void 0) {
-        actions = []
-    } else if (typeof actions === "function") {
-        actions = [actions];
-    }
-    this.actions = actions;
-}
-
-Mortality.typeName = "Mortality";
-
-Mortality.serializable = false;
-
-export default Mortality;
-

package/src/engine/ecs/systems/AreaOfEffectSystem.js

@@ -1,48 +0,0 @@
-/**
- * Created by Alex on 11/08/2014.
- */
-import { System } from '../System.js';
-import Tag from '../components/Tag.js';
-import { Transform } from '../transform/Transform.js';
-import AreaOfEffect from '../components/AreaOfEffect.js';
-
-
-class AreaOfEffectSystem extends System {
-    constructor() {
-        super();
-
-        this.dependencies = [AreaOfEffect];
-    }
-
-    add(component, entity) {
-    }
-
-    remove(component) {
-    }
-
-    update(timeDelta) {
-        const entityManager = this.entityManager;
-        entityManager.traverseEntities([AreaOfEffect, Transform], function (aoe, transform) {
-            const position = transform.position;
-            const tags = aoe.tags;
-            const radius = aoe.radius;
-            entityManager.traverseEntities([Tag, Transform], function (tag, transform2, entity) {
-                if (tags.indexOf(tag.name) === -1) {
-                    return; //not a tag we care about
-                }
-                const position2 = transform2.position;
-                //check range, doing one component at a time makes evaluation lazy, giving us a bit of speed
-                if (
-                    Math.abs(position2.x - position.x) < radius.x
-                    && Math.abs(position2.y - position.y) < radius.y
-                    && Math.abs(position2.z - position.z) < radius.z
-                ) {
-                    //within box
-                    aoe.action(entityManager, timeDelta, entity);
-                }
-            })
-        });
-    }
-}
-
-export default AreaOfEffectSystem;