@woosh/meep-engine 2.47.1 → 2.47.2

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

@@ -78,11 +78,6 @@ export class Sampler2D {
          * @type {number}
          */
         this.version = 0;
-        /**
-         * @readonly
-         * @type {boolean}
-         */
-        this.isSampler2D = true;
     }
 
     /**
@@ -113,7 +108,7 @@ export class Sampler2D {
 
         if (l === 0) {
             //no data
-            return undefined;
+            return;
         }
 
         let bestValue = data[channel];
@@ -139,8 +134,6 @@ export class Sampler2D {
         if (resultCount < result.length) {
             result.splice(resultCount, result.length - resultCount);
         }
-
-        return;
     }
 
     /**
@@ -639,74 +632,6 @@ export class Sampler2D {
         result.set(x, y);
     }
 
-    /**
-     *
-     * @param {number} scale
-     * @param {number} offset
-     * @return {function(index:int, array:ArrayLike, x:int, y:int)}
-     */
-    makeArrayFiller(scale, offset) {
-        scale = scale || 255;
-        offset = offset || 0;
-
-        const sampler = this;
-        const v4 = [1 / scale, 1 / scale, 1 / scale, 1 / scale];
-
-        //
-        function fillDD1(index, array, x, y) {
-            const val = (sampler.sampleChannelBilinear(x, y, 0) + offset) * scale | 0;
-            array[index] = val;
-            array[index + 1] = val;
-            array[index + 2] = val;
-            array[index + 3] = 255;
-        }
-
-        function fillDD2(index, array, x, y) {
-            sampler.sampleBilinear(x, y, v4, 0);
-            const val = (v4[0] + offset) * scale | 0;
-            array.fill(val, index, index + 3);
-            array[index + 3] = (v4[1] + offset) * scale | 0;
-        }
-
-        function fillDD3(index, array, x, y) {
-
-            sampler.sampleBilinear(x, y, v4, 0);
-
-            array[index] = (v4[0] + offset) * scale | 0;
-            array[index + 1] = (v4[1] + offset) * scale | 0;
-            array[index + 2] = (v4[2] + offset) * scale | 0;
-            array[index + 3] = 255;
-        }
-
-        function fillDD4(index, array, x, y) {
-            sampler.sampleBilinear(x, y, v4, 0);
-            array[index] = (v4[0] + offset) * scale | 0;
-            array[index + 1] = (v4[1] + offset) * scale | 0;
-            array[index + 2] = (v4[2] + offset) * scale | 0;
-            array[index + 3] = (v4[3] + offset) * scale | 0;
-        }
-
-        let fillDD;
-        switch (sampler.itemSize) {
-            case 1:
-                fillDD = fillDD1;
-                break;
-            case 2:
-                fillDD = fillDD2;
-                break;
-            case 3:
-                fillDD = fillDD3;
-                break;
-            case 4:
-                fillDD = fillDD4;
-                break;
-            default :
-                throw new Error("unsupported item size");
-                break;
-        }
-        return fillDD;
-    }
-
     /**
      * Copy a patch from another sampler with a margin.
      * This is useful for texture rendering where filtering can cause bleeding along the edges of the patch.
@@ -1283,28 +1208,7 @@ export class Sampler2D {
      * @param {BinaryBuffer} buffer
      */
     toBinaryBuffer(buffer) {
-        const width = this.width;
-        const height = this.height;
-
-        const itemSize = this.itemSize;
-
-        buffer.writeUint16(width);
-        buffer.writeUint16(height);
-
-        buffer.writeUint8(itemSize);
-
-        if (this.data instanceof Uint8Array) {
-            //data type
-            buffer.writeUint8(0);
-
-
-            const byteSize = width * height * itemSize;
-
-            buffer.writeBytes(this.data, 0, byteSize);
-
-        } else {
-            throw new TypeError(`Unsupported data type`);
-        }
+        throw new Error('Deprecated, use Sampler2DSerializationAdapter instead');
     }
 
     /**
@@ -1312,24 +1216,7 @@ export class Sampler2D {
      * @param {BinaryBuffer} buffer
      */
     fromBinaryBuffer(buffer) {
-        this.width = buffer.readUint16();
-        this.height = buffer.readUint16();
-
-        this.itemSize = buffer.readUint8();
-
-        const dataType = buffer.readUint8();
-
-        if (dataType === 0) {
-
-            const numBytes = this.height * this.width * this.itemSize;
-            this.data = new Uint8Array(numBytes);
-
-            buffer.readBytes(this.data, 0, numBytes);
-
-            this.version++;
-        } else {
-            throw new TypeError(`Unsupported data type (${dataType})`);
-        }
+        throw new Error('Deprecated, use Sampler2DSerializationAdapter instead');
     }
 
     /**
@@ -1574,6 +1461,11 @@ export class Sampler2D {
 
 }
 
+/**
+ * @readonly
+ * @type {boolean}
+ */
+Sampler2D.prototype.isSampler2D = true;
 
 /**
  * Based on code from reddit https://www.reddit.com/r/javascript/comments/jxa8x/bicubic_interpolation/

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

@@ -12,7 +12,7 @@ import { sampler2d_write_to_canvas_raw } from "./sampler2d_write_to_canvas_raw.j
  * @param {Number} [scale]
  * @param {Number} [offset]
  * @param {HTMLCanvasElement} [canvas] if no canvas is supplied, a new one will be created
- * @param {function(index:int, array:ArrayLike<number>, x:int, y:int)} [fillDD] allows you to supply mapping function, if none is given - one will be created from sampler using {@link Sampler2D#makeArrayFiller}
+ * @param {function(index:int, array:ArrayLike<number>, x:int, y:int)} [fillDD] allows you to supply mapping function, if none is given - one will be created from sampler
  * @returns {HTMLCanvasElement} canvas
  */
 function convertSampler2D2Canvas(sampler, scale = 255, offset = 0, canvas, fillDD) {

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

@@ -0,0 +1,65 @@
+/**
+ *
+ * @param {Sampler2D} sampler
+ * @param {number} scale
+ * @param {number} offset
+ * @return {function(index:int, array:ArrayLike, x:int, y:int)}
+ */
+export function sampler2d_make_array_filler_function(sampler, scale=255, offset=0){
+
+    const v4 = [1 / scale, 1 / scale, 1 / scale, 1 / scale];
+
+    //
+    function fillDD1(index, array, x, y) {
+        const val = (sampler.sampleChannelBilinear(x, y, 0) + offset) * scale | 0;
+        array[index] = val;
+        array[index + 1] = val;
+        array[index + 2] = val;
+        array[index + 3] = 255;
+    }
+
+    function fillDD2(index, array, x, y) {
+        sampler.sampleBilinear(x, y, v4, 0);
+        const val = (v4[0] + offset) * scale | 0;
+        array.fill(val, index, index + 3);
+        array[index + 3] = (v4[1] + offset) * scale | 0;
+    }
+
+    function fillDD3(index, array, x, y) {
+
+        sampler.sampleBilinear(x, y, v4, 0);
+
+        array[index] = (v4[0] + offset) * scale | 0;
+        array[index + 1] = (v4[1] + offset) * scale | 0;
+        array[index + 2] = (v4[2] + offset) * scale | 0;
+        array[index + 3] = 255;
+    }
+
+    function fillDD4(index, array, x, y) {
+        sampler.sampleBilinear(x, y, v4, 0);
+        array[index] = (v4[0] + offset) * scale | 0;
+        array[index + 1] = (v4[1] + offset) * scale | 0;
+        array[index + 2] = (v4[2] + offset) * scale | 0;
+        array[index + 3] = (v4[3] + offset) * scale | 0;
+    }
+
+    let fillDD;
+    switch (sampler.itemSize) {
+        case 1:
+            fillDD = fillDD1;
+            break;
+        case 2:
+            fillDD = fillDD2;
+            break;
+        case 3:
+            fillDD = fillDD3;
+            break;
+        case 4:
+            fillDD = fillDD4;
+            break;
+        default :
+            throw new Error("unsupported item size");
+            break;
+    }
+    return fillDD;
+}

package/src/engine/ui/tiles2d/computeTileGridMove.js

@@ -16,8 +16,8 @@ import { aabb2_contains, aabb2_overlapExists } from "../../../core/geom/AABB2.js
  * @returns {TileMoveProgram}
  */
 export function computeTileGridMove(tile, targetX, targetY, source, target) {
-    assert.typeOf(targetX, 'number', 'targetX');
-    assert.typeOf(targetY, 'number', 'targetY');
+    assert.isNumber(targetX, 'targetX');
+    assert.isNumber(targetY, 'targetY');
 
     assert.defined(tile, 'tile');
     assert.defined(source, 'source');