@woosh/meep-engine 2.43.36 → 2.43.38

package/core/bvh2/aabb3/AABB3.js

@@ -37,7 +37,6 @@ export class AABB3 {
         z1 = 0
     ) {
         this.setBounds(x0, y0, z0, x1, y1, z1);
-        this._surfaceArea = -1;
     }
 
     /**
@@ -96,10 +95,7 @@ export class AABB3 {
      * @returns {number}
      */
     getSurfaceArea() {
-        if (typeof this._surfaceArea !== "number" || this._surfaceArea <= 0) {
-            this._surfaceArea = this.computeSurfaceArea();
-        }
-        return this._surfaceArea;
+        return this.computeSurfaceArea();
     }
 
     /**
@@ -128,11 +124,35 @@ export class AABB3 {
      * @param {Number} z1
      */
     setBounds(x0, y0, z0, x1, y1, z1) {
+        /**
+         *
+         * @type {number}
+         */
         this.x0 = x0;
+        /**
+         *
+         * @type {number}
+         */
         this.y0 = y0;
+        /**
+         *
+         * @type {number}
+         */
         this.z0 = z0;
+        /**
+         *
+         * @type {number}
+         */
         this.x1 = x1;
+        /**
+         *
+         * @type {number}
+         */
         this.y1 = y1;
+        /**
+         *
+         * @type {number}
+         */
         this.z1 = z1;
     }
 

package/core/geom/3d/sphere/harmonics/sh3_basis_at.js

@@ -0,0 +1,30 @@
+/**
+ * evaluate the basis functions
+ * shBasis is an Array[ 9 ]
+ *
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @param {number[]|ArrayLike<number>|Float32Array|Float64Array} shBasis
+ */
+export function sh3_basis_at(x, y, z, shBasis) {
+
+    // normal is assumed to be unit length
+
+
+    // band 0
+    shBasis[0] = 0.282095;
+
+    // band 1
+    shBasis[1] = 0.488603 * y;
+    shBasis[2] = 0.488603 * z;
+    shBasis[3] = 0.488603 * x;
+
+    // band 2
+    shBasis[4] = 1.092548 * x * y;
+    shBasis[5] = 1.092548 * y * z;
+    shBasis[6] = 0.315392 * (3 * z * z - 1);
+    shBasis[7] = 1.092548 * x * z;
+    shBasis[8] = 0.546274 * (x * x - y * y);
+
+}

package/core/geom/3d/sphere/harmonics/sh3_sample_by_direction.js

@@ -27,21 +27,22 @@ export function sh3_sample_by_direction(
     let channel_value;
 
     for (let i = 0; i < dimension_count; i++) {
+        const offset = harmonics_offset + dimension_count * i;
 
         // band 0
-        channel_value = harmonics[harmonics_offset + i] * 0.282095;
+        channel_value = harmonics[offset] * 0.282095;
 
         // band 1
-        channel_value += harmonics[harmonics_offset + dimension_count + i] * 0.488603 * y;
-        channel_value += harmonics[harmonics_offset + dimension_count * 2 + i] * 0.488603 * z;
-        channel_value += harmonics[harmonics_offset + dimension_count * 3 + i] * 0.488603 * x;
+        channel_value += harmonics[offset + 1] * 0.488603 * y;
+        channel_value += harmonics[offset + 2] * 0.488603 * z;
+        channel_value += harmonics[offset + 3] * 0.488603 * x;
 
         // band 2
-        channel_value += harmonics[harmonics_offset + dimension_count * 4 + i] * 1.092548 * (x * y);
-        channel_value += harmonics[harmonics_offset + dimension_count * 5 + i] * 1.092548 * (y * z);
-        channel_value += harmonics[harmonics_offset + dimension_count * 6 + i] * 0.315392 * (3.0 * z * z - 1.0);
-        channel_value += harmonics[harmonics_offset + dimension_count * 7 + i] * 1.092548 * (x * z);
-        channel_value += harmonics[harmonics_offset + dimension_count * 8 + i] * 0.546274 * (x * x - y * y);
+        channel_value += harmonics[offset + 4] * 1.092548 * (x * y);
+        channel_value += harmonics[offset + 5] * 1.092548 * (y * z);
+        channel_value += harmonics[offset + 6] * 0.315392 * (3.0 * z * z - 1.0);
+        channel_value += harmonics[offset + 7] * 1.092548 * (x * z);
+        channel_value += harmonics[offset + 8] * 0.546274 * (x * x - y * y);
 
         // write out
         result[result_offset + i] = channel_value;

package/core/primitives/strings/insert_before.js

@@ -0,0 +1,19 @@
+/**
+ *
+ * @param {string} source
+ * @param {string} term
+ * @param {string} extra
+ * @returns {string}
+ */
+export function insert_before(source, term, extra) {
+    const i = source.indexOf(term);
+
+    if (i === -1) {
+        console.warn(`Term '${term}' not found in the source`, source, extra);
+        return source;
+    }
+
+    const injection_position = i;
+
+    return source.slice(0, injection_position) + extra + source.slice(injection_position);
+}

package/core/primitives/strings/insert_before_or_replace.js

@@ -0,0 +1,27 @@
+/**
+ *
+ * @param {string} source
+ * @param {string} insert_term
+ * @param {string} replace_term
+ * @param {string} value
+ * @returns {string}
+ */
+export function insert_before_or_replace(source, insert_term, replace_term, value) {
+    const insert_term_index = source.indexOf(insert_term);
+
+    if (insert_term_index !== -1) {
+        const injection_position = insert_term_index;
+        return source.slice(0, injection_position) + value + source.slice(injection_position);
+    }
+
+    const replace_term_index = source.indexOf(replace_term);
+
+    if (replace_term_index === -1) {
+        // not found
+        console.warn(`Neither insert term '${insert_term}', nor replacement term '${replace_term}' were found in the source`, source, value);
+        return source;
+    }
+
+
+    return source.slice(0, replace_term_index) + value + source.slice(replace_term_index + replace_term.length);
+}

package/engine/asset/CORS/CrossOriginConfig.js

@@ -4,4 +4,8 @@ export class CrossOriginConfig {
     constructor() {
         this.kind = CrossOriginKind.Anonymous;
     }
+
 }
+
+const default_coc = new CrossOriginConfig();
+CrossOriginConfig.default = Object.freeze(default_coc);

package/engine/asset/loaders/ArrayBufferLoader.js

@@ -1,6 +1,8 @@
 import { Asset } from "../Asset.js";
 import { AssetLoader } from "./AssetLoader.js";
 import { CrossOriginKind } from "../CORS/CrossOriginKind.js";
+import { CrossOriginConfig } from "../CORS/CrossOriginConfig.js";
+import { noop } from "../../../core/function/Functions.js";
 
 export class ArrayBufferLoader extends AssetLoader {
     /**
@@ -20,8 +22,8 @@ export class ArrayBufferLoader extends AssetLoader {
         this.__fetch_priority = fetch_priority;
     }
 
-    load(path, success, failure, progress) {
-        const coc = this.assetManager.crossOriginConfig;
+    load(path, success, failure = console.error, progress = noop) {
+        const coc = this.assetManager !== null ? this.assetManager.crossOriginConfig : CrossOriginConfig.default;
 
         const headers = new Headers();
 

package/engine/asset/loaders/image/png/PNG.js

@@ -392,7 +392,9 @@ PNG.prototype.getUint8Data = function () {
     let data;
     let itemSize = 0; // note, can take this from this.colors
 
-    switch (this.colorType) {
+    const color_type = this.colorType;
+
+    switch (color_type) {
         case 0:
             data = this.pixels;
             itemSize = 1;

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

@@ -298,7 +298,7 @@ PNGReader.prototype.interlaceNone = function (data) {
     var bytes_per_pixel = Math.max(1, png.colors * png.bitDepth / 8);
 
     // color bytes per row
-    const cpr = bytes_per_pixel * png.width;
+    const color_bytes_per_row = bytes_per_pixel * png.width;
 
     var pixels = new Uint8Array(bytes_per_pixel * png.width * png.height);
     // var scanline;
@@ -306,7 +306,7 @@ PNGReader.prototype.interlaceNone = function (data) {
 
     const data_length = data.length;
 
-    for (var i = 0; i < data_length; i += cpr + 1) {
+    for (var i = 0; i < data_length; i += color_bytes_per_row + 1) {
 
         const scanline_address = i + 1;
 
@@ -316,25 +316,25 @@ PNGReader.prototype.interlaceNone = function (data) {
 
         switch (header) {
             case 0:
-                this.unFilterNone(data, scanline_address, pixels, bytes_per_pixel, offset, cpr);
+                this.unFilterNone(data, scanline_address, pixels, bytes_per_pixel, offset, color_bytes_per_row);
                 break;
             case 1:
-                this.unFilterSub(data, scanline_address, pixels, bytes_per_pixel, offset, cpr);
+                this.unFilterSub(data, scanline_address, pixels, bytes_per_pixel, offset, color_bytes_per_row);
                 break;
             case 2:
-                this.unFilterUp(data, scanline_address, pixels, bytes_per_pixel, offset, cpr);
+                this.unFilterUp(data, scanline_address, pixels, bytes_per_pixel, offset, color_bytes_per_row);
                 break;
             case 3:
-                this.unFilterAverage(data, scanline_address, pixels, bytes_per_pixel, offset, cpr);
+                this.unFilterAverage(data, scanline_address, pixels, bytes_per_pixel, offset, color_bytes_per_row);
                 break;
             case 4:
-                this.unFilterPaeth(data, scanline_address, pixels, bytes_per_pixel, offset, cpr);
+                this.unFilterPaeth(data, scanline_address, pixels, bytes_per_pixel, offset, color_bytes_per_row);
                 break;
             default:
-                throw new Error("unkown filtered scanline");
+                throw new Error(`unknown filtered scanline type '${header}'`);
         }
 
-        offset += cpr;
+        offset += color_bytes_per_row;
 
     }
 

package/engine/asset/loaders/image/png/prototypePNG.js

@@ -0,0 +1,28 @@
+import sampler2D2Canvas from "../../../../graphics/texture/sampler/Sampler2D2Canvas.js";
+import { ArrayBufferLoader } from "../../ArrayBufferLoader.js";
+import { PNGReader } from "./PNGReader.js";
+import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
+
+const array_loader = new ArrayBufferLoader();
+
+
+
+array_loader.load('moicon/bad_png_01/splat_height_2_messed_up (1).png',(asset)=>{
+
+    const array = asset.create();
+
+    const reader = new PNGReader(array);
+
+    const png = reader.parse();
+
+    console.log(png);
+
+    const uint8Data = png.getUint8Data();
+
+    const sampler = new Sampler2D(uint8Data.data,uint8Data.itemSize,png.getWidth(), png.getHeight());
+
+    const canvas = sampler2D2Canvas(sampler,1,0);
+
+    document.body.appendChild(canvas);
+
+});

package/engine/ecs/transform/Transform.d.ts

@@ -6,7 +6,7 @@ export class Transform {
     public readonly rotation: Quaternion
     public readonly scale: Vector3
 
-    public lookAt(target: Vector3, limit?: number): void
+    public lookAt(target: Vector3): void
 
     static fromJSON(json: {
         position?: { x: number, y: number, z: number },

package/engine/ecs/transform/Transform.js

@@ -11,8 +11,6 @@ import { TransformFlags } from "./TransformFlags.js";
 import { allocate_transform_m4 } from "../../graphics/ecs/mesh-v2/allocate_transform_m4.js";
 import { assert } from "../../../core/assert.js";
 
-const delta = new Vector3();
-
 const scratch_buffer = new ArrayBuffer(16 * 4);
 
 const m4_0 = new Float32Array(scratch_buffer, 0, 16);
@@ -146,14 +144,24 @@ export class Transform {
     /**
      *
      * @param {Vector3} target
-     * @param {number} [limit] Maximum angular displacement allowed towards the target, no limit by default. Useful for animating rotation towards a desired target.
      */
-    lookAt(target, limit = Number.POSITIVE_INFINITY) {
+    lookAt(target) {
+
+        const position = this.position;
 
-        delta.copy(target);
-        delta.sub(this.position);
+        const delta_x = target.x - position.x;
+        const delta_y = target.y - position.y;
+        const delta_z = target.z - position.z;
+
+        if (delta_x === 0 && delta_y === 0 && delta_z === 0) {
+            // target is at the same location as this transform, no valid rotation, keep whatever we have
+            return;
+        }
 
-        Transform.adjustRotation(this.rotation, delta, limit);
+        this.rotation._lookRotation(
+            delta_x, delta_y, delta_z,
+            Vector3.up.x, Vector3.up.y, Vector3.up.z
+        );
     }
 
     fromJSON(json) {

package/engine/graphics/sh3/LightProbeVolume.js

@@ -29,40 +29,10 @@ import { build_three_object } from "../ecs/mesh-v2/build_three_object.js";
 import { ShadedGeometryFlags } from "../ecs/mesh-v2/ShadedGeometryFlags.js";
 import { v3_length_sqr } from "../../../core/geom/v3_length_sqr.js";
 import { sh3_dering_optimize_positive } from "../../../core/geom/3d/sphere/harmonics/sh3_dering_optimize_positive.js";
+import { sh3_basis_at } from "../../../core/geom/3d/sphere/harmonics/sh3_basis_at.js";
 
 const TEMP_CONTACT = new SurfacePoint3();
 
-/**
- * evaluate the basis functions
- * shBasis is an Array[ 9 ]
- *
- * @param {number} x
- * @param {number} y
- * @param {number} z
- * @param {number[]|ArrayLike<number>|Float32Array|Float64Array} shBasis
- */
-function getBasisAt(x, y, z, shBasis) {
-
-    // normal is assumed to be unit length
-
-
-    // band 0
-    shBasis[0] = 0.282095;
-
-    // band 1
-    shBasis[1] = 0.488603 * y;
-    shBasis[2] = 0.488603 * z;
-    shBasis[3] = 0.488603 * x;
-
-    // band 2
-    shBasis[4] = 1.092548 * x * y;
-    shBasis[5] = 1.092548 * y * z;
-    shBasis[6] = 0.315392 * (3 * z * z - 1);
-    shBasis[7] = 1.092548 * x * z;
-    shBasis[8] = 0.546274 * (x * x - y * y);
-
-}
-
 /**
  *
  * @param {Uint8Array} data
@@ -160,7 +130,7 @@ function fromCubeRenderTarget(data, renderer, cubeRenderTarget) {
             normal_z /= length;
 
             // evaluate SH basis functions in direction dir
-            getBasisAt(normal_x, normal_y, normal_z, sh_basis);
+            sh3_basis_at(normal_x, normal_y, normal_z, sh_basis);
 
             // pixel color, already in linear space so no sRGB->Linear conversion necessary
 
@@ -266,7 +236,7 @@ class CubeRenderer {
             //
             //     object3D.material.color.copy(source_material.color);
             // } else {
-                object3D.material = source_material.clone();
+            object3D.material = source_material.clone();
             // }
 
             applyTransformToThreeObject(object3D, t);

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.43.36",
+  "version": "2.43.38",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",