@woosh/meep-engine 2.34.6 → 2.34.7

package/engine/asset/loaders/material/bitmap2sampler_gl.js

@@ -2,7 +2,7 @@
  * Transfer bitmap contents to Sampler2D, effectively moving data to CPU, making it readable
  * @param {WebGL2RenderingContext} gl
  * @param {Sampler2D} sampler
- * @param {ImageBitmap} bitmap
+ * @param {ImageBitmap|ImageData|HTMLImageElement|HTMLCanvasElement|HTMLVideoElement} bitmap
  */
 export function bitmap2sampler_gl(gl, sampler, bitmap) {
     gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, bitmap);
@@ -15,5 +15,11 @@ export function bitmap2sampler_gl(gl, sampler, bitmap) {
         throw new Error(`Expected sampler.itemSize to be 4, instead was '${sampler.itemSize}'`);
     }
 
-    gl.readPixels(0, 0, w, h, gl.RGBA, gl.UNSIGNED_BYTE, sampler.data);
+    /**
+     *
+     * @type {Uint8ClampedArray}
+     */
+    const target_data = sampler.data;
+
+    gl.readPixels(0, 0, w, h, gl.RGBA, gl.UNSIGNED_BYTE, target_data);
 }

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

@@ -78,6 +78,9 @@ export function textureImagesEqual(a, b) {
         if (a.src === b.src) {
             //same source
             return true;
+        } else {
+            // different source, assume images are different too
+            return false;
         }
     }
 

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

@@ -2,6 +2,7 @@ import { computeImageBitmapHash } from "./computeImageBitmapHash.js";
 import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 import { murmur3_32 } from "../../../../core/math/hash/murmur3_32.js";
+import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 
 /**
  *
@@ -20,6 +21,11 @@ function vector2Hash(v) {
  */
 const data_cache = new WeakMap();
 
+/**
+ *
+ * @param {ImageBitmap|HTMLImageElement|{data,width:number,height:number}} image
+ * @return {number}
+ */
 export function computeImageDataHash(image) {
     const cached_value = data_cache.get(image);
 
@@ -31,6 +37,8 @@ export function computeImageDataHash(image) {
 
     if (image instanceof ImageBitmap) {
         result = computeImageBitmapHash(image);
+    } else if (image instanceof HTMLImageElement) {
+        result = computeStringHash(image.src);
     }
 
     let width = 0;

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.34.6",
+  "version": "2.34.7",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",