@woosh/meep-engine 2.124.4 → 2.124.5

package/package.json

@@ -5,7 +5,7 @@
   "description": "Pure JavaScript game engine. Fully featured and production ready.",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.124.4",
+  "version": "2.124.5",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/engine/asset/loaders/material/computeTextureEquality.d.ts

@@ -1,10 +1,10 @@
 /**
- *
- * @param {Texture} a
- * @param {Texture} b
+ * Compare two three.js textures for equality
+ * @param {THREE.Texture} a
+ * @param {THREE.Texture} b
  * @returns {boolean}
  */
-export function computeTextureEquality(a: Texture, b: Texture): boolean;
+export function computeTextureEquality(a: THREE.Texture, b: THREE.Texture): boolean;
 /**
  *
  * @param {Image|ImageBitmap|HTMLCanvasElement|[]|{width:number, height:number}} a

package/src/engine/asset/loaders/material/computeTextureEquality.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeTextureEquality.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/material/computeTextureEquality.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH,0CAJW,OAAO,KACP,OAAO,GACL,OAAO,CAoDnB;AAGD;;;;;GAKG;AACH,sCAJW,8DAAM,WAAW,GAAC,iBAAiB,GAAC,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,KACpE,8DAAM,WAAW,GAAC,iBAAiB,GAAC,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,GAClE,OAAO,CAmEnB"}
+{"version":3,"file":"computeTextureEquality.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/material/computeTextureEquality.js"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,0CAJW,KAAK,CAAC,OAAO,KACb,KAAK,CAAC,OAAO,GACX,OAAO,CA8DnB;AAED;;;;;GAKG;AACH,sCAJW,8DAAM,WAAW,GAAC,iBAAiB,GAAC,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,KACpE,8DAAM,WAAW,GAAC,iBAAiB,GAAC,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,GAClE,OAAO,CA2EnB"}

package/src/engine/asset/loaders/material/computeTextureEquality.js

@@ -1,15 +1,14 @@
 import { fastArrayEquals } from "../../../../core/collection/array/fastArrayEquals.js";
-import { isTypedArray } from "../../../../core/collection/array/typed/isTypedArray.js";
+import { isArrayLike } from "../../../../core/collection/array/isArrayLike.js";
 import { computeImageCanvasEquality } from "../../../graphics/canvas/computeImageCanvasEquality.js";
 import { isImageBitmap } from "../../../graphics/texture/isImageBitmap.js";
 import { computeImageBitmapEquality } from "./computeImageBitmapEquality.js";
 
-//
 
 /**
- *
- * @param {Texture} a
- * @param {Texture} b
+ * Compare two three.js textures for equality
+ * @param {THREE.Texture} a
+ * @param {THREE.Texture} b
  * @returns {boolean}
  */
 export function computeTextureEquality(a, b) {
@@ -26,6 +25,14 @@ export function computeTextureEquality(a, b) {
         return false;
     }
 
+    // special methods
+    if (typeof a.equals === "function" && typeof b.equals === "function") {
+        // can check for equality using custom methods
+        return a.equals(b);
+    }
+
+    // revert to generic check
+
     if (
         a.mapping !== b.mapping
         || a.wrapS !== b.wrapS
@@ -61,10 +68,11 @@ export function computeTextureEquality(a, b) {
     }
 
     //TODO implement support for other texture types
+
+    // checks up until now were for rejection, so if we got until this point - textures must be equal
     return true;
 }
 
-
 /**
  *
  * @param {Image|ImageBitmap|HTMLCanvasElement|[]|{width:number, height:number}} a
@@ -130,7 +138,15 @@ export function textureImagesEqual(a, b) {
         return true;
     }
 
-    if (isTypedArray(a.data) && isTypedArray(b.data)) {
+    const a_data = a.data;
+    const b_data = b.data;
+
+    if (a_data === null && b_data === null) {
+        // special case, empty texture
+        return true;
+    }
+
+    if (isArrayLike(a_data) && isArrayLike(b_data)) {
         return textureMipmapEqual(a, b);
     }
 

package/src/engine/asset/loaders/material/computeTextureHash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeTextureHash.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/material/computeTextureHash.js"],"names":[],"mappings":"AAyBA;;;;GAIG;AACH,4CAHW,WAAW,GAAC,gBAAgB,GAAC;IAAC,IAAI,MAAC;IAAA,KAAK,EAAC,MAAM,CAAC;IAAA,MAAM,EAAC,MAAM,CAAA;CAAC,GAC7D,MAAM,CA0CjB;AA4CD;;;;GAIG;AACH,sCAHW,OAAO,GAAC,KAAK,CAAC,OAAO,GACnB,MAAM,CAqClB"}
+{"version":3,"file":"computeTextureHash.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/asset/loaders/material/computeTextureHash.js"],"names":[],"mappings":"AA0BA;;;;GAIG;AACH,4CAHW,WAAW,GAAC,gBAAgB,GAAC;IAAC,IAAI,MAAC;IAAA,KAAK,EAAC,MAAM,CAAC;IAAA,MAAM,EAAC,MAAM,CAAA;CAAC,GAC7D,MAAM,CA0CjB;AA4CD;;;;GAIG;AACH,sCAHW,OAAO,GAAC,KAAK,CAAC,OAAO,GACnB,MAAM,CAgDlB"}

package/src/engine/asset/loaders/material/computeTextureHash.js

@@ -1,3 +1,4 @@
+import { assert } from "../../../../core/assert.js";
 import { combine_hash } from "../../../../core/collection/array/combine_hash.js";
 import { murmur3_32 } from "../../../../core/math/hash/murmur3_32.js";
 import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
@@ -45,7 +46,7 @@ export function computeImageDataHash(image) {
 
         result = computeStringHash(image.src);
 
-    }else if(image instanceof HTMLCanvasElement) {
+    } else if (image instanceof HTMLCanvasElement) {
 
         result = computeHtmlCanvasElementHash(image);
 
@@ -123,9 +124,20 @@ export function computeTextureHash(t) {
     }
 
     if (t === undefined) {
-        return 0;
+        return 1;
+    }
+
+    // special methods
+    if (typeof t.hash === "function") {
+        const hash = t.hash(); // must produce an integer value
+
+        assert.isInteger(hash, 'hash');
+
+        return hash;
     }
 
+    // revert to generic check
+
     const specificHash = computeSpecificHash(t);
 
     return combine_hash(