@woosh/meep-engine 2.111.7 → 2.111.9

package/build/meep.module.js

@@ -25,8 +25,9 @@ function isArrayEqualStrict(a, b) {
 }
 
 /**
- *
- * @param o
+ * Checks whether supplied argument is a TypedArray instance, such as Flaot32Array
+ * @template T
+ * @param {T} o
  * @returns {boolean}
  */
 function isTypedArray(o) {
@@ -48926,6 +48927,40 @@ function compute_typed_array_constructor_from_data_type(dt) {
     return r;
 }
 
+/**
+ *
+ * @param {*} array
+ * @returns {BinaryDataType}
+ */
+function compute_binary_data_type_from_typed_array(array) {
+
+    const ctor = Object.getPrototypeOf(array).constructor;
+
+    switch (ctor) {
+        case Uint8Array:
+        case Uint8ClampedArray:
+            return BinaryDataType.Uint8;
+        case Uint16Array:
+            return BinaryDataType.Uint16;
+        case Uint32Array:
+            return BinaryDataType.Uint32;
+
+        case Int8Array:
+            return BinaryDataType.Int8;
+        case Int16Array:
+            return BinaryDataType.Int16;
+        case Int32Array:
+            return BinaryDataType.Int32;
+
+        case Float32Array:
+            return BinaryDataType.Float32;
+        case Float64Array:
+            return BinaryDataType.Float64;
+        default:
+            throw new Error(`unsupported constructor type ${ctor.name}`);
+    }
+}
+
 //
 
 /**
@@ -49000,39 +49035,6 @@ function is_typed_array_equals(a, b) {
     return isArrayEqualStrict(a_proxy, b_proxy);
 }
 
-/**
- *
- * @param {*} v
- * @returns {BinaryDataType}
- */
-function typedArrayToDataType(v) {
-    const ctor = Object.getPrototypeOf(v).constructor;
-
-    switch (ctor) {
-        case Uint8Array:
-        case Uint8ClampedArray:
-            return BinaryDataType.Uint8;
-        case Uint16Array:
-            return BinaryDataType.Uint16;
-        case Uint32Array:
-            return BinaryDataType.Uint32;
-
-        case Int8Array:
-            return BinaryDataType.Int8;
-        case Int16Array:
-            return BinaryDataType.Int16;
-        case Int32Array:
-            return BinaryDataType.Int32;
-
-        case Float32Array:
-            return BinaryDataType.Float32;
-        case Float64Array:
-            return BinaryDataType.Float64;
-        default:
-            throw new Error('unsupported constructor type');
-    }
-}
-
 /**
  * Based on code from reddit https://www.reddit.com/r/javascript/comments/jxa8x/bicubic_interpolation/
  * @param {number} t ratio
@@ -49999,7 +50001,7 @@ class Sampler2D {
             height: this.height,
             width: this.width,
             itemSize: this.itemSize,
-            type: typedArrayToDataType(this.data),
+            type: compute_binary_data_type_from_typed_array(this.data),
             data: encoded
         }
     }
@@ -59791,19 +59793,19 @@ function array_swap_one(array, index0, index1) {
 
 /**
  *
- * @param {number} count
- * @returns {function}
+ * @param {number} max_value maximum value to be contained in the array
+ * @returns {function} constructor
  */
-function UintArrayForCount(count) {
+function UintArrayForCount(max_value) {
 
-    if (count <= 256) {
+    if (max_value <= 256) {
         return Uint8Array;
-    } else if (count <= 65536) {
+    } else if (max_value <= 65536) {
         return Uint16Array;
-    } else if (count <= 4294967295) {
+    } else if (max_value <= 4294967295) {
         return Uint32Array;
     } else {
-        throw new Error(`Unsupported size ${count}`)
+        throw new Error(`Unsupported size ${max_value}`)
     }
 }
 

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.111.7",
+  "version": "2.111.9",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/collection/array/typed/compute_binary_data_type_from_typed_array.d.ts

@@ -0,0 +1,8 @@
+/**
+ *
+ * @param {*} array
+ * @returns {BinaryDataType}
+ */
+export function compute_binary_data_type_from_typed_array(array: any): BinaryDataType;
+import { BinaryDataType } from "../../../binary/type/BinaryDataType.js";
+//# sourceMappingURL=compute_binary_data_type_from_typed_array.d.ts.map

package/src/core/collection/array/typed/compute_binary_data_type_from_typed_array.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compute_binary_data_type_from_typed_array.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/typed/compute_binary_data_type_from_typed_array.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,uEAFa,cAAc,CAgC1B;+BArC8B,wCAAwC"}

package/src/core/collection/array/typed/compute_binary_data_type_from_typed_array.js

@@ -0,0 +1,39 @@
+import { assert } from "../../../assert.js";
+import { BinaryDataType } from "../../../binary/type/BinaryDataType.js";
+
+/**
+ *
+ * @param {*} array
+ * @returns {BinaryDataType}
+ */
+export function compute_binary_data_type_from_typed_array(array) {
+    assert.notNull(array, 'array');
+    assert.isObject(array, 'array');
+    assert.isArrayLike(array, 'array');
+
+    const ctor = Object.getPrototypeOf(array).constructor;
+
+    switch (ctor) {
+        case Uint8Array:
+        case Uint8ClampedArray:
+            return BinaryDataType.Uint8;
+        case Uint16Array:
+            return BinaryDataType.Uint16;
+        case Uint32Array:
+            return BinaryDataType.Uint32;
+
+        case Int8Array:
+            return BinaryDataType.Int8;
+        case Int16Array:
+            return BinaryDataType.Int16;
+        case Int32Array:
+            return BinaryDataType.Int32;
+
+        case Float32Array:
+            return BinaryDataType.Float32;
+        case Float64Array:
+            return BinaryDataType.Float64;
+        default:
+            throw new Error(`unsupported constructor type ${ctor.name}`);
+    }
+}

package/src/core/collection/array/typed/isTypedArray.d.ts

@@ -1,7 +1,8 @@
 /**
- *
- * @param o
+ * Checks whether supplied argument is a TypedArray instance, such as Flaot32Array
+ * @template T
+ * @param {T} o
  * @returns {boolean}
  */
-export function isTypedArray(o: any): boolean;
+export function isTypedArray<T>(o: T): boolean;
 //# sourceMappingURL=isTypedArray.d.ts.map

package/src/core/collection/array/typed/isTypedArray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isTypedArray.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/typed/isTypedArray.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,sCAFa,OAAO,CAcnB"}
+{"version":3,"file":"isTypedArray.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/typed/isTypedArray.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,uCAFa,OAAO,CAcnB"}

package/src/core/collection/array/typed/isTypedArray.js

@@ -1,9 +1,10 @@
 /**
- *
- * @param o
+ * Checks whether supplied argument is a TypedArray instance, such as Flaot32Array
+ * @template T
+ * @param {T} o
  * @returns {boolean}
  */
-function isTypedArray(o) {
+export function isTypedArray(o) {
     return (
         o instanceof Int8Array ||
         o instanceof Uint8Array ||
@@ -16,5 +17,3 @@ function isTypedArray(o) {
         o instanceof Float64Array
     );
 }
-
-export { isTypedArray };

package/src/core/collection/array/typed/typedArrayToDataType.d.ts

@@ -1,8 +1,6 @@
 /**
- *
- * @param {*} v
- * @returns {BinaryDataType}
+ * @deprecated renamed to {@link compute_binary_data_type_from_typed_array}
  */
-export function typedArrayToDataType(v: any): BinaryDataType;
-import { BinaryDataType } from "../../../binary/type/BinaryDataType.js";
+export const typedArrayToDataType: typeof compute_binary_data_type_from_typed_array;
+import { compute_binary_data_type_from_typed_array } from "./compute_binary_data_type_from_typed_array.js";
 //# sourceMappingURL=typedArrayToDataType.d.ts.map

package/src/core/collection/array/typed/typedArrayToDataType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typedArrayToDataType.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/typed/typedArrayToDataType.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,8CAFa,cAAc,CA4B1B;+BAjC8B,wCAAwC"}
+{"version":3,"file":"typedArrayToDataType.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/typed/typedArrayToDataType.js"],"names":[],"mappings":"AAEA;;GAEG;AACH,oFAA6E;0DALnB,gDAAgD"}

package/src/core/collection/array/typed/typedArrayToDataType.js

@@ -1,34 +1,6 @@
-import { BinaryDataType } from "../../../binary/type/BinaryDataType.js";
+import { compute_binary_data_type_from_typed_array } from "./compute_binary_data_type_from_typed_array.js";
 
 /**
- *
- * @param {*} v
- * @returns {BinaryDataType}
+ * @deprecated renamed to {@link compute_binary_data_type_from_typed_array}
  */
-export function typedArrayToDataType(v) {
-    const ctor = Object.getPrototypeOf(v).constructor;
-
-    switch (ctor) {
-        case Uint8Array:
-        case Uint8ClampedArray:
-            return BinaryDataType.Uint8;
-        case Uint16Array:
-            return BinaryDataType.Uint16;
-        case Uint32Array:
-            return BinaryDataType.Uint32;
-
-        case Int8Array:
-            return BinaryDataType.Int8;
-        case Int16Array:
-            return BinaryDataType.Int16;
-        case Int32Array:
-            return BinaryDataType.Int32;
-
-        case Float32Array:
-            return BinaryDataType.Float32;
-        case Float64Array:
-            return BinaryDataType.Float64;
-        default:
-            throw new Error('unsupported constructor type');
-    }
-}
+export const typedArrayToDataType = compute_binary_data_type_from_typed_array

package/src/core/collection/array/typed/uint_array_for_count.d.ts

@@ -1,7 +1,7 @@
 /**
  *
- * @param {number} count
- * @returns {function}
+ * @param {number} max_value maximum value to be contained in the array
+ * @returns {function} constructor
  */
-export function UintArrayForCount(count: number): Function;
+export function UintArrayForCount(max_value: number): Function;
 //# sourceMappingURL=uint_array_for_count.d.ts.map

package/src/core/collection/array/typed/uint_array_for_count.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uint_array_for_count.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/typed/uint_array_for_count.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,yCAHW,MAAM,YAchB"}
+{"version":3,"file":"uint_array_for_count.d.ts","sourceRoot":"","sources":["../../../../../../src/core/collection/array/typed/uint_array_for_count.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,6CAHW,MAAM,YAchB"}

package/src/core/collection/array/typed/uint_array_for_count.js

@@ -1,17 +1,17 @@
 /**
  *
- * @param {number} count
- * @returns {function}
+ * @param {number} max_value maximum value to be contained in the array
+ * @returns {function} constructor
  */
-export function UintArrayForCount(count) {
+export function UintArrayForCount(max_value) {
 
-    if (count <= 256) {
+    if (max_value <= 256) {
         return Uint8Array;
-    } else if (count <= 65536) {
+    } else if (max_value <= 65536) {
         return Uint16Array;
-    } else if (count <= 4294967295) {
+    } else if (max_value <= 4294967295) {
         return Uint32Array;
     } else {
-        throw new Error(`Unsupported size ${count}`)
+        throw new Error(`Unsupported size ${max_value}`)
     }
 }

package/src/core/collection/table/RowFirstTable.d.ts

@@ -124,6 +124,12 @@ export class RowFirstTable {
      * @param {function(row_index:number, row:Array.<number>):*} valueSupplier supplier of row values, called with row index and an empty row to be filled
      */
     addRows(count: number, valueSupplier: any): void;
+    /**
+     * Copy a single row, value in the source row is unaffected
+     * @param {number} source
+     * @param {number} target
+     */
+    copyRow(source: number, target: number): void;
     /**
      * Copy data from another table. Specs must match.
      * NOTE: does not send onAdded signal

package/src/core/collection/table/RowFirstTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RowFirstTable.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/table/RowFirstTable.js"],"names":[],"mappings":"AAMA;;GAEG;AACH;IACI;;;;;OAKG;IACH,oDAHW,OAAO,EAuDjB;IA/CG;;;OAGG;IACH,wBAAgB;IAEhB;;;OAGG;IACH,gBAFU,qBAAsB,CAET;IAEvB;;;OAGG;IACH,MAFU,WAAW,CAEuB;IAE5C;;;OAGG;IACH,gBAFU,MAAM,CAEyB;IAEzC;;;OAGG;IACH,QAFU,MAAM,CAED;IAEf;;;OAGG;IACH,UAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,UAFU,QAAQ,CAEE;IAEpB;;MAEC;IAKL;;OAEG;IACH,mBAiBC;IAXG;;;OAGG;IACH,sBAFmB,QAAQ,QAAE,MAAM,QAAE,MAAM,EAAE,KAAG,IAAI,CAEb;IAEvC;;;OAGG;IACH,uBAFmB,QAAQ,QAAE,MAAM,QAAE,MAAM,EAAE,KAAG,IAAI,CAEX;IAG7C;;;;OAIG;IACH,uDAMC;IAED;;;OAGG;IACH,QAFa,MAAM,CA4BlB;IAED;;;OAGG;IACH,sBAFW,MAAM,QA+ChB;IAED;;OAEG;IACH,aAEC;IAED;;;OAGG;IACH,iBAFW,MAAM,QAchB;IAED;;;;;OAKG;IACH,yBAJW,MAAM,eACN,MAAM,SACN,MAAM,QAchB;IAED;;;;;OAKG;IACH,wBAJW,MAAM,eACN,MAAM,GACJ,MAAM,CAclB;IAED;;;;OAIG;IACH,kBAHW,MAAM,YACN,MAAM,QAyBhB;IAED;;;;;OAKG;IACH,kBAHW,MAAM,YACN,MAAM,QAqBhB;IAED;;;OAGG;IACH,eAFW,MAAO,MAAM,CAAC,QAexB;IAED;;;;OAIG;IACH,eAHW,MAAM,4BAoChB;IAED;;;;OAIG;IACH,YAFW,aAAa,QAsBvB;IAED;;;OAGG;IACH,cAHW,aAAa,GACX,OAAO,CAyBnB;IAED;;;;OAIG;IACH,wCAIC;IAED;;;;OAIG;IACH,cAHW,MAAM,UACN,MAAM,EAAE,QAMlB;IAED;;OAEG;IACH,qBA4BC;IAED;;OAEG;IACH,cAIC;IAED;;;OAGG;IACH,wBAEC;IAED;;;OAGG;IACH,cAFa,MAAM,EAAE,EAAE,CAgBtB;IAED;;OAEG;IACH,uBAIC;CACJ;mBA3gBkB,+BAA+B"}
+{"version":3,"file":"RowFirstTable.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/table/RowFirstTable.js"],"names":[],"mappings":"AAMA;;GAEG;AACH;IACI;;;;;OAKG;IACH,oDAHW,OAAO,EAuDjB;IA/CG;;;OAGG;IACH,wBAAgB;IAEhB;;;OAGG;IACH,gBAFU,qBAAsB,CAET;IAEvB;;;OAGG;IACH,MAFU,WAAW,CAEuB;IAE5C;;;OAGG;IACH,gBAFU,MAAM,CAEyB;IAEzC;;;OAGG;IACH,QAFU,MAAM,CAED;IAEf;;;OAGG;IACH,UAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,UAFU,QAAQ,CAEE;IAEpB;;MAEC;IAKL;;OAEG;IACH,mBAiBC;IAXG;;;OAGG;IACH,sBAFmB,QAAQ,QAAE,MAAM,QAAE,MAAM,EAAE,KAAG,IAAI,CAEb;IAEvC;;;OAGG;IACH,uBAFmB,QAAQ,QAAE,MAAM,QAAE,MAAM,EAAE,KAAG,IAAI,CAEX;IAG7C;;;;OAIG;IACH,uDAMC;IAED;;;OAGG;IACH,QAFa,MAAM,CA4BlB;IAED;;;OAGG;IACH,sBAFW,MAAM,QA+ChB;IAED;;OAEG;IACH,aAEC;IAED;;;OAGG;IACH,iBAFW,MAAM,QAchB;IAED;;;;;OAKG;IACH,yBAJW,MAAM,eACN,MAAM,SACN,MAAM,QAchB;IAED;;;;;OAKG;IACH,wBAJW,MAAM,eACN,MAAM,GACJ,MAAM,CAclB;IAED;;;;OAIG;IACH,kBAHW,MAAM,YACN,MAAM,QAyBhB;IAED;;;;;OAKG;IACH,kBAHW,MAAM,YACN,MAAM,QAqBhB;IAED;;;OAGG;IACH,eAFW,MAAO,MAAM,CAAC,QAexB;IAED;;;;OAIG;IACH,eAHW,MAAM,4BAoChB;IAED;;;;OAIG;IACH,gBAHW,MAAM,UACN,MAAM,QAwBhB;IAED;;;;OAIG;IACH,YAFW,aAAa,QAsBvB;IAED;;;OAGG;IACH,cAHW,aAAa,GACX,OAAO,CAyBnB;IAED;;;;OAIG;IACH,wCAIC;IAED;;;;OAIG;IACH,cAHW,MAAM,UACN,MAAM,EAAE,QAMlB;IAED;;OAEG;IACH,qBA4BC;IAED;;OAEG;IACH,cAIC;IAED;;;OAGG;IACH,wBAEC;IAED;;;OAGG;IACH,cAFa,MAAM,EAAE,EAAE,CAgBtB;IAED;;OAEG;IACH,uBAIC;CACJ;mBAxiBkB,+BAA+B"}

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

@@ -142,7 +142,7 @@ export class RowFirstTable {
     setCapacity(rowCount) {
         assert.isNonNegativeInteger(rowCount, 'rowCount');
 
-        if(this.capacity === rowCount){
+        if (this.capacity === rowCount) {
             // already right size
             return;
         }
@@ -367,6 +367,35 @@ export class RowFirstTable {
 
     }
 
+    /**
+     * Copy a single row, value in the source row is unaffected
+     * @param {number} source
+     * @param {number} target
+     */
+    copyRow(source, target) {
+        assert.isNonNegativeInteger(source, 'source');
+        assert.isNonNegativeInteger(target, 'target');
+
+        if (source === target) {
+            // no operation
+            return;
+        }
+
+        // figure out addresses
+        const bytes_per_record = this.bytesPerRecord;
+
+        const source_address = source * bytes_per_record;
+        const target_address = source * bytes_per_record;
+
+        const data_view = this.dataView;
+
+        for (let i = 0; i < bytes_per_record; i++) {
+            const v = data_view.getUint8(source_address + i);
+
+            data_view.setUint8(target_address + i, v);
+        }
+    }
+
     /**
      * Copy data from another table. Specs must match.
      * NOTE: does not send onAdded signal
@@ -429,7 +458,7 @@ export class RowFirstTable {
      * @param {Array} result where row values are to be stored
      */
     getRow(index, result) {
-        assert.isNonNegativeInteger(index,'index');
+        assert.isNonNegativeInteger(index, 'index');
 
         this.readRowMethod(this.dataView, this.bytesPerRecord * index, result);
     }
@@ -440,7 +469,7 @@ export class RowFirstTable {
      * @param {number[]} record
      */
     setRow(index, record) {
-        assert.isNonNegativeInteger(index,'index');
+        assert.isNonNegativeInteger(index, 'index');
 
         this.writeRowMethod(this.dataView, this.bytesPerRecord * index, record);
     }

package/src/engine/graphics/geometry/AttributeSpec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AttributeSpec.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/geometry/AttributeSpec.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH;IA+BI,uCAMC;IA0DD;;;;;OAKG;IACH,iBAJW,aAAa,KACb,aAAa,GACZ,MAAM,CAIjB;IArGG;;;OAGG;IACH,MAFU,MAAM,CAEN;IAEV;;;OAGG;IACH,MAFU,cAAc,CAEM;IAE9B;;;;;OAKG;IACH,UAFU,MAAM,CAEH;IAEb;;;;;OAKG;IACH,YAFU,OAAO,CAEE;IAWvB;;;;;aAoBC;IAED;;;;;MAOC;IAED,eAEC;IAED;;;;OAIG;IACH,cAHW,aAAa,GACX,OAAO,CAQnB;IAED;;;OAGG;IACH,eAFa,MAAM,CAIlB;IAaL;;;OAGG;IACH,0BAFU,OAAO,CAEsB;CANtC;+BAhH8B,6CAA6C"}
+{"version":3,"file":"AttributeSpec.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/geometry/AttributeSpec.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH;IA+BI,uCAMC;IA6ED;;;;;OAKG;IACH,iBAJW,aAAa,KACb,aAAa,GACZ,MAAM,CAIjB;IAxHD;;;OAGG;IACH,MAFU,MAAM,CAEN;IAEV;;;OAGG;IACH,MAFU,cAAc,CAEM;IAE9B;;;;;OAKG;IACH,UAFU,MAAM,CAEH;IAEb;;;;;OAKG;IACH,YAFU,OAAO,CAEE;IAWnB;;;;;aAoBC;IAED;;;;;MAOC;IAED,eAEC;IAED;;;;OAIG;IACH,cAHW,aAAa,GACX,OAAO,CAQnB;IAED;;;OAGG;IACH,YAFW,aAAa,QAOvB;IAED,uBAMC;IAED;;;OAGG;IACH,eAFa,MAAM,CAIlB;IAaL;;;OAGG;IACH,0BAFU,OAAO,CAEsB;CANtC;+BAnI8B,6CAA6C"}

package/src/engine/graphics/geometry/AttributeSpec.js

@@ -9,33 +9,33 @@ import { computeStringHash } from "../../../core/primitives/strings/computeStrin
  */
 export class AttributeSpec {
 
-        /**
-         * Typically unique within a given set, used to identify the attribute
-         * @type {string}
-         */
-        name = "";
-
-        /**
-         * How the attribute is stored in memory and interpreted
-         * @type {BinaryDataType}
-         */
-        type = BinaryDataType.Float32;
-
-        /**
-         * How many elements the attribute uses. This is cardinality of a vector.
-         * 1 means the attribute is a scalar
-         * must be greater or equal to 1
-         * @type {number}
-         */
-        itemSize = 1;
-
-        /**
-         * Normalized values will be automatically converted to float32 in the shader
-         * This gives good optimization opportunities for things like normal vectors
-         * Applies to integer types only
-         * @type {boolean}
-         */
-        normalized = false;
+    /**
+     * Typically unique within a given set, used to identify the attribute
+     * @type {string}
+     */
+    name = "";
+
+    /**
+     * How the attribute is stored in memory and interpreted
+     * @type {BinaryDataType}
+     */
+    type = BinaryDataType.Float32;
+
+    /**
+     * How many elements the attribute uses. This is cardinality of a vector.
+     * 1 means the attribute is a scalar
+     * must be greater or equal to 1
+     * @type {number}
+     */
+    itemSize = 1;
+
+    /**
+     * Normalized values will be automatically converted to float32 in the shader
+     * This gives good optimization opportunities for things like normal vectors
+     * Applies to integer types only
+     * @type {boolean}
+     */
+    normalized = false;
 
 
     static fromJSON(j) {
@@ -96,14 +96,33 @@ export class AttributeSpec {
 
     /**
      *
-     * @returns {number}
+     * @param {AttributeSpec} other
+     */
+    copy(other) {
+        this.type = other.type;
+        this.name = other.name;
+        this.itemSize = other.itemSize;
+        this.normalized = other.normalized;
+    }
+
+    clone() {
+        const r = new AttributeSpec();
+
+        r.copy(this);
+
+        return r;
+    }
+
+    /**
+     * How much space a single attribute value takes up
+     * @returns {number} in bytes
      */
     getByteSize() {
         return this.itemSize * DataTypeByteSizes[this.type];
     }
 
     /**
-     *
+     * Sorting comparator
      * @param {AttributeSpec} a
      * @param {AttributeSpec} b
      * @return {number}

package/src/engine/graphics/geometry/VertexDataSpec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VertexDataSpec.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/geometry/VertexDataSpec.js"],"names":[],"mappings":"AAYA;;;GAGG;AACH;IAeI;;;;OAIG;IACH,2BAHW,aAAa,GACX,cAAc,CAQ1B;IAxBD;;;OAGG;IACH,YAFU,aAAa,EAAE,CAET;IAsBhB;;;;OAIG;IACH,yBAHW,MAAM,GACL,aAAa,GAAC,SAAS,CAgBlC;IAED;;;OAGG;IACH,8BAFW,MAAM,GADJ,MAAM,CAiBlB;IAED;;;OAGG;IACH,oBAFW,aAAa,EAAE,QAOzB;IAED;;;;OAIG;IACH,eAHW,aAAa,GACZ,cAAc,CAkBzB;IAED;;;OAGG;IACH,0BAFW,aAAa,EAAE,QAQzB;IAED,cAMC;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAQnB;IAED,sBAEC;IAED,eAMC;IAED;;MAIC;IAED;;aAkBC;IAED;;;OAGG;IACH,eAFa,MAAM,CAelB;IAIL;;;OAGG;IACH,2BAFU,OAAO,CAEwB;;CAPxC;8BA5M6B,oBAAoB"}
+{"version":3,"file":"VertexDataSpec.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/geometry/VertexDataSpec.js"],"names":[],"mappings":"AAYA;;;GAGG;AACH;IAeI;;;;OAIG;IACH,2BAHW,aAAa,GACX,cAAc,CAQ1B;IAxBD;;;OAGG;IACH,YAFU,aAAa,EAAE,CAET;IAsBhB;;;;OAIG;IACH,yBAHW,MAAM,GACL,aAAa,GAAC,SAAS,CAgBlC;IAED;;;OAGG;IACH,8BAFW,MAAM,GADJ,MAAM,CAiBlB;IAED;;;OAGG;IACH,oBAFW,aAAa,EAAE,QAOzB;IAED;;;;OAIG;IACH,eAHW,aAAa,GACZ,cAAc,CAkBzB;IAED;;;OAGG;IACH,0BAFW,aAAa,EAAE,QAQzB;IAED,cAMC;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAQnB;IAED,sBASC;IAED,eAMC;IAED;;MAIC;IAED;;aAkBC;IAED;;;OAGG;IACH,eAFa,MAAM,CAelB;IAIL;;;OAGG;IACH,2BAFU,OAAO,CAEwB;;CAPxC;8BAnN6B,oBAAoB"}

package/src/engine/graphics/geometry/VertexDataSpec.js

@@ -8,7 +8,7 @@ import { AttributeSpec } from "./AttributeSpec.js";
  * @readonly
  * @type {number}
  */
-const DEFAULT_HASH = 1234567;
+const RESERVED_HASH = 1234567;
 
 /**
  * Describes a set of data attributes. A good analogy would be "all data associated with geometry vertex"
@@ -27,7 +27,7 @@ export class VertexDataSpec {
      * @type {number}
      * @private
      */
-    #hash = DEFAULT_HASH;
+    #hash = RESERVED_HASH;
 
     /**
      *
@@ -111,7 +111,7 @@ export class VertexDataSpec {
         this.attributes.push(attribute);
 
         // reset hash
-        this.#hash = DEFAULT_HASH;
+        this.#hash = RESERVED_HASH;
 
         //for chaining, return self
         return this;
@@ -134,7 +134,7 @@ export class VertexDataSpec {
         this.attributes.splice(0, count);
 
         // reset hash to trigger hash update
-        this.#hash = DEFAULT_HASH;
+        this.#hash = RESERVED_HASH;
     }
 
     /**
@@ -151,11 +151,18 @@ export class VertexDataSpec {
     }
 
     computeHash() {
-        return computeHashArray(this.attributes, invokeObjectHash);
+        const hash_value = computeHashArray(this.attributes, invokeObjectHash);
+
+        if (hash_value === RESERVED_HASH) {
+            // collision with reserved hash, replace
+            return 0;
+        }
+
+        return hash_value;
     }
 
     hash() {
-        if (this.#hash === DEFAULT_HASH) {
+        if (this.#hash === RESERVED_HASH) {
             this.#hash = this.computeHash();
         }
 

package/src/engine/graphics/material/optimization/MaterialOptimizationContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MaterialOptimizationContext.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/material/optimization/MaterialOptimizationContext.js"],"names":[],"mappings":"AAgXA;IAEQ;;;OAGG;IACH,UAFU,MAAM,OAAO,EAAE,CAEP;IAElB;;;OAGG;IACH,QAFU,MAAM,IAAI,EAAE,CAEN;IAGhB;;;OAGG;IACH,SAFU,IAAI,MAAM,EAAC,SAAS,CAAC,CAEP;IAExB;;;OAGG;IACH,YAFU,SAAS,CAEC;IAGxB;;;OAGG;IACH,sBAFW,kBAAkB,EAAE,QAkE9B;IAED;;;OAGG;IACH,gCAFW,kBAAkB,EAAE,QAmE9B;IAED;;;OAGG;IACH,kCAFW,kBAAkB,QA4E5B;IAED;;;OAGG;IACH,cAFW,MAAM,IAAI,QAUpB;IAED;;;OAGG;IACH,iCAMC;IAED;;OAEG;IACH,eAwIC;IAED;;;OAGG;IACH,6BAFY,IAAI,MAAM,EAAE,iBAAiB,CAAC,CAyBzC;IAED;;;;OAIG;IACH,0CAHW,MAAM,cAAc,OACpB,kBAAkB,QA+C5B;CACJ;;0BAIS,MAAM;;0BAx0BU,oCAAoC;mCAK3B,yBAAyB;4BAzBrD,OAAO"}
+{"version":3,"file":"MaterialOptimizationContext.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/material/optimization/MaterialOptimizationContext.js"],"names":[],"mappings":"AAkXA;IAEQ;;;OAGG;IACH,UAFU,MAAM,OAAO,EAAE,CAEP;IAElB;;;OAGG;IACH,QAFU,MAAM,IAAI,EAAE,CAEN;IAGhB;;;OAGG;IACH,SAFU,IAAI,MAAM,EAAC,SAAS,CAAC,CAEP;IAExB;;;OAGG;IACH,YAFU,SAAS,CAEC;IAGxB;;;OAGG;IACH,sBAFW,kBAAkB,EAAE,QAkE9B;IAED;;;OAGG;IACH,gCAFW,kBAAkB,EAAE,QAmE9B;IAED;;;OAGG;IACH,kCAFW,kBAAkB,QA4E5B;IAED;;;OAGG;IACH,cAFW,MAAM,IAAI,QAUpB;IAED;;;OAGG;IACH,iCAMC;IAED;;OAEG;IACH,eAwIC;IAED;;;OAGG;IACH,6BAFY,IAAI,MAAM,EAAE,iBAAiB,CAAC,CAyBzC;IAED;;;;OAIG;IACH,0CAHW,MAAM,cAAc,OACpB,kBAAkB,QA+C5B;CACJ;;0BAIS,MAAM;;0BAx0BU,oCAAoC;mCAK3B,yBAAyB;4BA3BrD,OAAO"}

package/src/engine/graphics/material/optimization/MaterialOptimizationContext.js

@@ -12,7 +12,9 @@ import {
     compute_typed_array_constructor_from_data_type
 } from "../../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
 import { array_push_if_unique } from "../../../../core/collection/array/array_push_if_unique.js";
-import { typedArrayToDataType } from "../../../../core/collection/array/typed/typedArrayToDataType.js";
+import {
+    compute_binary_data_type_from_typed_array
+} from "../../../../core/collection/array/typed/compute_binary_data_type_from_typed_array.js";
 import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import { HashMap } from "../../../../core/collection/map/HashMap.js";
 import AABB2 from "../../../../core/geom/AABB2.js";
@@ -791,7 +793,7 @@ export class MaterialOptimizationContext {
         //build new textures
         for (const [name, sampler] of this.atlases) {
 
-            const sampler_data_type = typedArrayToDataType(sampler.data);
+            const sampler_data_type = compute_binary_data_type_from_typed_array(sampler.data);
 
             const format = channelCountToThreeTextureFormat(sampler.itemSize);
             const type = computeThreeTextureTypeFromDataType(sampler_data_type);

package/src/engine/graphics/texture/sampler/Sampler2D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/Sampler2D.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/Sampler2D.js"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH;IAk8BI;;;;;;OAMG;IACH,6DAFY,SAAS,CAKpB;IAED;;;;;;OAMG;IACH,sDAFY,SAAS,CAKpB;IAED;;;;;;OAMG;IACH,uDAFY,SAAS,CAKpB;IAED;;;;;;OAMG;IACH,uDAFY,SAAS,CAKpB;IAED;;;;;;OAMG;IACH,qDAFY,SAAS,CAKpB;IAED;;;;;;OAMG;IACH,sDAFY,SAAS,CAKpB;IAED;;;;;;OAMG;IACH,sDAFY,SAAS,CAKpB;IAED;;;;;;OAMG;IACH,wDAFY,SAAS,CAKpB;IAED;;;;;;OAMG;IACH,wDAFY,SAAS,CAKpB;IA3iCD;;;;;;;OAOG;IACH,mBANW,UAAU,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,iBAAiB,GAAC,UAAU,GAAC,WAAW,GAAC,WAAW,GAAC,SAAS,GAAC,UAAU,GAAC,UAAU,GAAC,YAAY,GAAC,YAAY,aACzI,MAAM,UACN,MAAM,WACN,MAAM,EAmDhB;IA7BG;;;OAGG;IACH,cAAkB;IAElB;;;OAGG;IACH,eAAoB;IAEpB;;;OAGG;IACH,iBAAwB;IAExB;;;OAGG;IACH,MAFU,MAAM,EAAE,GAAC,iBAAiB,GAAC,UAAU,GAAC,WAAW,GAAC,WAAW,GAAC,SAAS,GAAC,UAAU,GAAC,UAAU,GAAC,YAAY,GAAC,YAAY,CAEjH;IAEhB;;;OAGG;IACH,SAFU,MAAM,CAEA;IAGpB;;;;;;;OAOG;IACH,OALW,MAAM,KACN,MAAM,UACN,qCAA+B,GAC7B,MAAM,CAIlB;IAED;;;;;OAKG;IACH,sBAJW,MAAM,KACN,MAAM,UACN,MAAM,EAAE,QAQlB;IAED;;;;;;OAMG;IACH,6BALW,MAAM,KACN,MAAM,WACN,MAAM,GACJ,MAAM,CAOlB;IAED;;;;;;;OAOG;IACH,2BALW,MAAM,KACN,MAAM,WACN,MAAM,GACJ,MAAM,CA2DlB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,KACN,MAAM,UACN,MAAM,EAAE,QAQlB;IAED;;;;;;OAMG;IACH,iBALW,MAAM,KACN,MAAM,UACN,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,iBAClC,MAAM,QAUhB;IAED;;;;;;OAMG;IACH,0BALW,MAAM,KACN,MAAM,WACN,MAAM,GACJ,MAAM,CAOlB;IAED;;;;;;;OAOG;IACH,wBALW,MAAM,KACN,MAAM,WACN,MAAM,GACJ,MAAM,CAgFlB;IAED;;;;;;OAMG;IACH,oBALW,MAAM,KACN,MAAM,UACN,MAAM,EAAE,GAAC,YAAY,kBACrB,MAAM,QAUhB;IAED;;;;;;OAMG;IACH,kBALW,MAAM,KACN,MAAM,UACN,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,kBAClC,MAAM,QAWhB;IAED;;;;;;OAMG;IACH,2BALW,MAAM,KACN,MAAM,WACN,MAAM,GACL,MAAM,CAOjB;IAED;;;;;;OAMG;IACH,yBALW,MAAM,KACN,MAAM,WACN,MAAM,GACJ,MAAM,CAiFlB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,KACN,MAAM,UACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,QAUpC;IAED;;;;;;OAMG;IACH,eALW,MAAM,KACN,MAAM,WACN,MAAM,GACJ,MAAM,CAalB;IAED;;;;;OAKG;IACH,QAJW,MAAM,KACN,MAAM,UACN,MAAM,EAAE,QAalB;IAED;;;;;OAKG;IACH,SAJW,MAAM,KACN,MAAM,QACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,QAapC;IAED;;;;;;OAMG;IACH,UALW,MAAM,KACN,MAAM,WACN,2BAAuB,OAajC;IAED;;;;;OAKG;IACH,eAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAIlB;IAED;;;;OAIG;IACH,mBAHW,MAAM,yBAUhB;IAED;;;;;;;;;OASG;IACH,aARW,SAAS,qHAoDnB;IAGD;;;;;;;OAOG;IACH,oEA8BC;IAED;;;;OAIG;IACH,2BAHW,MAAM,SACN,MAAM,QAYhB;IAED;;;;;;;OAOG;IACH,iEAFW,aAAc,QAqCxB;IAED;;;;;;OAMG;IACH,gBALW,MAAM,KACN,MAAM,WACN,MAAM,SACN,MAAM,QAqBhB;IAED;;;;;OAKG;IACH,OAJW,MAAM,KACN,MAAM,SACN,MAAM,EAAE,GAAC,YAAY,QAe/B;IAED;;;;;;;OAOG;IACH,wBALW,MAAM,WACN,MAAM,UACN,MAAM,sBAyBhB;IAED;;;;;OAKG;IACH,UAJW,MAAM,KACN,MAAM,iBACN,OAAO,QAyDjB;IAED;;;OAGG;IACH,mBAFY,MAAM,CAYjB;IAED;;;;OAIG;IACH,cAHW,SAAS,GACR,OAAO,CAYlB;IAED;;;OAGG;IACH,QAFY,MAAM,CAYjB;IAGD;;OAEG;IACH,SAFa,SAAS,CAerB;IAED;;;;;;MAUC;IAED;;;;;;aAwBC;IAgHL;;;OAGG;IACH,sBAFU,OAAO,CAEc;CAN9B;;kBAUS,MAAM"}

package/src/engine/graphics/texture/sampler/Sampler2D.js

@@ -3,8 +3,10 @@ import { Base64 } from "../../../../core/binary/Base64.js";
 import {
     compute_typed_array_constructor_from_data_type
 } from "../../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
+import {
+    compute_binary_data_type_from_typed_array
+} from "../../../../core/collection/array/typed/compute_binary_data_type_from_typed_array.js";
 import { is_typed_array_equals } from "../../../../core/collection/array/typed/is_typed_array_equals.js";
-import { typedArrayToDataType } from "../../../../core/collection/array/typed/typedArrayToDataType.js";
 import { clamp } from "../../../../core/math/clamp.js";
 import { lerp } from "../../../../core/math/lerp.js";
 import { max2 } from "../../../../core/math/max2.js";
@@ -949,7 +951,7 @@ export class Sampler2D {
             height: this.height,
             width: this.width,
             itemSize: this.itemSize,
-            type: typedArrayToDataType(this.data),
+            type: compute_binary_data_type_from_typed_array(this.data),
             data: encoded
         }
     }

package/src/engine/graphics/texture/sampler/sampler2d_compute_texel_value_conversion_scale_to_uint8.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampler2d_compute_texel_value_conversion_scale_to_uint8.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/sampler2d_compute_texel_value_conversion_scale_to_uint8.js"],"names":[],"mappings":"AAQA;;;;GAIG;AACH;YAFsB,MAAM;WAAS,MAAM;EAqC1C"}
+{"version":3,"file":"sampler2d_compute_texel_value_conversion_scale_to_uint8.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/sampler2d_compute_texel_value_conversion_scale_to_uint8.js"],"names":[],"mappings":"AAUA;;;;GAIG;AACH;YAFsB,MAAM;WAAS,MAAM;EAqC1C"}