@woosh/meep-engine 2.47.41 → 2.48.0

package/src/generation/filtering/numeric/process/computeCellFilterGradient.spec.js

@@ -3,12 +3,12 @@ import { computeCellFilterGradient } from "./computeCellFilterGradient.js";
 import { CellFilterCellMatcher } from "../../CellFilterCellMatcher.js";
 import { CellMatcherLayerBitMaskTest } from "../../../rules/CellMatcherLayerBitMaskTest.js";
 import { GridDataLayer } from "../../../grid/layers/GridDataLayer.js";
-import { DataType } from "../../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../../core/binary/type/BinaryDataType.js";
 
 test('computeCellFilterGradient center', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     grid.addLayer(layer);
     grid.resize(3, 3);
@@ -40,7 +40,7 @@ test('computeCellFilterGradient center', () => {
 test('computeCellFilterGradient top', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     grid.addLayer(layer);
     grid.resize(3, 3);
@@ -70,7 +70,7 @@ test('computeCellFilterGradient top', () => {
 test('computeCellFilterGradient bottom', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     grid.addLayer(layer);
     grid.resize(3, 3);
@@ -101,7 +101,7 @@ test('computeCellFilterGradient bottom', () => {
 test('computeCellFilterGradient left', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     grid.addLayer(layer);
     grid.resize(3, 3);
@@ -132,7 +132,7 @@ test('computeCellFilterGradient left', () => {
 test('computeCellFilterGradient right', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     grid.addLayer(layer);
     grid.resize(3, 3);
@@ -163,7 +163,7 @@ test('computeCellFilterGradient right', () => {
 test('computeCellFilterGradient top left', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
     grid.addLayer(layer);
     grid.resize(3, 3);
 
@@ -194,7 +194,7 @@ test('computeCellFilterGradient top left', () => {
 test('computeCellFilterGradient top right', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     grid.addLayer(layer);
     grid.resize(3, 3);
@@ -226,7 +226,7 @@ test('computeCellFilterGradient top right', () => {
 test('computeCellFilterGradient bottom left', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     grid.addLayer(layer);
     grid.resize(3, 3);
@@ -258,7 +258,7 @@ test('computeCellFilterGradient bottom left', () => {
 test('computeCellFilterGradient bottom right', () => {
 
     const grid = new GridData();
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     grid.addLayer(layer);
     grid.resize(3, 3);

package/src/generation/grid/layers/GridDataLayer.js

@@ -1,9 +1,9 @@
 import Vector2 from "../../../core/geom/Vector2.js";
 import { assert } from "../../../core/assert.js";
-import { DataType } from "../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../core/binary/type/BinaryDataType.js";
 import {
     DataType2TypedArrayConstructorMapping
-} from "../../../core/collection/table/DataType2TypedArrayConstructorMapping.js";
+} from "../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 
 export class GridDataLayer {
@@ -36,13 +36,13 @@ export class GridDataLayer {
     /**
      *
      * @param {string} id
-     * @param {DataType} type
+     * @param {BinaryDataType} type
      * @param {number} [resolution=1]
      * @returns {GridDataLayer}
      */
     static from(id, type, resolution = 1) {
         assert.typeOf(id, 'string', 'id');
-        assert.enum(type, DataType, 'type');
+        assert.enum(type, BinaryDataType, 'type');
         assert.isNumber(resolution, 'resolution');
 
         const TypedArrayConstructor = DataType2TypedArrayConstructorMapping[type];

package/src/generation/placement/action/GridCellActionPlaceTags.spec.js

@@ -1,12 +1,12 @@
 import { GridData } from "../../grid/GridData.js";
 import { GridCellActionPlaceTags } from "./GridCellActionPlaceTags.js";
 import { GridDataLayer } from "../../grid/layers/GridDataLayer.js";
-import { DataType } from "../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../core/binary/type/BinaryDataType.js";
 
 test('write a single 1x1 set of tags', () => {
     const data = new GridData();
 
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     data.addLayer(layer);
 

package/src/generation/rules/CellMatcherContainsTag.spec.js

@@ -1,12 +1,12 @@
 import { CellMatcherLayerBitMaskTest } from "./CellMatcherLayerBitMaskTest.js";
 import { GridData } from "../grid/GridData.js";
 import { GridDataLayer } from "../grid/layers/GridDataLayer.js";
-import { DataType } from "../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../core/binary/type/BinaryDataType.js";
 
 test('correct match of a single tag', () => {
     const data = new GridData();
 
-    const layer = GridDataLayer.from('a', DataType.Uint32);
+    const layer = GridDataLayer.from('a', BinaryDataType.Uint32);
     data.addLayer(layer)
     data.resize(1, 1);
 

package/src/generation/rules/cell/GridPatternMatcher.spec.js

@@ -2,7 +2,7 @@ import { CellMatcherGridPattern } from "./CellMatcherGridPattern.js";
 import { GridData } from "../../grid/GridData.js";
 import { CellMatcherLayerBitMaskTest } from "../CellMatcherLayerBitMaskTest.js";
 import { GridDataLayer } from "../../grid/layers/GridDataLayer.js";
-import { DataType } from "../../../core/collection/table/DataType.js";
+import { BinaryDataType } from "../../../core/binary/type/BinaryDataType.js";
 import { GridPatternMatcherCell } from "./GridPatternMatcherCell.js";
 import { CellMatcherNot } from "../logic/CellMatcherNot.js";
 
@@ -34,7 +34,7 @@ test('exact single point match', () => {
     pattern.addRule(0, 0, CellMatcherLayerBitMaskTest.from(1, 'a'));
 
     const data = new GridData();
-    const tagLayer = GridDataLayer.from('a', DataType.Uint32);
+    const tagLayer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     data.addLayer(tagLayer);
 
@@ -66,7 +66,7 @@ test('match 2-cell horizontal positive line with every rotation', () => {
     ]);
 
     const data = new GridData();
-    const tagLayer = GridDataLayer.from('a', DataType.Uint32);
+    const tagLayer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     data.addLayer(tagLayer);
 
@@ -102,7 +102,7 @@ test('match 2-cell horizontal negative line with every rotation', () => {
     ]);
 
     const data = new GridData();
-    const tagLayer = GridDataLayer.from('a', DataType.Uint32);
+    const tagLayer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     data.addLayer(tagLayer);
 
@@ -138,7 +138,7 @@ test('match 2-cell vertical positive line with every rotation', () => {
     ]);
 
     const data = new GridData();
-    const tagLayer = GridDataLayer.from('a', DataType.Uint32);
+    const tagLayer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     data.addLayer(tagLayer);
 
@@ -174,7 +174,7 @@ test('match 2-cell vertical negative line with every rotation', () => {
     ]);
 
     const data = new GridData();
-    const tagLayer = GridDataLayer.from('a', DataType.Uint32);
+    const tagLayer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     data.addLayer(tagLayer);
 
@@ -212,7 +212,7 @@ test('match 2x2-cell with every rotation', () => {
     ]);
 
     const data = new GridData();
-    const tagLayer = GridDataLayer.from('a', DataType.Uint32);
+    const tagLayer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     data.addLayer(tagLayer);
 
@@ -250,7 +250,7 @@ test('match 2x2-cell with every rotation on 4x4 field', () => {
     ]);
 
     const data = new GridData();
-    const tagLayer = GridDataLayer.from('a', DataType.Uint32);
+    const tagLayer = GridDataLayer.from('a', BinaryDataType.Uint32);
 
     data.addLayer(tagLayer);
 

package/src/view/elements/image/HTMLElementCacheKey.js

@@ -15,6 +15,37 @@ function computeStringPairHash(pair) {
     );
 }
 
+/**
+ *
+ * @param {KeyValuePair<string, string>} a
+ * @param {KeyValuePair<string, string>} b
+ * @returns
+ */
+function byKey(a, b) {
+    const a_key = a.key;
+    const b_key = b.key;
+
+    if (a_key === b_key) {
+        return 0;
+    }
+
+    const a_key_type = typeof a_key;
+    const b_key_type = typeof b_key;
+
+    const type_diff = a_key_type.localeCompare(b_key_type);
+
+    if (type_diff !== 0) {
+        return type_diff;
+    }
+
+    if (a_key_type !== "string") {
+        // unexpected types
+        return 0;
+    }
+
+    return a_key.localeCompare(b_key);
+}
+
 export class HTMLElementCacheKey {
 
     constructor() {
@@ -36,6 +67,84 @@ export class HTMLElementCacheKey {
          * @type {string}
          */
         this.tag = "";
+
+        /**
+         *
+         * @type {number}
+         * @private
+         */
+        this.__hash = -1;
+    }
+
+    /**
+     *
+     * @param {string} name
+     * @param {string} value
+     */
+    setAttribute(name, value) {
+
+        const existing = this.#getAttributeContainer(name);
+
+        if (existing !== undefined) {
+            if (existing.value === value) {
+                // no change
+                return;
+            }
+
+            existing.value = value;
+        } else {
+            this.attributes.push(new KeyValuePair(name, value));
+        }
+
+        this.update();
+    }
+
+    /**
+     *
+     * @param {string} name
+     * @returns {string|null}
+     */
+    getAttribute(name) {
+        const container = this.#getAttributeContainer(name);
+
+        if (container === undefined) {
+            return null;
+        }
+
+        return container.value;
+    }
+
+    /**
+     *
+     * @param {string} name
+     * @returns {undefined|KeyValuePair}
+     */
+    #getAttributeContainer(name) {
+        const attributes = this.attributes;
+
+        const attribute_count = attributes.length;
+        for (let i = 0; i < attribute_count; i++) {
+            const attribute = attributes[i];
+
+            if (attribute.key === name) {
+                return attribute;
+            }
+        }
+        // not found
+        return undefined;
+    }
+
+    /**
+     * Required for equality and hash to work consistently
+     */
+    #sort() {
+        this.attributes.sort(byKey);
+        this.style.sort(byKey);
+    }
+
+    update() {
+        this.#sort();
+        this.#updateHash();
     }
 
     toJSON() {
@@ -125,11 +234,11 @@ export class HTMLElementCacheKey {
 
         this.attributes.splice(i, this.attributes.length - i);
 
-        this.updateHash();
+        this.update();
     }
 
 
-    updateHash() {
+    #updateHash() {
         //compute style hash
         const styleHash = computeHashArray(this.style, computeStringPairHash);
 

package/src/view/elements/image/ImageView.js

@@ -90,7 +90,7 @@ class ImageView extends View {
             cacheKey.attributes.push(attribute);
         }
 
-        cacheKey.updateHash();
+        cacheKey.update();
 
 
         this.el = obtainImageElement(cacheKey);

package/src/view/elements/video/VideoView.js

@@ -98,7 +98,7 @@ export class VideoView extends View {
             cacheKey.attributes.push(attribute);
         }
 
-        cacheKey.updateHash();
+        cacheKey.update();
 
 
         this.el = obtainElement(cacheKey);

package/src/core/collection/table/DataType2TypedArrayConstructorMapping.js

@@ -1,34 +0,0 @@
-import { DataType } from "./DataType.js";
-
-
-/**
- * Mapping from {@DataType} to TypedArray constructors
- * @enum {function}
- */
-export const DataType2TypedArrayConstructorMapping = {
-    [DataType.Uint8]: Uint8Array,
-    [DataType.Uint16]: Uint16Array,
-    [DataType.Uint32]: Uint32Array,
-    [DataType.Int8]: Int8Array,
-    [DataType.Int16]: Int16Array,
-    [DataType.Int32]: Int32Array,
-    // No float16 array type, using uint16 as a backing instead
-    [DataType.Float16]: Uint16Array,
-    [DataType.Float32]: Float32Array,
-    [DataType.Float64]: Float64Array,
-};
-
-/**
- *
- * @param {DataType} dt
- * @returns {constructor|function}
- */
-export function compute_typed_array_constructor_from_data_type(dt) {
-    const r = DataType2TypedArrayConstructorMapping[dt];
-
-    if (r === undefined) {
-        throw new Error(`Unsupported data type '${dt}'`);
-    }
-
-    return r;
-}

package/src/core/collection/table/DataTypeByteSizes.js

@@ -1,37 +0,0 @@
-import { DataType } from "./DataType.js";
-
-/**
- * @readonly
- * @enum {number}
- */
-export const DataTypeByteSizes = {
-    [DataType.Uint8]: 1,
-    [DataType.Uint16]: 2,
-    [DataType.Uint32]: 4,
-    [DataType.Uint64]: 8,
-
-    [DataType.Int8]: 1,
-    [DataType.Int16]: 2,
-    [DataType.Int32]: 4,
-    [DataType.Int64]: 8,
-
-    [DataType.Float16]: 2,
-    [DataType.Float32]: 4,
-    [DataType.Float64]: 8
-};
-
-
-/**
- *
- * @param {DataType} type
- * @return {number}
- */
-export function dataTypeByteSize(type) {
-    const size = DataTypeByteSizes[type];
-
-    if (size === undefined) {
-        throw new Error(`Unsupported type '${type}'`);
-    }
-
-    return size;
-}

package/src/core/collection/table/DataTypeIndices.js

@@ -1,17 +0,0 @@
-import { DataType } from "./DataType.js";
-
-/***
- *
- * @enum {number}
- */
-export const DataTypeIndices = {
-    [DataType.Uint8]: 0,
-    [DataType.Uint16]: 1,
-    [DataType.Uint32]: 2,
-    [DataType.Int8]: 3,
-    [DataType.Int16]: 4,
-    [DataType.Int32]: 5,
-    [DataType.Float32]: 6,
-    [DataType.Float64]: 7,
-    [DataType.Float16]: 8
-};