@woosh/meep-engine 2.75.2 → 2.75.4

package/build/meep.module.js

@@ -3904,65 +3904,6 @@ let Quaternion$1 = class Quaternion {
         result.set(psi, theta, phi);
     }
 
-    /**
-     *
-     * @param {Matrix4} m
-     */
-    threeSetRotationMatrix(m) {
-        throw new Error('Deprecated');
-    }
-
-    /**
-     * Read out rotation into a matrix
-     * @param {Array<Number>} elements
-     */
-    setRotationMatrix(elements) {
-        const x = this.x;
-        const y = this.y;
-        const z = this.z;
-        const w = this.w;
-
-        const x2 = x + x;
-        const y2 = y + y;
-        const z2 = z + z;
-
-        const xx = x * x2;
-        const xy = x * y2;
-        const xz = x * z2;
-
-        const yy = y * y2;
-        const yz = y * z2;
-        const zz = z * z2;
-
-        const wx = w * x2;
-        const wy = w * y2;
-        const wz = w * z2;
-
-        // set 3x3 rotation matrix
-        elements[0] = 1 - (yy + zz);
-        elements[4] = xy - wz;
-        elements[8] = xz + wy;
-
-        elements[1] = xy + wz;
-        elements[5] = 1 - (xx + zz);
-        elements[9] = yz - wx;
-
-        elements[2] = xz - wy;
-        elements[6] = yz + wx;
-        elements[10] = 1 - (xx + yy);
-
-        // last column
-        elements[3] = 0;
-        elements[7] = 0;
-        elements[11] = 0;
-
-        // bottom row
-        elements[12] = 0;
-        elements[13] = 0;
-        elements[14] = 0;
-        elements[15] = 1;
-    }
-
     /**
      * XYZ order
      * @source: https://stackoverflow.com/questions/12088610/conversion-between-euler-quaternion-like-in-unity3d-engine
@@ -69482,6 +69423,61 @@ class CodecWithFallback extends Codec {
     }
 }
 
+/**
+ *
+ * @param {Image|ImageBitmap|HTMLImageElement} img
+ * @returns {Uint8Array}
+ */
+function decode(img) {
+    const imgWidth = img.width;
+    const imgHeight = img.height;
+
+    //
+    const canvas = document.createElement('canvas');
+
+    canvas.width = imgWidth;
+    canvas.height = imgHeight;
+
+    const context = canvas.getContext('2d');
+
+    context.drawImage(img, 0, 0, imgWidth, imgHeight);
+
+    const imgd = context.getImageData(0, 0, imgWidth, imgHeight);
+
+    return imgd.data;
+}
+
+class NativeImageDecoder extends Codec {
+    async decode(data) {
+        const image = new Image();
+
+        // convert binary data to image URL that we can load
+        const blob = new Blob([data]);
+        const url = URL.createObjectURL(blob);
+
+        image.src = url;
+
+        // give browser a chance to decode image in async
+        await image.decode();
+
+        const rgba_data = decode(image);
+
+        const width = image.width;
+        const height = image.height;
+
+        // release resources
+        URL.revokeObjectURL(url);
+
+        return {
+            data: rgba_data,
+            width: width,
+            height: height,
+            itemSize: 4,
+            bitDepth: 8
+        };
+    }
+}
+
 class OnDemandWorkerManager {
 
     /**
@@ -69697,7 +69693,7 @@ class ImageRGBADataLoader extends AssetLoader {
 
         this.decoder = new CodecWithFallback(
             new ThreadedImageDecoder(),
-            // new NativeImageDecoder()
+            new NativeImageDecoder()
         );
     }
 

package/package.json

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

package/src/core/geom/3d/ray/ray_computeNearestPointToPoint.js

@@ -14,7 +14,13 @@ import { v3_dot } from "../../vec3/v3_dot.js";
  * @param {number} pz
  * @returns {number} distance from origin, negative means that the point lies behind the origin in the direction opposite to the ray's own
  */
-export function ray_computeNearestPointToPoint(result, origin_x, origin_y, origin_z, direction_x, direction_y, direction_z, px, py, pz) {
+export function ray_computeNearestPointToPoint(
+    result,
+    origin_x, origin_y, origin_z,
+    direction_x, direction_y, direction_z,
+    px, py, pz
+) {
+
     // find closest point
     const sp0_x = px - origin_x;
     const sp0_y = py - origin_y;

package/src/core/geom/3d/topology/simplify/compute_face_normal_change_dot_product.js

@@ -1,7 +1,7 @@
 import { v3_dot } from "../../../vec3/v3_dot.js";
-import { compute_triangle_normal } from "../../compute_triangle_normal.js";
+import { v3_compute_triangle_normal } from "../../v3_compute_triangle_normal.js";
 
-const scratch_normal = new Float32Array(3);
+const scratch_normal = new Float32Array(6);
 
 /**
  * Used to detect face normal flips for mesh optimization.
@@ -38,44 +38,24 @@ export function compute_face_normal_change_dot_product(face, vertex_old, vertex_
         v2 = vertex_new;
     }
 
-    // compute cross product for new face
-    const vAx = v0.x
-    const vAy = v0.y
-    const vAz = v0.z
-
-    const vBx = v1.x
-    const vBy = v1.y
-    const vBz = v1.z
-
-    const vCx = v2.x
-    const vCy = v2.y
-    const vCz = v2.z
-
-    //compute CB and AB vectors
-    const vCBx = vCx - vBx;
-    const vCBy = vCy - vBy;
-    const vCBz = vCz - vBz;
-
-    const vABx = vAx - vBx;
-    const vABy = vAy - vBy;
-    const vABz = vAz - vBz;
-
-    //compute triangle normal
-    const crossX = vCBy * vABz - vCBz * vABy;
-    const crossY = vCBz * vABx - vCBx * vABz;
-    const crossZ = vCBx * vABy - vCBy * vABx;
-
-    // compute face normal
-    const vertices = face.vertices;
-
-    const vA = vertices[0];
-    const vB = vertices[1];
-    const vC = vertices[2];
-
-    compute_triangle_normal(scratch_normal, vA, vB, vC);
+    // compute modified face normal
+    v3_compute_triangle_normal(
+        scratch_normal, 0,
+        v0.x, v0.y, v0.z,
+        v1.x, v1.y, v1.z,
+        v2.x, v2.y, v2.z
+    )
+
+    // compute current face normal
+    v3_compute_triangle_normal(
+        scratch_normal, 3,
+        original_v0.x, original_v0.y, original_v0.z,
+        original_v1.x, original_v1.y, original_v1.z,
+        original_v2.x, original_v2.y, original_v2.z
+    )
 
     return v3_dot(
-        crossX, crossY, crossZ,
-        scratch_normal[0], scratch_normal[1], scratch_normal[2]
+        scratch_normal[0], scratch_normal[1], scratch_normal[2],
+        scratch_normal[3], scratch_normal[4], scratch_normal[5]
     );
 }

package/src/core/geom/3d/v3_compute_triangle_normal.js

@@ -2,7 +2,7 @@ import { v3_length_sqr } from "../vec3/v3_length_sqr.js";
 
 /**
  *
- * @param {number[]} result
+ * @param {number[]|Float32Array} result
  * @param {number} result_offset
  * @param {number} vAx
  * @param {number} vAy

package/src/core/geom/Quaternion.js

@@ -659,65 +659,6 @@ class Quaternion {
         result.set(psi, theta, phi);
     }
 
-    /**
-     *
-     * @param {Matrix4} m
-     */
-    threeSetRotationMatrix(m) {
-        throw new Error('Deprecated');
-    }
-
-    /**
-     * Read out rotation into a matrix
-     * @param {Array<Number>} elements
-     */
-    setRotationMatrix(elements) {
-        const x = this.x;
-        const y = this.y;
-        const z = this.z;
-        const w = this.w;
-
-        const x2 = x + x;
-        const y2 = y + y;
-        const z2 = z + z;
-
-        const xx = x * x2;
-        const xy = x * y2;
-        const xz = x * z2;
-
-        const yy = y * y2;
-        const yz = y * z2;
-        const zz = z * z2;
-
-        const wx = w * x2;
-        const wy = w * y2;
-        const wz = w * z2;
-
-        // set 3x3 rotation matrix
-        elements[0] = 1 - (yy + zz);
-        elements[4] = xy - wz;
-        elements[8] = xz + wy;
-
-        elements[1] = xy + wz;
-        elements[5] = 1 - (xx + zz);
-        elements[9] = yz - wx;
-
-        elements[2] = xz - wy;
-        elements[6] = yz + wx;
-        elements[10] = 1 - (xx + yy);
-
-        // last column
-        elements[3] = 0;
-        elements[7] = 0;
-        elements[11] = 0;
-
-        // bottom row
-        elements[12] = 0;
-        elements[13] = 0;
-        elements[14] = 0;
-        elements[15] = 1;
-    }
-
     /**
      * XYZ order
      * @source: https://stackoverflow.com/questions/12088610/conversion-between-euler-quaternion-like-in-unity3d-engine

package/src/engine/asset/loaders/image/ImageRGBADataLoader.js

@@ -4,6 +4,7 @@ import { GameAssetType } from "../../GameAssetType.js";
 import { ArrayBufferLoader } from "../ArrayBufferLoader.js";
 import { AssetLoader } from "../AssetLoader.js";
 import { CodecWithFallback } from "./codec/CodecWithFallback.js";
+import { NativeImageDecoder } from "./codec/NativeImageDecoder.js";
 import { ThreadedImageDecoder } from "./codec/ThreadedImageDecoder.js";
 import { ImageRGBADataAsset } from "./ImageRGBADataAsset.js";
 
@@ -15,7 +16,7 @@ export class ImageRGBADataLoader extends AssetLoader {
 
         this.decoder = new CodecWithFallback(
             new ThreadedImageDecoder(),
-            // new NativeImageDecoder()
+            new NativeImageDecoder()
         );
     }
 

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshHighlightSystem.js

@@ -1,6 +1,6 @@
 import { System } from "../../../../ecs/System.js";
-import { SGMesh } from "./SGMesh.js";
 import Highlight from "../../highlight/Highlight.js";
+import { SGMesh } from "./SGMesh.js";
 import { SGMeshEvents } from "./SGMeshEvents.js";
 
 export class SGMeshHighlightSystem extends System {
@@ -33,6 +33,12 @@ export class SGMeshHighlightSystem extends System {
 
         const node = sg_mesh.__node;
 
+        if (node === null) {
+            // not loaded yet
+            console.warn(`SGMesh is not loaded yet: ${sg_mesh.url}`);
+            return;
+        }
+
         node.traverse(t => {
             t.entity.add(highlight);
         });

package/src/engine/graphics/geometry/VertexDataSpec.d.ts

@@ -3,6 +3,8 @@ import {AttributeSpec} from "./AttributeSpec";
 export class VertexDataSpec {
     readonly attributes: AttributeSpec[]
 
+    static from(...attributes: AttributeSpec[]): VertexDataSpec
+
     getAttributeByName(name: string): AttributeSpec | undefined
 
     add(attribute: AttributeSpec): this
@@ -12,4 +14,12 @@ export class VertexDataSpec {
     equals(other: VertexDataSpec): boolean
 
     hash(): number
+
+    toJSON(): any
+
+    fromJSON(json: any): void
+
+    getByteSize(): number
+
+    readonly isVertexDataSpec: true
 }

package/src/engine/graphics/geometry/VertexDataSpec.js

@@ -1,8 +1,8 @@
-import { invokeObjectHash } from "../../../core/model/object/invokeObjectHash.js";
+import { assert } from "../../../core/assert.js";
 import { computeHashArray } from "../../../core/collection/array/computeHashArray.js";
 import { isArrayEqual } from "../../../core/collection/array/isArrayEqual.js";
+import { invokeObjectHash } from "../../../core/model/object/invokeObjectHash.js";
 import { AttributeSpec } from "./AttributeSpec.js";
-import { assert } from "../../../core/assert.js";
 
 /**
  * @readonly
@@ -15,20 +15,19 @@ const DEFAULT_HASH = 1234567;
  * @example "uv","position" and "normal" attributes of geometry vertices
  */
 export class VertexDataSpec {
-    constructor() {
-        /**
-         *
-         * @type {AttributeSpec[]}
-         */
-        this.attributes = [];
-
-        /**
-         * Cached hash for speed
-         * @type {number}
-         * @private
-         */
-        this.__hash = DEFAULT_HASH;
-    }
+
+    /**
+     *
+     * @type {AttributeSpec[]}
+     */
+    attributes = [];
+
+    /**
+     * Cached hash for speed
+     * @type {number}
+     * @private
+     */
+    #hash = DEFAULT_HASH;
 
     /**
      *
@@ -112,7 +111,7 @@ export class VertexDataSpec {
         this.attributes.push(attribute);
 
         // reset hash
-        this.__hash = DEFAULT_HASH;
+        this.#hash = DEFAULT_HASH;
 
         //for chaining, return self
         return this;
@@ -138,7 +137,7 @@ export class VertexDataSpec {
         this.attributes.splice(0, this.attributes.length);
 
         // reset hash to trigger hash update
-        this.__hash = DEFAULT_HASH;
+        this.#hash = DEFAULT_HASH;
     }
 
     /**
@@ -159,11 +158,11 @@ export class VertexDataSpec {
     }
 
     hash() {
-        if (this.__hash === DEFAULT_HASH) {
-            this.__hash = this.computeHash();
+        if (this.#hash === DEFAULT_HASH) {
+            this.#hash = this.computeHash();
         }
 
-        return this.__hash;
+        return this.#hash;
     }
 
     toJSON() {

package/src/engine/graphics/render/visibility/hiz/buildCanvasViewFromTexture.js

@@ -1,19 +1,24 @@
-import { CanvasView } from "../../../../../view/elements/CanvasView.js";
 import {
     DoubleSide,
+    GLSL3,
     LinearFilter,
     Mesh as ThreeMesh,
     OrthographicCamera,
+    RedIntegerFormat,
+    RGBAIntegerFormat,
+    RGBIntegerFormat,
+    RGIntegerFormat,
     Scene,
     ShaderMaterial,
-    UnsignedByteType,
     WebGLRenderTarget
 } from "three";
-import CheckersTexture from "../../../texture/CheckersTexture.js";
+import { assert } from "../../../../../core/assert.js";
+import { UINT32_MAX } from "../../../../../core/binary/UINT32_MAX.js";
+import { CanvasView } from "../../../../../view/elements/CanvasView.js";
 import { FULL_SCREEN_TRIANGLE_GEOMETRY } from "../../../geometry/FULL_SCREEN_TRIANGLE_GEOMETRY.js";
-import { formatToChannelCount } from "../../../texture/formatToChannelCount.js";
 import { glsl_gen_swizzled_read } from "../../../shaders/glsl_gen_swizzled_read.js";
-import { assert } from "../../../../../core/assert.js";
+import CheckersTexture from "../../../texture/CheckersTexture.js";
+import { formatToChannelCount } from "../../../texture/formatToChannelCount.js";
 import { Sampler2D } from "../../../texture/sampler/Sampler2D.js";
 
 
@@ -24,7 +29,10 @@ import { Sampler2D } from "../../../texture/sampler/Sampler2D.js";
  */
 function defineSamplerType(texture) {
     switch (texture.format) {
-        case UnsignedByteType:
+        case RedIntegerFormat:
+        case RGIntegerFormat:
+        case RGBIntegerFormat:
+        case RGBAIntegerFormat:
             return 'usampler2D';
         default:
             return 'sampler2D'
@@ -39,9 +47,29 @@ function defineSamplerType(texture) {
  * @returns {string}
  */
 function sampleTexel(texture, name, uv) {
+
+    const texture_sample = `texture2D(${name}, ${uv})`;
+
     switch (texture.format) {
+        case RedIntegerFormat:
+            return `vec4(${texture_sample})`;
         default:
-            return `texture2D(${name}, ${uv})`;
+            return texture_sample;
+    }
+}
+
+/**
+ *
+ * @param {THREE.Texture} texture
+ * @param {string} sample
+ * @retunrs {string}
+ */
+function scaleSample(texture, sample) {
+    switch (texture.internalFormat) {
+        case "R32UI":
+            return `${sample} * ${1 / UINT32_MAX}`
+        default:
+            return sample;
     }
 }
 
@@ -76,20 +104,23 @@ function makeShader({ texture, alpha_override, swizzle }) {
 
         fragmentShader: /* glsl */`
 
+        precision mediump usampler2D;
 		uniform ${defineSamplerType(texture)} tDiffuse;
 
 		varying vec2 vUv;
+		out vec4 out_frag;
 
 		void main() {
 
-			vec4 texel = ${sampleTexel(texture, 'tDiffuse', 'vUv')};
-			gl_FragColor = ${glsl_gen_swizzled_read('texel', _swizzle)};
+			vec4 texel = ${scaleSample(texture, sampleTexel(texture, 'tDiffuse', 'vUv'))};
+			out_frag = ${glsl_gen_swizzled_read('texel', _swizzle)};
 		}`,
         uniforms: {
 
             'tDiffuse': { value: null }
 
-        }
+        },
+        glslVersion: GLSL3
     });
 }
 

package/src/engine/graphics/texture/formatToChannelCount.js

@@ -1,4 +1,4 @@
-import { RedFormat, RGBAFormat, RGBFormat, RGFormat } from "three";
+import { RedFormat, RedIntegerFormat, RGBAFormat, RGBFormat, RGFormat } from "three";
 
 /**
  *
@@ -8,6 +8,7 @@ import { RedFormat, RGBAFormat, RGBFormat, RGFormat } from "three";
 export function formatToChannelCount(format) {
     switch (format) {
         case RedFormat:
+        case RedIntegerFormat:
             return 1;
         case RGFormat:
             return 2;

package/src/engine/graphics/texture/sampler/filter/sampler2d_scale_down_generic.js

@@ -60,14 +60,14 @@ export function sampler2d_scale_down_generic(
             let z = 0;
             for (j = source_y0; j <= source_y1; j++) {
 
-                const f_y = (j - center_y);
+                const f_y = (j - center_y) + 0.5;
 
                 const f_y_rcp = f_y * rcp_ratio_y;
                 const f_y_rcp2 = f_y_rcp * f_y_rcp;
 
                 for (i = source_x0; i <= source_x1; i++) {
 
-                    const f_x = (i - center_x);
+                    const f_x = (i - center_x) + 0.5;
 
                     const f_x_rcp = f_x * rcp_ratio_x;
                     const f_x_rcp2 = f_x_rcp * f_x_rcp;

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

@@ -1,23 +1,23 @@
-import { EngineHarness } from "../../../EngineHarness.js";
-import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
-import sampler2D2Canvas from "./Sampler2D2Canvas.js";
-import { CanvasView } from "../../../../view/elements/CanvasView.js";
-import { sampler2d_scale_down_lanczos } from "./resize/sampler2d_scale_down_lanczos.js";
-import { Sampler2D } from "./Sampler2D.js";
-import { sampler2d_scale_generic } from "./resize/sampler2d_scale_generic.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
 import LabelView from "../../../../view/common/LabelView.js";
+import { CanvasView } from "../../../../view/elements/CanvasView.js";
 import EmptyView from "../../../../view/elements/EmptyView.js";
-import { sampler2d_scale_down_mipmap } from "./resize/sampler2d_scale_down_mipmap.js";
-import { kaiser_bessel_window } from "./filter/kaiser_bessel_window.js";
-import { sampler2d_scale_down_generic } from "./filter/sampler2d_scale_down_generic.js";
-import { mitchell } from "./filter/mitchell.js";
-import { kaiser_1 } from "./filter/kaiser_1.js";
-import { triangle } from "./filter/triangle.js";
+import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
+import { EngineHarness } from "../../../EngineHarness.js";
 import { box } from "./filter/box.js";
+import { filter_lanczos3 } from "./filter/filter_lanczos3.js";
 import { gaussian } from "./filter/gaussian.js";
+import { kaiser_1 } from "./filter/kaiser_1.js";
+import { kaiser_bessel_window } from "./filter/kaiser_bessel_window.js";
+import { mitchell } from "./filter/mitchell.js";
 import { mitchell_v1 } from "./filter/mitchell_v1.js";
-import { filter_lanczos3 } from "./filter/filter_lanczos3.js";
+import { sampler2d_scale_down_generic } from "./filter/sampler2d_scale_down_generic.js";
+import { triangle } from "./filter/triangle.js";
+import { sampler2d_scale_down_lanczos } from "./resize/sampler2d_scale_down_lanczos.js";
+import { sampler2d_scale_down_mipmap } from "./resize/sampler2d_scale_down_mipmap.js";
+import { sampler2d_scale_generic } from "./resize/sampler2d_scale_generic.js";
+import { Sampler2D } from "./Sampler2D.js";
+import sampler2D2Canvas from "./Sampler2D2Canvas.js";
 
 function grid({ engine, input, transforms, size = new Vector2(input.width, input.height), display_labels = true }) {
 
@@ -126,9 +126,9 @@ new EngineHarness().initialize({
     // const path = "data/textures/utility/image018.jpg";
     // const path = "data/textures/decal/ISO 7010 - Safety Signs/Fire Protection/200px/F001 – Fire extinguisher.png";
     // const path = "data/textures/decal/ISO 7010 - Safety Signs/Prohibited Actions/400px/P069 - Not to be serviced by users.png";
-    const path = "data/textures/utility/Lenna.png";
+    // const path = "data/textures/utility/Lenna.png";
     // const path = "data/textures/utility/dragon.jpg";
-    // const path = "data/textures/utility/grid_tileable.png";
+    const path = "data/textures/utility/grid_tileable.png";
     // const path = "data/textures/utility/uv_map_reference.jpg";
     // const path ="data/textures/utility/TESTIMAGES/SAMPLING/8BIT/RGB/2448x2448/SRC/img_2448x2448_3x8bit_SRC_RGB_clips.png";
     // const path ="data/textures/utility/TESTIMAGES/SAMPLING/8BIT/RGB/2448x2448/SRC/img_2448x2448_3x8bit_SRC_RGB_coins.png";
@@ -303,7 +303,7 @@ function test_sampling(source, engine) {
 
                 // return;
 
-                sampler2d_scale_down_generic(input, out, kaiser_bessel_window);
+                sampler2d_scale_down_generic(input, out, kaiser_bessel_window,1);
 
             },
             (out, input, params) => {
@@ -312,7 +312,7 @@ function test_sampling(source, engine) {
 
                 // return;
 
-                sampler2d_scale_down_generic(input, out, kaiser_1);
+                sampler2d_scale_down_generic(input, out, kaiser_1,1);
 
             },
             (out, input, params) => {
@@ -345,7 +345,8 @@ function test_sampling(source, engine) {
         ], size: new Vector2(
             // 100, 100
             // 1024, 1024
-            136, 136
+            // 256, 256
+            128, 128
             // 64, 64
             // 32,32
             // 400,400