@woosh/meep-engine 2.72.0 → 2.74.0

package/build/meep.module.js

@@ -69586,9 +69586,8 @@ class ThreadedImageDecoder extends Codec {
         return true;
     }
 
-    async decode(data) {
-        const result = await this.worker.request('decode', [data.buffer]);
-        return result;
+    decode(data) {
+        return this.worker.request('decode', [data.buffer]);
     }
 }
 
@@ -69621,7 +69620,8 @@ class NativeImageDecoder extends Codec {
         const image = new Image();
 
         // convert binary data to image URL that we can load
-        const url = URL.createObjectURL(new Blob([data]));
+        const blob = new Blob([data]);
+        const url = URL.createObjectURL(blob);
 
         image.src = url;
 
@@ -111512,7 +111512,7 @@ function aabb3_matrix4_project_by_corners(
     result[5] = z1;
 }
 
-const corners = [];
+const corners$1 = [];
 
 class Decal extends AbstractLight {
     constructor() {
@@ -111598,9 +111598,9 @@ class Decal extends AbstractLight {
     }
 
     getAABB(result) {
-        aabb3_build_corners(corners, 0, -0.5, -0.5, -0.5, 0.5, 0.5, 0.5);
+        aabb3_build_corners(corners$1, 0, -0.5, -0.5, -0.5, 0.5, 0.5, 0.5);
 
-        aabb3_matrix4_project_by_corners(result, corners, this.transform);
+        aabb3_matrix4_project_by_corners(result, corners$1, this.transform);
     }
 
     toArray(destination, address) {
@@ -113432,190 +113432,41 @@ class ForwardPlusRenderingPlugin extends EnginePlugin {
  */
 
 
-const projectInWorldSpace = (function () {
-    const corners = [
-        new Vector3(-1, -1, 0),
-        new Vector3(-1, -1, 0),
-
-        new Vector3(-1, 1, 0),
-        new Vector3(-1, 1, 0),
-
-        new Vector3(1, -1, 0),
-        new Vector3(1, -1, 0),
-
-        new Vector3(1, 1, 0),
-        new Vector3(1, 1, 0)
-    ];
-
-
-    /**
-     *
-     * @param {Number} nearZ
-     * @param {Number} farZ
-     * @param {THREE.Camera} camera
-     * @param {THREE.Matrix4} matrixWorldInverse
-     * @param {function} callback
-     */
-    function projectInWorldSpace(nearZ, farZ, camera, callback) {
-        corners[0].set(-1, -1, nearZ);
-        corners[1].set(-1, -1, farZ);
-
-        corners[2].set(-1, 1, nearZ);
-        corners[3].set(-1, 1, farZ);
-
-        corners[4].set(1, -1, nearZ);
-        corners[5].set(1, -1, farZ);
-
-        corners[6].set(1, 1, nearZ);
-        corners[7].set(1, 1, farZ);
-
-        //compute corners of view frustum in light space
-        let x0 = Number.POSITIVE_INFINITY;
-        let y0 = Number.POSITIVE_INFINITY;
-        let z0 = Number.POSITIVE_INFINITY;
-
-        let x1 = Number.NEGATIVE_INFINITY;
-        let y1 = Number.NEGATIVE_INFINITY;
-        let z1 = Number.NEGATIVE_INFINITY;
+const corners = [
+    new Vector3(-1, -1, 0),
+    new Vector3(-1, -1, 0),
 
+    new Vector3(-1, 1, 0),
+    new Vector3(-1, 1, 0),
 
-        for (let i = 0; i < 8; i++) {
-            const corner = corners[i];
-            corner.unproject(camera);
+    new Vector3(1, -1, 0),
+    new Vector3(1, -1, 0),
 
-            if (corner.x < x0) {
-                x0 = corner.x;
-            }
-            if (corner.x > x1) {
-                x1 = corner.x;
-            }
-
-            if (corner.y < y0) {
-                y0 = corner.y;
-            }
-            if (corner.y > y1) {
-                y1 = corner.y;
-            }
-
-            if (corner.z < z0) {
-                z0 = corner.z;
-            }
-            if (corner.z > z1) {
-                z1 = corner.z;
-            }
-        }
-
-        callback(x0, y0, z0, x1, y1, z1);
-    }
-
-    return projectInWorldSpace;
-})();
-
-const project = (function () {
-    const corners = [
-        new Vector3(-1, -1, 0),
-        new Vector3(-1, -1, 0),
-
-        new Vector3(-1, 1, 0),
-        new Vector3(-1, 1, 0),
-
-        new Vector3(1, -1, 0),
-        new Vector3(1, -1, 0),
-
-        new Vector3(1, 1, 0),
-        new Vector3(1, 1, 0)
-    ];
-
-
-    /**
-     *
-     * @param {Number} nearZ
-     * @param {Number} farZ
-     * @param {THREE.Camera} camera
-     * @param {THREE.Matrix4} matrixWorldInverse
-     * @param {AABB3} result
-     */
-    function project(nearZ, farZ, camera, matrixWorldInverse, result) {
-        corners[0].set(-1, -1, nearZ);
-        corners[1].set(-1, -1, farZ);
-
-        corners[2].set(-1, 1, nearZ);
-        corners[3].set(-1, 1, farZ);
-
-        corners[4].set(1, -1, nearZ);
-        corners[5].set(1, -1, farZ);
-
-        corners[6].set(1, 1, nearZ);
-        corners[7].set(1, 1, farZ);
-
-        //compute corners of view frustum in light space
-        let x0 = Number.POSITIVE_INFINITY;
-        let y0 = Number.POSITIVE_INFINITY;
-        let z0 = Number.POSITIVE_INFINITY;
-
-        let x1 = Number.NEGATIVE_INFINITY;
-        let y1 = Number.NEGATIVE_INFINITY;
-        let z1 = Number.NEGATIVE_INFINITY;
-
-
-        for (let i = 0; i < 8; i++) {
-            const corner = corners[i];
-            corner.unproject(camera);
-            corner.applyMatrix4(matrixWorldInverse);
-
-            if (corner.x < x0) {
-                x0 = corner.x;
-            }
-            if (corner.x > x1) {
-                x1 = corner.x;
-            }
-
-            if (corner.y < y0) {
-                y0 = corner.y;
-            }
-            if (corner.y > y1) {
-                y1 = corner.y;
-            }
-
-            if (corner.z < z0) {
-                z0 = corner.z;
-            }
-            if (corner.z > z1) {
-                z1 = corner.z;
-            }
-        }
-
-        result.setBounds(x0, y0, z0, x1, y1, z1);
-    }
+    new Vector3(1, 1, 0),
+    new Vector3(1, 1, 0)
+];
 
-    return project;
-})();
 
 /**
  *
- * @param _x0
- * @param _y0
- * @param _z0
- * @param _x1
- * @param _y1
- * @param _z1
- * @param {Camera} camera
- * @param callback
+ * @param {Number} nearZ
+ * @param {Number} farZ
+ * @param {THREE.Camera} camera
+ * @param {THREE.Matrix4} matrixWorldInverse
+ * @param {AABB3} result
  */
-function unproject(_x0, _y0, _z0, _x1, _y1, _z1, camera, callback) {
-    const corners = [
-        new Vector3(_x0, _y0, _z0),
-        new Vector3(_x0, _y0, _z1),
+function project(nearZ, farZ, camera, matrixWorldInverse, result) {
+    corners[0].set(-1, -1, nearZ);
+    corners[1].set(-1, -1, farZ);
 
-        new Vector3(_x0, _y1, _z0),
-        new Vector3(_x0, _y1, _z1),
+    corners[2].set(-1, 1, nearZ);
+    corners[3].set(-1, 1, farZ);
 
-        new Vector3(_x1, _y0, _z0),
-        new Vector3(_x1, _y0, _z1),
+    corners[4].set(1, -1, nearZ);
+    corners[5].set(1, -1, farZ);
 
-        new Vector3(_x1, _y1, _z0),
-        new Vector3(_x1, _y1, _z1)
-    ];
+    corners[6].set(1, 1, nearZ);
+    corners[7].set(1, 1, farZ);
 
     //compute corners of view frustum in light space
     let x0 = Number.POSITIVE_INFINITY;
@@ -113627,8 +113478,10 @@ function unproject(_x0, _y0, _z0, _x1, _y1, _z1, camera, callback) {
     let z1 = Number.NEGATIVE_INFINITY;
 
 
-    corners.forEach(function (corner) {
-        corner.project(camera);
+    for (let i = 0; i < 8; i++) {
+        const corner = corners[i];
+        corner.unproject(camera);
+        corner.applyMatrix4(matrixWorldInverse);
 
         if (corner.x < x0) {
             x0 = corner.x;
@@ -113650,21 +113503,17 @@ function unproject(_x0, _y0, _z0, _x1, _y1, _z1, camera, callback) {
         if (corner.z > z1) {
             z1 = corner.z;
         }
-    });
+    }
 
-    callback(x0, y0, z0, x1, y1, z1);
+    result.setBounds(x0, y0, z0, x1, y1, z1);
 }
 
+
 var FrustumProjector = {
     /**
      * @deprecated use non-threejs specific code
      */
     project,
-    unproject,
-    /**
-     * @deprecated use non-threejs specific code
-     */
-    projectInWorldSpace
 };
 
 class SystemEntityContext {

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.72.0",
+  "version": "2.74.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {
@@ -39,7 +39,8 @@
     "gl-matrix": "3.4.3",
     "opentype.js": "1.3.3",
     "robust-predicates": "3.0.1",
-    "simplex-noise": "2.4.0"
+    "simplex-noise": "2.4.0",
+    "pako": "2.0.3"
   },
   "peerDependencies": {
     "three": ">=0.135.0 & <0.137.0"

package/src/engine/asset/loaders/image/codec/NativeImageDecoder.js

@@ -29,7 +29,8 @@ export class NativeImageDecoder extends Codec {
         const image = new Image();
 
         // convert binary data to image URL that we can load
-        const url = URL.createObjectURL(new Blob([data]));
+        const blob = new Blob([data]);
+        const url = URL.createObjectURL(blob);
 
         image.src = url;
 

package/src/engine/asset/loaders/image/codec/ThreadedImageDecoder.js

@@ -1,7 +1,7 @@
-import { Codec } from "./Codec.js";
-import WorkerBuilder from "../../../../../core/process/worker/WorkerBuilder.js";
 import { OnDemandWorkerManager } from "../../../../../core/process/worker/OnDemandWorkerManager.js";
+import WorkerBuilder from "../../../../../core/process/worker/WorkerBuilder.js";
 import { PNG_HEADER_BYTES } from "../png/PNG_HEADER_BYTES.js";
+import { Codec } from "./Codec.js";
 
 export class ThreadedImageDecoder extends Codec {
     constructor() {
@@ -35,8 +35,7 @@ export class ThreadedImageDecoder extends Codec {
         return true;
     }
 
-    async decode(data) {
-        const result = await this.worker.request('decode', [data.buffer]);
-        return result;
+    decode(data) {
+        return this.worker.request('decode', [data.buffer]);
     }
 }

package/src/engine/asset/loaders/image/png/PNGReader.js

@@ -2,13 +2,13 @@
 "use strict";
 
 import zlib from 'pako';
-
-import { PNG } from './PNG.js';
 import { BinaryBuffer } from "../../../../../core/binary/BinaryBuffer.js";
 import { isArrayEqualStrict } from "../../../../../core/collection/array/isArrayEqualStrict.js";
-import { PNG_HEADER_BYTES } from "./PNG_HEADER_BYTES.js";
 import { crc } from "./crc.js";
 
+import { PNG } from './PNG.js';
+import { PNG_HEADER_BYTES } from "./PNG_HEADER_BYTES.js";
+
 /**
  *
  * @param {Uint8Array} buffer
@@ -217,7 +217,7 @@ PNGReader.prototype.decodeiEXt = function (chunk) {
  * Interlace method    1 byte
  */
 PNGReader.prototype.decodeIHDR = function (chunk) {
-    var png = this.png;
+    const png = this.png;
 
     png.setWidth(readUInt32(chunk, 0));
     png.setHeight(readUInt32(chunk, 4));
@@ -263,7 +263,7 @@ PNGReader.prototype.decodeIEND = function () {
  * Uncompress IDAT chunks
  */
 PNGReader.prototype.decodePixels = function () {
-    var png = this.png;
+    const png = this.png;
 
     const inflator = new zlib.Inflate();
 
@@ -292,21 +292,25 @@ PNGReader.prototype.decodePixels = function () {
 
 PNGReader.prototype.interlaceNone = function (data) {
 
-    var png = this.png;
+    const png = this.png;
 
-    // bytes per pixel
-    var bytes_per_pixel = Math.max(1, png.colors * png.bitDepth / 8);
+    const bits_per_pixel = png.bitDepth;
+    const bits_per_line = png.colors * bits_per_pixel;
+    const bytes_per_pixel = Math.max(1, bits_per_line / 8);
+
+    const width = png.width;
+    const height = png.height;
 
     // color bytes per row
-    const color_bytes_per_row = bytes_per_pixel * png.width;
+    const color_bytes_per_row = bytes_per_pixel * width;
+
+    const pixels = new Uint8Array(bytes_per_pixel * width * height);
 
-    var pixels = new Uint8Array(bytes_per_pixel * png.width * png.height);
-    // var scanline;
-    var offset = 0;
+    let offset = 0;
 
     const data_length = data.length;
 
-    for (var i = 0; i < data_length; i += color_bytes_per_row + 1) {
+    for (let i = 0; i < data_length; i += color_bytes_per_row + 1) {
 
         const scanline_address = i + 1;
 
@@ -367,7 +371,7 @@ PNGReader.prototype.unFilterNone = function (scanline, scanline_offset, pixels,
  * Sub(x) = Raw(x) + Raw(x - bpp)
  */
 PNGReader.prototype.unFilterSub = function (scanline, scanline_offset, pixels, bpp, of, length) {
-    var i = 0;
+    let i = 0;
 
     for (; i < bpp; i++) {
         pixels[of + i] = scanline[i + scanline_offset];
@@ -387,7 +391,7 @@ PNGReader.prototype.unFilterSub = function (scanline, scanline_offset, pixels, b
  * Up(x) = Raw(x) + Prior(x)
  */
 PNGReader.prototype.unFilterUp = function (scanline, scanline_offset, pixels, bpp, of, length) {
-    var i = 0, byte, prev;
+    let i = 0, byte, prev;
     // Prior(x) is 0 for all x on the first scanline
     if ((of - length) < 0) for (; i < length; i++) {
         pixels[of + i] = scanline[i + scanline_offset];
@@ -406,7 +410,7 @@ PNGReader.prototype.unFilterUp = function (scanline, scanline_offset, pixels, bp
  * Average(x) = Raw(x) + floor((Raw(x-bpp)+Prior(x))/2)
  */
 PNGReader.prototype.unFilterAverage = function (scanline, scanline_offset, pixels, bpp, of, length) {
-    var i = 0, byte, prev, prior;
+    let i = 0, byte, prev, prior;
     if ((of - length) < 0) {
         // Prior(x) == 0 && Raw(x - bpp) == 0
         for (; i < bpp; i++) {
@@ -460,7 +464,7 @@ PNGReader.prototype.unFilterAverage = function (scanline, scanline_offset, pixel
  *  end
  */
 PNGReader.prototype.unFilterPaeth = function (scanline, scanline_offset, pixels, bpp, of, length) {
-    var i = 0, raw, a, b, c, p, pa, pb, pc, pr;
+    let i = 0, raw, a, b, c, p, pa, pb, pc, pr;
     if ((of - length) < 0) {
         // Prior(x) == 0 && Raw(x - bpp) == 0
         for (; i < bpp; i++) {
@@ -525,7 +529,7 @@ PNGReader.prototype.parse = function () {
     this.decodeHeader();
 
     while (this.buffer.position < this.buffer.length) {
-        var type = this.decodeChunk();
+        const type = this.decodeChunk();
         // stop after IHDR chunk, or after IEND
         // if (type === 'IHDR' && options.data === false || type === 'IEND') break;
         if (type === 'IEND') {
@@ -533,7 +537,7 @@ PNGReader.prototype.parse = function () {
         }
     }
 
-    var png = this.png;
+    const png = this.png;
 
     this.decodePixels();