@woosh/meep-engine 2.75.7 → 2.75.9

package/src/engine/ecs/storage/binary/BinaryClassUpgrader.js

@@ -1,66 +1,17 @@
-import { assert } from "../../../../core/assert.js";
-
-/**
- * Upgrade binary data by executing a sequnece of upgraders on it
- * @param {BinaryClassUpgrader[]} upgraders
- * @param {BinaryBuffer} buffer
- * @param {BinaryBuffer} tempBuffer0
- * @param {BinaryBuffer} tempBuffer1
- * @return {BinaryBuffer} new buffer with upgraded data
- */
-export function executeBinaryClassUpgraderChain(upgraders, buffer, tempBuffer0, tempBuffer1) {
-    assert.ok(Array.isArray(upgraders), 'upgraders must be an array, instead was something else');
-    assert.defined(buffer);
-    assert.defined(tempBuffer0);
-    assert.defined(tempBuffer1);
-
+export class BinaryClassUpgrader {
 
     /**
      *
-     * @type {BinaryBuffer[]}
+     * @type {number}
+     * @protected
      */
-    const tempBuffers = [tempBuffer0, tempBuffer1];
-
-    let sourceBuffer = buffer;
-    let targetBuffer = tempBuffer0;
-
-    const upgraderCount = upgraders.length;
-
-    //perform upgrade
-    for (
-        let i = 0;
-        i < upgraderCount;
-        i++, sourceBuffer = targetBuffer, targetBuffer = tempBuffers[i % 2]
-    ) {
-        const upgrader = upgraders[i];
-
-        targetBuffer.position = 0;
-
-        upgrader.upgrade(sourceBuffer, targetBuffer);
-
-        //rewind target buffer so it can be read
-        targetBuffer.position = 0;
-    }
-
-    return sourceBuffer;
-}
-
-export class BinaryClassUpgrader {
-    constructor() {
-        /**
-         *
-         * @type {number}
-         * @protected
-         */
-        this.__startVersion = 0;
-        /**
-         *
-         * @type {number}
-         * @protected
-         */
-        this.__targetVersion = 0;
-    }
-
+    __startVersion = 0;
+    /**
+     *
+     * @type {number}
+     * @protected
+     */
+    __targetVersion = 0;
 
     /**
      *

package/src/engine/ecs/storage/binary/BinarySerializationRegistry.js

@@ -1,24 +1,23 @@
-import { Graph } from "../../../../core/graph/Graph.js";
 import { assert } from "../../../../core/assert.js";
+import { Graph } from "../../../../core/graph/Graph.js";
 
 /**
  * Contains serializers for various data types as well as data upgraders which enable support for serialization format changes
  */
 export class BinarySerializationRegistry {
-    constructor() {
-        /**
-         * @readonly
-         * @private
-         * @type {Map<string, Graph<BinaryClassUpgrader>>}
-         */
-        this.upgraders = new Map();
-        /**
-         * @readonly
-         * @private
-         * @type {Map<string, BinaryClassSerializationAdapter>}
-         */
-        this.serializers = new Map();
-    }
+
+    /**
+     * @readonly
+     * @private
+     * @type {Map<string, Graph<BinaryClassUpgrader>>}
+     */
+    upgraders = new Map();
+    /**
+     * @readonly
+     * @private
+     * @type {Map<string, BinaryClassSerializationAdapter>}
+     */
+    serializers = new Map();
 
     /**
      *

package/src/engine/ecs/storage/binary/collection/BinaryCollectionDeSerializer.js

@@ -1,10 +1,10 @@
-import { BinaryBuffer } from "../../../../../core/binary/BinaryBuffer.js";
-import { BinaryCollectionHeaderCodec, BinaryCollectionHeaderLayout } from "./BinaryCollectionHeaderCodec.js";
 import { assert } from "../../../../../core/assert.js";
+import { BinaryBuffer } from "../../../../../core/binary/BinaryBuffer.js";
 import { IllegalStateException } from "../../../../../core/fsm/exceptions/IllegalStateException.js";
-import { executeBinaryClassUpgraderChain } from "../BinaryClassUpgrader.js";
 import { returnEmptyArray } from "../../../../../core/function/Functions.js";
 import { objectKeyByValue } from "../../../../../core/model/object/objectKeyByValue.js";
+import { executeBinaryClassUpgraderChain } from "../executeBinaryClassUpgraderChain.js";
+import { BinaryCollectionHeaderCodec, BinaryCollectionHeaderLayout } from "./BinaryCollectionHeaderCodec.js";
 
 /**
  *

package/src/engine/ecs/storage/binary/collection/BinaryCollectionSerializer.js

@@ -1,70 +1,68 @@
 import { assert } from "../../../../../core/assert.js";
-import { BinaryCollectionHeaderCodec, BinaryCollectionHeaderLayout } from "./BinaryCollectionHeaderCodec.js";
 import { HashMap } from "../../../../../core/collection/map/HashMap.js";
 import { returnEmptyArray } from "../../../../../core/function/Functions.js";
+import { BinaryCollectionHeaderCodec, BinaryCollectionHeaderLayout } from "./BinaryCollectionHeaderCodec.js";
 
 export class BinaryCollectionSerializer {
-    constructor() {
-
-        /**
-         * @private
-         * @type {BinarySerializationRegistry}
-         */
-        this.registry = null;
-
-        /**
-         * @private
-         * @type {BinaryBuffer}
-         */
-        this.buffer = null;
-
-        /**
-         * @private
-         * @type {BinaryClassSerializationAdapter}
-         */
-        this.adapter = null;
-
-
-        /**
-         *
-         * @type {String}
-         */
-        this.className = null;
-
-        /**
-         *
-         * @type {boolean}
-         * @private
-         */
-        this.__dictionaryEnabled = false;
-
-        /**
-         * @private
-         * @type {number}
-         */
-        this.elementCount = 0;
 
+    /**
+     * @private
+     * @type {BinarySerializationRegistry}
+     */
+    registry = null;
 
-        /**
-         * @private
-         * @type {number}
-         */
-        this.startAddress = 0;
-
-        /**
-         * @private
-         * @type {number}
-         */
-        this.headerAddress = 0;
-
-        /**
-         * @private
-         * @type {Map<any, number>}
-         */
-        this.dictionary = new HashMap({
-            capacity: 1024, //pre-allocate larger size to avoid rehashing
-        });
-    }
+    /**
+     * @private
+     * @type {BinaryBuffer}
+     */
+    buffer = null;
+
+    /**
+     * @private
+     * @type {BinaryClassSerializationAdapter}
+     */
+    adapter = null;
+
+
+    /**
+     *
+     * @type {String}
+     */
+    className = null;
+
+    /**
+     *
+     * @type {boolean}
+     * @private
+     */
+    __dictionaryEnabled = false;
+
+    /**
+     * @private
+     * @type {number}
+     */
+    elementCount = 0;
+
+
+    /**
+     * @private
+     * @type {number}
+     */
+    startAddress = 0;
+
+    /**
+     * @private
+     * @type {number}
+     */
+    headerAddress = 0;
+
+    /**
+     * @private
+     * @type {Map<any, number>}
+     */
+    dictionary = new HashMap({
+        capacity: 1024, //pre-allocate larger size to avoid rehashing
+    });
 
     /**
      *
@@ -115,10 +113,10 @@ export class BinaryCollectionSerializer {
      */
     initialize({
                    adapterOptionsSupplier = returnEmptyArray,
-        problemConsumer = console.warn
+                   problemConsumer = console.warn
                } = {}) {
 
-        assert.isFunction(adapterOptionsSupplier,  'adapterOptionsSupplier');
+        assert.isFunction(adapterOptionsSupplier, 'adapterOptionsSupplier');
 
         const className = this.className;
 

package/src/engine/ecs/storage/binary/executeBinaryClassUpgraderChain.js

@@ -0,0 +1,46 @@
+import { assert } from "../../../../core/assert.js";
+
+/**
+ * Upgrade binary data by executing a sequnece of upgraders on it
+ * @param {BinaryClassUpgrader[]} upgraders
+ * @param {BinaryBuffer} buffer
+ * @param {BinaryBuffer} tempBuffer0
+ * @param {BinaryBuffer} tempBuffer1
+ * @return {BinaryBuffer} new buffer with upgraded data
+ */
+export function executeBinaryClassUpgraderChain(upgraders, buffer, tempBuffer0, tempBuffer1) {
+    assert.ok(Array.isArray(upgraders), 'upgraders must be an array, instead was something else');
+    assert.defined(buffer);
+    assert.defined(tempBuffer0);
+    assert.defined(tempBuffer1);
+
+
+    /**
+     *
+     * @type {BinaryBuffer[]}
+     */
+    const tempBuffers = [tempBuffer0, tempBuffer1];
+
+    let sourceBuffer = buffer;
+    let targetBuffer = tempBuffer0;
+
+    const upgraderCount = upgraders.length;
+
+    //perform upgrade
+    for (
+        let i = 0;
+        i < upgraderCount;
+        i++, sourceBuffer = targetBuffer, targetBuffer = tempBuffers[i % 2]
+    ) {
+        const upgrader = upgraders[i];
+
+        targetBuffer.position = 0;
+
+        upgrader.upgrade(sourceBuffer, targetBuffer);
+
+        //rewind target buffer so it can be read
+        targetBuffer.position = 0;
+    }
+
+    return sourceBuffer;
+}

package/src/engine/ecs/storage/binary/object/BinaryObjectSerializationAdapter.js

@@ -1,6 +1,6 @@
-import { BinaryBuffer } from "../../../../../core/binary/BinaryBuffer.js";
-import { executeBinaryClassUpgraderChain } from "../BinaryClassUpgrader.js";
 import { assert } from "../../../../../core/assert.js";
+import { BinaryBuffer } from "../../../../../core/binary/BinaryBuffer.js";
+import { executeBinaryClassUpgraderChain } from "../executeBinaryClassUpgraderChain.js";
 
 /**
  * Tool for serializing and deserializing whole objects

package/src/engine/ecs/system/SystemEntityContext.js

@@ -1,27 +1,29 @@
 export class SystemEntityContext {
-    constructor() {
-
-        this.entity = -1;
-
-        /**
-         * Pointer back to the system
-         * @type {System}
-         */
-        this.system = null;
-
-        /**
-         *
-         * @type {*[]}
-         */
-        this.components = [];
-
-        /**
-         *
-         * @type {boolean}
-         * @protected
-         */
-        this.__is_linked = false;
-    }
+
+    /**
+     *
+     * @type {number}
+     */
+    entity = -1;
+
+    /**
+     * Pointer back to the system
+     * @type {System}
+     */
+    system = null;
+
+    /**
+     *
+     * @type {*[]}
+     */
+    components = [];
+
+    /**
+     *
+     * @type {boolean}
+     * @protected
+     */
+    __is_linked = false;
 
     /**
      *

package/src/engine/ecs/tag/find_entities_with_tag.js

@@ -0,0 +1,18 @@
+import Tag from "../components/Tag.js";
+
+/**
+ *
+ * @param {string} tag
+ * @param {EntityComponentDataset} ecd
+ * @returns  {number[]}
+ */
+export function find_entities_with_tag(tag, ecd) {
+    const r = [];
+    ecd.traverseComponents(Tag, (t, e) => {
+        if (t.contains(tag)) {
+            r.push(e);
+        }
+    });
+
+    return r;
+}

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

@@ -3,8 +3,8 @@
  */
 
 
-import Vector2 from '../../../core/geom/Vector2.js';
 import { RepeatWrapping, TextureLoader } from "three";
+import Vector2 from '../../../core/geom/Vector2.js';
 
 const texture_cache = new Map();
 
@@ -33,31 +33,30 @@ function loadCloudTexture(url) {
 
 
 class Clouds {
-    constructor() {
-        /**
-         *
-         * @type {boolean}
-         * @private
-         */
-        this.__enabled = false;
-        /**
-         *
-         * @type {Array}
-         * @private
-         */
-        this.materials = [];
-        this.time = 0;
-
-
-        this.__speed0 = new Vector2();
-        this.__speed1 = new Vector2();
-        this.__speed2 = new Vector2();
-
-        //how fast clouds reform
-        this.variability = 0.37;
+    /**
+     *
+     * @type {boolean}
+     * @private
+     */
+    __enabled = false;
+    /**
+     *
+     * @type {Array}
+     * @private
+     */
+    materials = [];
+    time = 0;
 
-        this.setSpeed(0.5, -0.5);
 
+    __speed0 = new Vector2();
+    __speed1 = new Vector2();
+    __speed2 = new Vector2();
+
+    //how fast clouds reform
+    variability = 0.37;
+
+    constructor() {
+        this.setSpeed(0.5, -0.5);
     }
 
     /**

package/src/engine/ecs/terrain/ecs/layers/TerrainLayer.js

@@ -1,11 +1,11 @@
-import Vector2 from "../../../../../core/geom/Vector2.js";
-import { GameAssetType } from "../../../../asset/GameAssetType.js";
-import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
 import { Cache } from "../../../../../core/cache/Cache.js";
 import Signal from "../../../../../core/events/signal/Signal.js";
+import Vector2 from "../../../../../core/geom/Vector2.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
-import { copy_Sampler2D_channel_data } from "../../../../graphics/texture/sampler/copy_Sampler2D_channel_data.js";
 import { string_compute_byte_size } from "../../../../../core/primitives/strings/string_compute_byte_size.js";
+import { GameAssetType } from "../../../../asset/GameAssetType.js";
+import { copy_Sampler2D_channel_data } from "../../../../graphics/texture/sampler/copy_Sampler2D_channel_data.js";
+import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
 
 /**
  *
@@ -26,37 +26,37 @@ const cache = new Cache({
 });
 
 export class TerrainLayer {
-    constructor() {
-        /**
-         *
-         * @type {String}
-         */
-        this.textureDiffuseURL = "";
 
-        /**
-         *
-         * @type {Sampler2D}
-         */
-        this.diffuse = Sampler2D.uint8(3, 1, 1);
+    /**
+     *
+     * @type {String}
+     */
+    textureDiffuseURL = "";
 
-        /**
-         *
-         * @type {Vector2}
-         */
-        this.size = new Vector2(1, 1);
+    /**
+     *
+     * @type {Sampler2D}
+     */
+    diffuse = Sampler2D.uint8(3, 1, 1);
 
-        /**
-         * Additional free-form JSON metadata
-         * @type {Object}
-         */
-        this.extra = {};
+    /**
+     *
+     * @type {Vector2}
+     */
+    size = new Vector2(1, 1);
+
+    /**
+     * Additional free-form JSON metadata
+     * @type {Object}
+     */
+    extra = {};
+
+    /**
+     *
+     * @type {Signal}
+     */
+    onChanged = new Signal();
 
-        /**
-         *
-         * @type {Signal}
-         */
-        this.onChanged = new Signal();
-    }
 
     toJSON() {
         return {
@@ -163,3 +163,9 @@ export class TerrainLayer {
             });
     }
 }
+
+/**
+ * @readonly
+ * @type {boolean}
+ */
+TerrainLayer.prototype.isTerrainLayer = true;

package/src/engine/ecs/terrain/ecs/layers/TerrainLayers.js

@@ -13,16 +13,16 @@ import {
     UnsignedByteType
 } from "three";
 import { assert } from "../../../../../core/assert.js";
-import Vector2 from "../../../../../core/geom/Vector2.js";
-import { TerrainLayer } from "./TerrainLayer.js";
-import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
-import { sampler2d_scale } from "../../../../graphics/texture/sampler/resize/sampler2d_scale.js";
-import List from "../../../../../core/collection/list/List.js";
 import { Cache } from "../../../../../core/cache/Cache.js";
-import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
+import { typed_array_copy } from "../../../../../core/collection/array/typed/typed_array_copy.js";
+import List from "../../../../../core/collection/list/List.js";
+import Vector2 from "../../../../../core/geom/Vector2.js";
 import { invokeObjectEquals } from "../../../../../core/model/object/invokeObjectEquals.js";
 import { invokeObjectHash } from "../../../../../core/model/object/invokeObjectHash.js";
-import { typed_array_copy } from "../../../../../core/collection/array/typed/typed_array_copy.js";
+import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
+import { sampler2d_scale } from "../../../../graphics/texture/sampler/resize/sampler2d_scale.js";
+import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
+import { TerrainLayer } from "./TerrainLayer.js";
 
 class ScaledTextureKey {
     uri = '';
@@ -278,6 +278,7 @@ export class TerrainLayers {
      */
     addLayer(layer) {
         assert.defined(layer);
+        assert.equal(layer.isTerrainLayer, true, 'layer.isTerrainLayer !== true');
 
         const index = this.layers.length;
 

package/src/engine/ecs/terrain/ecs/splat/SplatMapMaterialPatch.js

@@ -3,6 +3,9 @@ import AABB2 from "../../../../../core/geom/AABB2.js";
 import { max2 } from "../../../../../core/math/max2.js";
 import { min2 } from "../../../../../core/math/min2.js";
 import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
+import {
+    sampler2d_sub_copy_same_item_size
+} from "../../../../graphics/texture/sampler/sampler2d_sub_copy_same_item_size.js";
 
 export class SplatMapMaterialPatch {
     /**
@@ -413,8 +416,8 @@ export class SplatMapMaterialPatch {
             const target = new Sampler2D(newWeights, 1, nW, nH);
 
             //copy both sources to the new weights target
-            target.copy_sameItemSize(t_Source, 0, 0, nBB_x0 - t_bb.x0, nBB_y0 - t_bb.y0, t_bb.getHeight(), t_bb.getHeight());
-            target.copy_sameItemSize(o_Source, 0, 0, nBB_x0 - o_bb.x0, nBB_y0 - o_bb.y0, o_bb.getHeight(), o_bb.getHeight());
+            sampler2d_sub_copy_same_item_size(target,t_Source, 0, 0, nBB_x0 - t_bb.x0, nBB_y0 - t_bb.y0, t_bb.getHeight(), t_bb.getHeight());
+            sampler2d_sub_copy_same_item_size(target,o_Source, 0, 0, nBB_x0 - o_bb.x0, nBB_y0 - o_bb.y0, o_bb.getHeight(), o_bb.getHeight());
 
             this.weights = newWeights;
         }

package/src/engine/ecs/terrain/overlay/TerrainOverlay.js

@@ -3,19 +3,20 @@
  */
 
 
-import Vector4 from '../../../../core/geom/Vector4.js';
-import canvas2Sampler2D from "../../../graphics/texture/Canvas2Sampler2D.js";
-import Vector2 from "../../../../core/geom/Vector2.js";
-import Vector1 from "../../../../core/geom/Vector1.js";
-import { assert } from "../../../../core/assert.js";
-import ObservedString from "../../../../core/model/ObservedString.js";
 import { ClampToEdgeWrapping, DataTexture, NearestFilter } from "three";
-import { Sampler2D } from "../../../graphics/texture/sampler/Sampler2D.js";
-import { sampler2d_scale } from "../../../graphics/texture/sampler/resize/sampler2d_scale.js";
-import { uint82float } from "../../../../core/binary/uint82float.js";
+import { assert } from "../../../../core/assert.js";
 import { float2uint8 } from "../../../../core/binary/float2uint8.js";
-import { isTypedArray } from "../../../../core/collection/array/typed/isTypedArray.js";
+import { uint82float } from "../../../../core/binary/uint82float.js";
 import { array_copy } from "../../../../core/collection/array/array_copy.js";
+import { isTypedArray } from "../../../../core/collection/array/typed/isTypedArray.js";
+import Vector1 from "../../../../core/geom/Vector1.js";
+import Vector2 from "../../../../core/geom/Vector2.js";
+import Vector4 from '../../../../core/geom/Vector4.js';
+import ObservedString from "../../../../core/model/ObservedString.js";
+import canvas2Sampler2D from "../../../graphics/texture/Canvas2Sampler2D.js";
+import { sampler2d_scale } from "../../../graphics/texture/sampler/resize/sampler2d_scale.js";
+import { Sampler2D } from "../../../graphics/texture/sampler/Sampler2D.js";
+import { sampler2d_paint } from "../../../graphics/texture/sampler/sampler2d_paint.js";
 import { WHITE_PIXEL_DATA_URL } from "../../../graphics/WHITE_PIXEL_DATA_URL.js";
 
 class Context {
@@ -69,7 +70,7 @@ export class TerrainOverlay {
          */
         this.size = new Vector2(size.x, size.y);
 
-       /**
+        /**
          *
          * @type {ObservedString}
          */
@@ -120,7 +121,7 @@ export class TerrainOverlay {
      *
      * @returns {string}
      */
-    get baseTileImage(){
+    get baseTileImage() {
         return this.stack.length === 0 ? this.tileImage.getValue() : this.stack[0].tileImage
     }
 
@@ -128,7 +129,7 @@ export class TerrainOverlay {
      *
      * @param {string} v
      */
-    set baseTileImage(v){
+    set baseTileImage(v) {
         if (this.stack.length === 0) {
             this.tileImage.set(v);
         } else {
@@ -316,7 +317,7 @@ export class TerrainOverlay {
         const scaled_source = Sampler2D.uint8(4, dWidth, dHeight);
         sampler2d_scale(source, scaled_source);
 
-        this.sampler.paint(scaled_source, 0, 0, dx, dy, dWidth, dHeight);
+        sampler2d_paint(this, scaled_source, 0, 0, dx, dy, dWidth, dHeight);
 
         this.texture.needsUpdate = true;
     }