@woosh/meep-engine 2.117.13 → 2.117.16

package/build/meep.module.js

@@ -51214,28 +51214,12 @@ function canvas2Sampler2D(canvas) {
         context_cache.set(canvas, context);
     }
 
-    const result = new Sampler2D(null, 4, width, height);
-
-    canvasDataToSampler(result, context);
-
-    return result;
-
-}
-
-/**
- *
- * @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 imageData = context.getImageData(0, 0, width, height);
 
     const data = imageData.data;
 
-    target.data = data;
+    return new Sampler2D(data, 4, width, height);
+
 }
 
 /**
@@ -67703,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}

package/package.json

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

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

@@ -3,6 +3,17 @@
  * @see https://github.com/skaarj1989/FrameGraph
  */
 export class RenderGraph {
+    /**
+     *
+     * @param {string} name
+     */
+    constructor(name?: string);
+    /**
+     * Human-readable name, used for debugging and UI primarily.
+     * There is no uniqueness guarantee
+     * @type {string}
+     */
+    name: string;
     /**
      *
      * @type {RenderPass[]}

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,qBAmBhB;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,qCA0BC;IAED;;;;;;OAMG;IACH,iEAFa,OAAO,CAOnB;IAED,gBA6FC;IAED;;;OAGG;IACH,uCA2CC;IAED;;;OAGG;IACH,eAFY,MAAM,CAiEjB;CACJ;8BA/b6B,oBAAoB;6BACrB,mBAAmB"}
+{"version":3,"file":"RenderGraph.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/frame_graph/RenderGraph.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH;IAoCI;;;OAGG;IACH,mBAFW,MAAM,EAOhB;IA5CD;;;;OAIG;IACH,MAFU,MAAM,CAEN;IAEV;;;;OAIG;IACH,iBAAc;IAEd;;;;OAIG;IACH,qBAAkB;IAElB;;;;OAIG;IACH,yBAAsB;IAEtB;;;;OAIG;IACH,4BAAyB;IAazB;;;;OAIG;IACH,qBAHW,MAAM,sBAahB;IAED;;;;OAIG;IACH,oBAHW,MAAM,qBAmBhB;IAED;;;;OAIG;IACH,qBAHW,MAAM,KAKhB;IAED;;;;OAIG;IACH,2BAHW,MAAM,2BAWhB;IAED;;;;;OAKG;IACH,6BAYC;IAED;;;;;;OAMG;IACH,4BAeC;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,qCA0BC;IAED;;;;;;OAMG;IACH,iEAFa,OAAO,CAOnB;IAED,gBA6FC;IAED;;;OAGG;IACH,uCA2CC;IAED;;;OAGG;IACH,eAFY,MAAM,CAiEjB;CACJ;8BAxd6B,oBAAoB;6BACrB,mBAAmB"}

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

@@ -11,6 +11,13 @@ import { ResourceNode } from "./ResourceNode.js";
  * @see https://github.com/skaarj1989/FrameGraph
  */
 export class RenderGraph {
+    /**
+     * Human-readable name, used for debugging and UI primarily.
+     * There is no uniqueness guarantee
+     * @type {string}
+     */
+    name = "";
+
     /**
      *
      * @type {RenderPass[]}
@@ -39,6 +46,17 @@ export class RenderGraph {
      */
     __resource_registry = [];
 
+    /**
+     *
+     * @param {string} name
+     */
+    constructor(name = "") {
+        assert.isString(name, 'name');
+
+
+        this.name = name;
+    }
+
     /**
      *
      * @param {number} id Resource Node ID
@@ -94,6 +112,10 @@ export class RenderGraph {
      * @param {T} descriptor
      */
     create_resource(name, descriptor) {
+        assert.isString(name, 'name');
+        assert.defined(descriptor, 'descriptor');
+        assert.notNull(descriptor, 'descriptor');
+
         const resource = this._createResourceEntry(descriptor);
 
         return this._createResourceNode(name, resource.resource_id).id;
@@ -106,6 +128,8 @@ export class RenderGraph {
      * @private
      */
     _createResourceEntry(descriptor) {
+        assert.defined(descriptor, 'descriptor');
+        assert.notNull(descriptor, 'descriptor');
 
         const entry = new ResourceEntry();
 
@@ -125,6 +149,7 @@ export class RenderGraph {
      * @private
      */
     _createResourceNode(name, resource_id) {
+        assert.isString(name, 'name');
         assert.isNonNegativeInteger(resource_id, 'resource_id');
 
         const n = new ResourceNode();
@@ -310,7 +335,7 @@ export class RenderGraph {
         }
 
         // calculate lifetimes
-        for (let i = 0; i < pass_node_count; i++){
+        for (let i = 0; i < pass_node_count; i++) {
             const pass = pass_nodes[i];
             if (pass.ref_count === 0) {
                 // unused pass
@@ -369,7 +394,7 @@ export class RenderGraph {
             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++){
+            for (let entry_index = 0; entry_index < resource_entry_count; entry_index++) {
                 const entry = resource_entries[entry_index];
 
                 if (entry.last === node && entry.isTransient()) {

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

@@ -1,15 +1,9 @@
-/**
- *
- * @param {Sampler2D} target
- * @param {CanvasRenderingContext2D} ctx
- */
-export function canvasDataToSampler(target: Sampler2D, ctx: CanvasRenderingContext2D): void;
 export default canvas2Sampler2D;
-import { Sampler2D } from './sampler/Sampler2D.js';
 /**
  *
  * @param {HTMLCanvasElement} canvas
  * @returns {Sampler2D}
  */
 declare function canvas2Sampler2D(canvas: HTMLCanvasElement): Sampler2D;
+import { Sampler2D } from './sampler/Sampler2D.js';
 //# 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":"AAiCA;;;;GAIG;AACH,4CAHW,SAAS,OACT,wBAAwB,QAalC;;0BAhDyB,wBAAwB;AAQlD;;;;GAIG;AACH,0CAHW,iBAAiB,GACf,SAAS,CAmBrB"}
+{"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,4 +1,3 @@
-import { assert } from "../../../core/assert.js";
 import { Sampler2D } from './sampler/Sampler2D.js';
 
 /**
@@ -23,30 +22,12 @@ function canvas2Sampler2D(canvas) {
         context_cache.set(canvas, context);
     }
 
-    const result = new Sampler2D(null, 4, width, height);
-
-    canvasDataToSampler(result, context);
-
-    return result;
-
-}
-
-/**
- *
- * @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 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";