@woosh/meep-engine 2.75.7 → 2.75.8

package/src/engine/ecs/storage/BinaryBufferSerializer.js

@@ -1,10 +1,10 @@
-import { SerializationFlags, SerializationMetadata } from "../components/SerializationMetadata.js";
 import { assert } from "../../../core/assert.js";
+import { current_time_in_seconds } from "../../../core/time/current_time_in_seconds.js";
+import { logger } from "../../logging/GlobalLogger.js";
+import { SerializationFlags, SerializationMetadata } from "../components/SerializationMetadata.js";
 import { BinaryCollectionSerializer } from "./binary/collection/BinaryCollectionSerializer.js";
-import { COMPONENT_SERIALIZATION_TRANSIENT_FIELD } from "./COMPONENT_SERIALIZATION_TRANSIENT_FIELD.js";
 import { BinaryObjectSerializationAdapter } from "./binary/object/BinaryObjectSerializationAdapter.js";
-import { logger } from "../../logging/GlobalLogger.js";
-import { current_time_in_seconds } from "../../../core/time/current_time_in_seconds.js";
+import { COMPONENT_SERIALIZATION_TRANSIENT_FIELD } from "./COMPONENT_SERIALIZATION_TRANSIENT_FIELD.js";
 
 /**
  * @template T
@@ -50,18 +50,17 @@ function isEntityTransient(entity, dataset, smComponentIndex, componentInstance)
 }
 
 class BinaryBufferSerializer {
-    constructor() {
-        /**
-         *
-         * @type {BinarySerializationRegistry}
-         */
-        this.registry = null;
-        /**
-         *
-         * @type {Engine|null}
-         */
-        this.engine = null;
-    }
+    /**
+     *
+     * @type {BinarySerializationRegistry}
+     */
+    registry = null;
+        
+    /**
+     *
+     * @type {Engine|null}
+     */
+    engine = null;
 
     /**
      *

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/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/graphics/render/RendererPool.js

@@ -1,48 +1,44 @@
 import { WebGLRenderer } from 'three';
 import { assert } from "../../../core/assert.js";
 
-function WebGLRendererPool() {
-    this.used = new Set();
-}
-
-WebGLRendererPool.prototype.get = function (options) {
-    const canvas = document.createElement('canvas');
-    const context = canvas.getContext('webgl2', { antialias: true });
-
-    const renderer = new WebGLRenderer({
-        alpha: true,
-        context,
-        canvas
-    });
-
-    assert.equal(renderer.domElement, canvas, 'renderer.domElement !== canvas');
-
-    this.used.add(renderer);
-    return renderer;
-};
-
-/**
- *
- * @param {THREE.WebGLRenderer} renderer
- * @returns {boolean}
- */
-WebGLRendererPool.prototype.release = function (renderer) {
-    if (!this.used.has(renderer)) {
-        //not from this pool
-        return false;
-    }
-    this.used.delete(renderer);
+export class WebGLRendererPool {
+
+    used = new Set();
 
-    renderer.forceContextLoss();
-    renderer.dispose();
-    renderer.domElement = null;
+    get(options) {
+        const canvas = document.createElement('canvas');
+        const context = canvas.getContext('webgl2', { antialias: true });
 
-    return true;
-};
+        const renderer = new WebGLRenderer({
+            alpha: true,
+            context,
+            canvas
+        });
 
-WebGLRendererPool.global = new WebGLRendererPool();
+        assert.equal(renderer.domElement, canvas, 'renderer.domElement !== canvas');
 
+        this.used.add(renderer);
+        return renderer;
+    }
+
+    /**
+     *
+     * @param {THREE.WebGLRenderer} renderer
+     * @returns {boolean}
+     */
+    release(renderer) {
+        if (!this.used.has(renderer)) {
+            //not from this pool
+            return false;
+        }
+        this.used.delete(renderer);
+
+        renderer.forceContextLoss();
+        renderer.dispose();
+        renderer.domElement = null;
+
+        return true;
+    }
 
-export {
-    WebGLRendererPool
-};
+    static global = new WebGLRendererPool();
+}

package/src/engine/graphics/render/buffer/FrameBuffer.js

@@ -1,7 +1,31 @@
-import Vector2 from "../../../../core/geom/Vector2.js";
 import { WebGLRenderTarget } from "three";
+import Vector2 from "../../../../core/geom/Vector2.js";
 
 export class FrameBuffer {
+    /**
+     * is expected to be bound during initialization
+     * @type {WebGLRenderTarget}
+     */
+    renderTarget = null;
+
+    /**
+     * Number of users of the frame buffer
+     * @type {number}
+     */
+    referenceCount = 0;
+
+    /**
+     * Dependency frame buffers
+     * @type {string[]}
+     */
+    dependencies = [];
+
+    /**
+     * Size of the frame buffer in pixels
+     * @type {Vector2}
+     */
+    size = new Vector2(0, 0);
+
     /**
      *
      * @param {string} id
@@ -14,29 +38,6 @@ export class FrameBuffer {
          */
         this.id = id;
 
-        /**
-         * is expected to be bound during initialization
-         * @type {WebGLRenderTarget}
-         */
-        this.renderTarget = null;
-
-        /**
-         * Number of users of the frame buffer
-         * @type {number}
-         */
-        this.referenceCount = 0;
-
-        /**
-         * Dependency frame buffers
-         * @type {string[]}
-         */
-        this.dependencies = [];
-
-        /**
-         * Size of the frame buffer in pixels
-         * @type {Vector2}
-         */
-        this.size = new Vector2(0, 0);
 
     }