@woosh/meep-engine 2.117.4 → 2.117.6

package/build/meep.module.js

@@ -76732,8 +76732,30 @@ function computeTextureEquality(a, b) {
 
 /**
  *
- * @param {Image|[]|{width:number, height:number}} a
- * @param {Image|[]|{width:number, height:number}} 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
+ * @param {Image|ImageBitmap|HTMLCanvasElement|[]|{width:number, height:number}} b
  * @returns {boolean}
  */
 function textureImagesEqual(a, b) {
@@ -76763,7 +76785,11 @@ function textureImagesEqual(a, b) {
     if (isImageBitmap(a) && isImageBitmap(b)) {
 
         return computeImageBitmapEquality(a, b);
-        
+
+    }
+
+    if (a instanceof HTMLCanvasElement && b instanceof HTMLCanvasElement) {
+        return computeImageCanvasEquality(a, b);
     }
 
     if (Array.isArray(a) && Array.isArray(b)) {
@@ -76788,16 +76814,15 @@ function textureImagesEqual(a, b) {
             }
         }
 
+        return true;
     }
 
     if (isTypedArray(a.data) && isTypedArray(b.data)) {
-        if (!textureMipmapEqual(a, b)) {
-            return false;
-        }
+        return textureMipmapEqual(a, b);
     }
 
-    // assume equivalent
-    return true;
+    // assume different
+    return false;
 }
 
 /**

package/package.json

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

package/src/core/color/Color.d.ts

@@ -32,6 +32,8 @@ export class Color {
 
     fromUint(v: number): void
 
+    lerpColors(a: Color, b: Color, f: number): void
+
     equals(other: Color): boolean
 
     hash(): number

package/src/core/geom/Quaternion.d.ts

@@ -94,5 +94,7 @@ export default class Quaternion {
 
     asArray(): number[]
 
+    static fromEulerAngles(x:number, y:number, z:number):Quaternion;
+
     static readonly identity: Quaternion
 }

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

@@ -7,14 +7,14 @@
 export function computeTextureEquality(a: Texture, b: Texture): boolean;
 /**
  *
- * @param {Image|[]|{width:number, height:number}} a
- * @param {Image|[]|{width:number, height:number}} b
+ * @param {Image|ImageBitmap|HTMLCanvasElement|[]|{width:number, height:number}} a
+ * @param {Image|ImageBitmap|HTMLCanvasElement|[]|{width:number, height:number}} b
  * @returns {boolean}
  */
-export function textureImagesEqual(a: (new (width?: number, height?: number) => HTMLImageElement) | [] | {
+export function textureImagesEqual(a: (new (width?: number, height?: number) => HTMLImageElement) | ImageBitmap | HTMLCanvasElement | [] | {
     width: number;
     height: number;
-}, b: (new (width?: number, height?: number) => HTMLImageElement) | [] | {
+}, b: (new (width?: number, height?: number) => HTMLImageElement) | ImageBitmap | HTMLCanvasElement | [] | {
     width: number;
     height: number;
 }): boolean;

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;AAGD;;;;;GAKG;AACH,sCAJW,8DAAM,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,KACtC,8DAAM,EAAE,GAAC;IAAC,KAAK,EAAC,MAAM,CAAC;IAAC,MAAM,EAAC,MAAM,CAAA;CAAC,GACpC,OAAO,CAgEnB"}
+{"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"}

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

@@ -66,8 +66,30 @@ export function computeTextureEquality(a, b) {
 
 /**
  *
- * @param {Image|[]|{width:number, height:number}} a
- * @param {Image|[]|{width:number, height:number}} 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
+ * @param {Image|ImageBitmap|HTMLCanvasElement|[]|{width:number, height:number}} b
  * @returns {boolean}
  */
 export function textureImagesEqual(a, b) {
@@ -97,7 +119,11 @@ export function textureImagesEqual(a, b) {
     if (isImageBitmap(a) && isImageBitmap(b)) {
 
         return computeImageBitmapEquality(a, b);
-        
+
+    }
+
+    if (a instanceof HTMLCanvasElement && b instanceof HTMLCanvasElement) {
+        return computeImageCanvasEquality(a, b);
     }
 
     if (Array.isArray(a) && Array.isArray(b)) {
@@ -122,16 +148,15 @@ export function textureImagesEqual(a, b) {
             }
         }
 
+        return true;
     }
 
     if (isTypedArray(a.data) && isTypedArray(b.data)) {
-        if (!textureMipmapEqual(a, b)) {
-            return false;
-        }
+        return textureMipmapEqual(a, b);
     }
 
-    // assume equivalent
-    return true;
+    // assume different
+    return false;
 }
 
 /**

package/src/engine/graphics/particles/particular/engine/renderers/billboard/ParticleBillboardMaterial.js

@@ -187,7 +187,7 @@ function make_vertex_shader() {
                     
                     float radius = vSize * 0.5;
                     
-                    float projected_radius = resolution.y * projectionMatrix[1][1] * radius / gl_Position.w;;
+                    float projected_radius = resolution.y * projectionMatrix[1][1] * radius / gl_Position.w;
                                     
                     #ifdef DEPTH_SOFT_ENABLED
                     

package/src/engine/graphics/render/frame_graph/RenderGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderGraph.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/frame_graph/RenderGraph.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH;IACI;;;;OAIG;IACH,iBAAc;IAEd;;;;OAIG;IACH,qBAAkB;IAElB;;;;OAIG;IACH,yBAAsB;IAEtB;;;;OAIG;IACH,4BAAyB;IAEzB;;;;OAIG;IACH,qBAHW,MAAM,sBAahB;IAED;;;;OAIG;IACH,oBAHW,MAAM,qBAgBhB;IAED;;;;OAIG;IACH,qBAHW,MAAM,KAKhB;IAED;;;;OAIG;IACH,2BAHW,MAAM,2BAOhB;IAED;;;;;OAKG;IACH,6BAUC;IAED;;;;;;OAMG;IACH,4BAcC;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACJ,MAAM,CAkBlB;IAED;;;;;;OAMG;IACH,2BALW,MAAM,wDAGJ,MAAM,CAUlB;IAED;;;OAGG;IACH,4BAHa,OAAO,CAQnB;IAED;;;;OAIG;IACH,gCA0BC;IAED;;;;;;OAMG;IACH,iEAFa,OAAO,CAOnB;IAED,gBA0FC;IAED;;;OAGG;IACH,uCAqCC;IAED;;;OAGG;IACH,eAFY,MAAM,CAiEjB;CACJ;8BAnb6B,oBAAoB;6BACrB,mBAAmB"}
+{"version":3,"file":"RenderGraph.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/frame_graph/RenderGraph.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH;IACI;;;;OAIG;IACH,iBAAc;IAEd;;;;OAIG;IACH,qBAAkB;IAElB;;;;OAIG;IACH,yBAAsB;IAEtB;;;;OAIG;IACH,4BAAyB;IAEzB;;;;OAIG;IACH,qBAHW,MAAM,sBAahB;IAED;;;;OAIG;IACH,oBAHW,MAAM,qBAgBhB;IAED;;;;OAIG;IACH,qBAHW,MAAM,KAKhB;IAED;;;;OAIG;IACH,2BAHW,MAAM,2BAOhB;IAED;;;;;OAKG;IACH,6BAUC;IAED;;;;;;OAMG;IACH,4BAcC;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACJ,MAAM,CAkBlB;IAED;;;;;;OAMG;IACH,2BALW,MAAM,wDAGJ,MAAM,CAUlB;IAED;;;OAGG;IACH,4BAHa,OAAO,CAQnB;IAED;;;;OAIG;IACH,gCA0BC;IAED;;;;;;OAMG;IACH,iEAFa,OAAO,CAOnB;IAED,gBA6FC;IAED;;;OAGG;IACH,uCA2CC;IAED;;;OAGG;IACH,eAFY,MAAM,CAiEjB;CACJ;8BA5b6B,oBAAoB;6BACrB,mBAAmB"}

package/src/engine/graphics/render/frame_graph/RenderGraph.js

@@ -307,14 +307,17 @@ export class RenderGraph {
         }
 
         // calculate lifetimes
-        for (const pass of pass_nodes) {
+        for (let i = 0; i < pass_node_count; i++){
+            const pass = pass_nodes[i];
             if (pass.ref_count === 0) {
                 // unused pass
                 continue;
             }
 
             for (const id of pass.resource_creates) {
-                this.getResourceEntry(id).producer = pass;
+                const entry = this.getResourceEntry(id);
+                entry.producer = pass;
+                entry.last = pass;
             }
 
             for (const id of pass.resource_writes) {
@@ -360,11 +363,17 @@ export class RenderGraph {
             // execute pass
             node.pass.execute(node.data, resources, context);
 
-            for (const entry of this.__resource_registry) {
+            const resource_entries = this.__resource_registry;
+            const resource_entry_count = resource_entries.length;
+
+            for (let entry_index = 0; entry_index < resource_entry_count; entry_index++){
+                const entry = resource_entries[entry_index];
+
                 if (entry.last === node && entry.isTransient()) {
                     // this was the last user of the resource and the resource is transient (no external usage)
                     entry.destroy(context.resource_manager);
                 }
+
             }
 
         }