@woosh/meep-engine 2.117.12 → 2.117.14

package/build/meep.module.js

@@ -51192,34 +51192,34 @@ class ObservedString extends String {
  */
 ObservedString.prototype.isObservedString = true;
 
+/**
+ *
+ * @type {WeakMap<HTMLCanvasElement, CanvasRenderingContext2D>}
+ */
+const context_cache = new WeakMap();
+
+/**
+ *
+ * @param {HTMLCanvasElement} canvas
+ * @returns {Sampler2D}
+ */
 function canvas2Sampler2D(canvas) {
     const width = canvas.width;
     const height = canvas.height;
 
-    const context = canvas.getContext("2d");
-
-    const result = new Sampler2D(null, 4, width, height);
-
-    canvasDataToSampler(result, context);
-
-    return result;
-
-}
+    let context = context_cache.get(canvas);
 
-/**
- *
- * @param {Sampler2D} target
- * @param {CanvasRenderingContext2D} ctx
- */
-function canvasDataToSampler(target, ctx) {
-    const width = target.width;
-    const height = target.height;
+    if (context === undefined) {
+        context = canvas.getContext("2d");
+        context_cache.set(canvas, context);
+    }
 
-    const imageData = ctx.getImageData(0, 0, width, height);
+    const imageData = context.getImageData(0, 0, width, height);
 
     const data = imageData.data;
 
-    target.data = data;
+    return new Sampler2D(data, 4, width, height);
+
 }
 
 /**
@@ -67687,6 +67687,22 @@ const CopyShader = {
 
 };
 
+/**
+ *
+ * @param {Sampler2D} target
+ * @param {CanvasRenderingContext2D} ctx
+ */
+function canvasDataToSampler(target, ctx) {
+    const width = target.width;
+    const height = target.height;
+
+    const imageData = ctx.getImageData(0, 0, width, height);
+
+    const data = imageData.data;
+
+    target.data = data;
+}
+
 /**
  * WebGL constant, declared explicitly to avoid issues with later THREE.js versions where it is absent
  * @type {number}
@@ -76707,6 +76723,35 @@ function computeTextureHash(t) {
     );
 }
 
+/**
+ *
+ * @param {HTMLCanvasElement} a
+ * @param {HTMLCanvasElement} b
+ * @returns {boolean}
+ */
+function computeImageCanvasEquality(a, b) {
+    if(a === b){
+        // shortcut
+        return true;
+    }
+
+    if (
+        a.width !== b.width
+        || a.height !== b.height
+    ) {
+        return false;
+    }
+
+    const sampler_a = canvas2Sampler2D(a);
+    const sampler_b = canvas2Sampler2D(b);
+
+    if(!sampler_a.equals(sampler_b)){
+        return  false;
+    }
+
+    return true;
+}
+
 //
 
 /**
@@ -76768,28 +76813,6 @@ function computeTextureEquality(a, b) {
 }
 
 
-/**
- *
- * @param {HTMLCanvasElement} a
- * @param {HTMLCanvasElement} b
- * @returns {boolean}
- */
-function computeImageCanvasEquality(a, b) {
-    if (
-        a.width !== b.width
-        || a.height !== b.height
-    ) {
-        return false;
-    }
-
-    if (a.toDataURL() !== b.toDataURL()) {
-        // kinda slow, but pretty reliable, as we don't actually know what canvases hold, i.e. webgl, 2d etc.
-        return false;
-    }
-
-    return true;
-}
-
 /**
  *
  * @param {Image|ImageBitmap|HTMLCanvasElement|[]|{width:number, height:number}} a

package/package.json

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

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":"AAOA;;;;;GAKG;AACH,gEAFa,OAAO,CAoDnB;AAyBD;;;;;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":"AAQA;;;;;GAKG;AACH,gEAFa,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"}

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

@@ -1,5 +1,6 @@
 import { fastArrayEquals } from "../../../../core/collection/array/fastArrayEquals.js";
 import { isTypedArray } from "../../../../core/collection/array/typed/isTypedArray.js";
+import { computeImageCanvasEquality } from "../../../graphics/canvas/computeImageCanvasEquality.js";
 import { isImageBitmap } from "../../../graphics/texture/isImageBitmap.js";
 import { computeImageBitmapEquality } from "./computeImageBitmapEquality.js";
 
@@ -64,28 +65,6 @@ export function computeTextureEquality(a, b) {
 }
 
 
-/**
- *
- * @param {HTMLCanvasElement} a
- * @param {HTMLCanvasElement} b
- * @returns {boolean}
- */
-function computeImageCanvasEquality(a, b) {
-    if (
-        a.width !== b.width
-        || a.height !== b.height
-    ) {
-        return false;
-    }
-
-    if (a.toDataURL() !== b.toDataURL()) {
-        // kinda slow, but pretty reliable, as we don't actually know what canvases hold, i.e. webgl, 2d etc.
-        return false;
-    }
-
-    return true;
-}
-
 /**
  *
  * @param {Image|ImageBitmap|HTMLCanvasElement|[]|{width:number, height:number}} a

package/src/engine/graphics/canvas/computeImageCanvasEquality.d.ts

@@ -0,0 +1,8 @@
+/**
+ *
+ * @param {HTMLCanvasElement} a
+ * @param {HTMLCanvasElement} b
+ * @returns {boolean}
+ */
+export function computeImageCanvasEquality(a: HTMLCanvasElement, b: HTMLCanvasElement): boolean;
+//# sourceMappingURL=computeImageCanvasEquality.d.ts.map

package/src/engine/graphics/canvas/computeImageCanvasEquality.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeImageCanvasEquality.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/canvas/computeImageCanvasEquality.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,8CAJW,iBAAiB,KACjB,iBAAiB,GACf,OAAO,CAuBnB"}

package/src/engine/graphics/canvas/computeImageCanvasEquality.js

@@ -0,0 +1,31 @@
+import canvas2Sampler2D from "../texture/Canvas2Sampler2D.js";
+
+
+/**
+ *
+ * @param {HTMLCanvasElement} a
+ * @param {HTMLCanvasElement} b
+ * @returns {boolean}
+ */
+export function computeImageCanvasEquality(a, b) {
+    if(a === b){
+        // shortcut
+        return true;
+    }
+
+    if (
+        a.width !== b.width
+        || a.height !== b.height
+    ) {
+        return false;
+    }
+
+    const sampler_a = canvas2Sampler2D(a);
+    const sampler_b = canvas2Sampler2D(b);
+
+    if(!sampler_a.equals(sampler_b)){
+        return  false;
+    }
+
+    return true;
+}

package/src/engine/graphics/texture/Canvas2Sampler2D.d.ts

@@ -1,10 +1,9 @@
+export default canvas2Sampler2D;
 /**
  *
- * @param {Sampler2D} target
- * @param {CanvasRenderingContext2D} ctx
+ * @param {HTMLCanvasElement} canvas
+ * @returns {Sampler2D}
  */
-export function canvasDataToSampler(target: Sampler2D, ctx: CanvasRenderingContext2D): void;
-export default canvas2Sampler2D;
+declare function canvas2Sampler2D(canvas: HTMLCanvasElement): Sampler2D;
 import { Sampler2D } from './sampler/Sampler2D.js';
-declare function canvas2Sampler2D(canvas: any): Sampler2D;
 //# sourceMappingURL=Canvas2Sampler2D.d.ts.map

package/src/engine/graphics/texture/Canvas2Sampler2D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Canvas2Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/Canvas2Sampler2D.js"],"names":[],"mappings":"AAkBA;;;;GAIG;AACH,4CAHW,SAAS,OACT,wBAAwB,QAalC;;0BAjCyB,wBAAwB;AAGlD,0DAYC"}
+{"version":3,"file":"Canvas2Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/Canvas2Sampler2D.js"],"names":[],"mappings":";AAQA;;;;GAIG;AACH,0CAHW,iBAAiB,GACf,SAAS,CAmBrB;0BA9ByB,wBAAwB"}

package/src/engine/graphics/texture/Canvas2Sampler2D.js

@@ -1,37 +1,33 @@
-import { assert } from "../../../core/assert.js";
 import { Sampler2D } from './sampler/Sampler2D.js';
 
+/**
+ *
+ * @type {WeakMap<HTMLCanvasElement, CanvasRenderingContext2D>}
+ */
+const context_cache = new WeakMap();
 
+/**
+ *
+ * @param {HTMLCanvasElement} canvas
+ * @returns {Sampler2D}
+ */
 function canvas2Sampler2D(canvas) {
     const width = canvas.width;
     const height = canvas.height;
 
-    const context = canvas.getContext("2d");
-
-    const result = new Sampler2D(null, 4, width, height);
+    let context = context_cache.get(canvas);
 
-    canvasDataToSampler(result, context);
-
-    return result;
-
-}
-
-/**
- *
- * @param {Sampler2D} target
- * @param {CanvasRenderingContext2D} ctx
- */
-export function canvasDataToSampler(target, ctx) {
-    const width = target.width;
-    const height = target.height;
+    if (context === undefined) {
+        context = canvas.getContext("2d");
+        context_cache.set(canvas, context);
+    }
 
-    const imageData = ctx.getImageData(0, 0, width, height);
+    const imageData = context.getImageData(0, 0, width, height);
 
     const data = imageData.data;
 
-    assert.equal(data.length, target.height * target.width * target.itemSize);
+    return new Sampler2D(data, 4, width, height);
 
-    target.data = data;
 }
 
 export default canvas2Sampler2D;

package/src/engine/graphics/texture/canvasDataToSampler.d.ts

@@ -0,0 +1,7 @@
+/**
+ *
+ * @param {Sampler2D} target
+ * @param {CanvasRenderingContext2D} ctx
+ */
+export function canvasDataToSampler(target: Sampler2D, ctx: CanvasRenderingContext2D): void;
+//# sourceMappingURL=canvasDataToSampler.d.ts.map

package/src/engine/graphics/texture/canvasDataToSampler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canvasDataToSampler.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/canvasDataToSampler.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,4DAFW,wBAAwB,QAalC"}

package/src/engine/graphics/texture/canvasDataToSampler.js

@@ -0,0 +1,19 @@
+import { assert } from "../../../core/assert.js";
+
+/**
+ *
+ * @param {Sampler2D} target
+ * @param {CanvasRenderingContext2D} ctx
+ */
+export function canvasDataToSampler(target, ctx) {
+    const width = target.width;
+    const height = target.height;
+
+    const imageData = ctx.getImageData(0, 0, width, height);
+
+    const data = imageData.data;
+
+    assert.equal(data.length, target.height * target.width * target.itemSize);
+
+    target.data = data;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"convertTexture2Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/convertTexture2Sampler2D.js"],"names":[],"mappings":"AAuEA;;;;;;;GAOG;AACH,mEALW,MAAM,WACN,MAAM,UACN,OAAO,GACN,SAAS,CAyFpB;0BA9JyB,gBAAgB"}
+{"version":3,"file":"convertTexture2Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/convertTexture2Sampler2D.js"],"names":[],"mappings":"AAwEA;;;;;;;GAOG;AACH,mEALW,MAAM,WACN,MAAM,UACN,OAAO,GACN,SAAS,CAyFpB;0BA9JyB,gBAAgB"}

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

@@ -3,7 +3,8 @@ import ImageFilter from "../../filter/ImageFilter.js";
 import { sampler2d_flipY_in_place } from "../../filter/sampler2d_flipY_in_place.js";
 import CopyShader from "../../postprocess/threejs/shaders/CopyShader.js";
 import { WebGLRendererPool } from "../../render/RendererPool.js";
-import { canvasDataToSampler } from "../Canvas2Sampler2D.js";
+
+import { canvasDataToSampler } from "../canvasDataToSampler.js";
 import { formatToChannelCount } from "../formatToChannelCount.js";
 import { sampler2d_scale } from "./resize/sampler2d_scale.js";
 import { Sampler2D } from "./Sampler2D.js";