@woosh/meep-engine 2.126.41 → 2.126.43

package/package.json

@@ -5,7 +5,7 @@
   "description": "Pure JavaScript game engine. Fully featured and production ready.",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.126.41",
+  "version": "2.126.43",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/geom/3d/aabb/aabb3_from_v3_array_transformed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aabb3_from_v3_array_transformed.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/aabb/aabb3_from_v3_array_transformed.js"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,wDALW,KAAK,SACL,MAAM,EAAE,GAAC,SAAS,CAAC,MAAM,CAAC,gBAC1B,MAAM,UACN,SAAS,CAAC,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,YAAY,QA8BjD"}
+{"version":3,"file":"aabb3_from_v3_array_transformed.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/aabb/aabb3_from_v3_array_transformed.js"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,wDALW,KAAK,SACL,MAAM,EAAE,GAAC,SAAS,CAAC,MAAM,CAAC,gBAC1B,MAAM,UACN,SAAS,CAAC,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,YAAY,QAiCjD"}

package/src/core/geom/3d/aabb/aabb3_from_v3_array_transformed.js

@@ -22,10 +22,13 @@ export function aabb3_from_v3_array_transformed(result, input, input_length, mat
         const y = input[i + 1];
         const z = input[i + 2];
 
-        const _x = matrix[0] * x + matrix[4] * y + matrix[8] * z + matrix[12];
-        const _y = matrix[1] * x + matrix[5] * y + matrix[9] * z + matrix[13];
-        const _z = matrix[2] * x + matrix[6] * y + matrix[10] * z + matrix[14];
+        // perform matrix multiplication
+        const _w = 1 / (matrix[3] * x + matrix[7] * y + matrix[11] * z + matrix[15]);
 
+        const _x = (matrix[0] * x + matrix[4] * y + matrix[8] * z + matrix[12]) * _w;
+        const _y = (matrix[1] * x + matrix[5] * y + matrix[9] * z + matrix[13]) * _w;
+        const _z = (matrix[2] * x + matrix[6] * y + matrix[10] * z + matrix[14]) * _w;
+        
         x0 = min2(_x, x0);
         y0 = min2(_y, y0);
         z0 = min2(_z, z0);

package/src/core/geom/3d/mat4/M4_IDENTITY.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Identity 4x4 matrix, also called "eye" matrix sometimes.
+ * @type {number[]|mat4}
+ */
+export const M4_IDENTITY: number[] | mat4;
+//# sourceMappingURL=M4_IDENTITY.d.ts.map

package/src/core/geom/3d/mat4/M4_IDENTITY.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"M4_IDENTITY.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/mat4/M4_IDENTITY.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH,0BAFU,MAAM,EAAE,GAAC,IAAI,CAOpB"}

package/src/core/geom/3d/mat4/M4_IDENTITY.js

@@ -0,0 +1,11 @@
+/**
+ * Identity 4x4 matrix, also called "eye" matrix sometimes.
+ * @type {number[]|mat4}
+ */
+export const M4_IDENTITY = Object.freeze([
+    1, 0, 0, 0,
+    0, 1, 0, 0,
+    0, 0, 1, 0,
+    0, 0, 0, 1
+]);
+

package/src/core/geom/3d/mat4/MATRIX_4_IDENTITY.d.ts

@@ -1,6 +1,6 @@
 /**
- * Identity 4x4 matrix, also called "eye" matrix sometimes.
- * @type {number[]|mat4}
+ * Alias
+ * @deprecated use {@link M4_IDENTITY} directly instead
  */
-export const MATRIX_4_IDENTITY: number[] | mat4;
+export const MATRIX_4_IDENTITY: any;
 //# sourceMappingURL=MATRIX_4_IDENTITY.d.ts.map

package/src/core/geom/3d/mat4/MATRIX_4_IDENTITY.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MATRIX_4_IDENTITY.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/mat4/MATRIX_4_IDENTITY.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH,gCAFU,MAAM,EAAE,GAAC,IAAI,CAOpB"}
+{"version":3,"file":"MATRIX_4_IDENTITY.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/mat4/MATRIX_4_IDENTITY.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,oCAA6C"}

package/src/core/geom/3d/mat4/MATRIX_4_IDENTITY.js

@@ -1,10 +1,7 @@
+import { M4_IDENTITY } from "./M4_IDENTITY.js";
+
 /**
- * Identity 4x4 matrix, also called "eye" matrix sometimes.
- * @type {number[]|mat4}
+ * Alias
+ * @deprecated use {@link M4_IDENTITY} directly instead
  */
-export const MATRIX_4_IDENTITY = Object.freeze([
-    1, 0, 0, 0,
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1
-]);
+export const MATRIX_4_IDENTITY = M4_IDENTITY;

package/src/core/geom/3d/mat4/m4_make_translation.js

@@ -1,5 +1,5 @@
 import { array_copy } from "../../../collection/array/array_copy.js";
-import { MATRIX_4_IDENTITY } from "./MATRIX_4_IDENTITY.js";
+import { M4_IDENTITY } from "./M4_IDENTITY.js";
 
 /**
  * Create a 4x4 matrix that corresponds to translation transform
@@ -7,7 +7,7 @@ import { MATRIX_4_IDENTITY } from "./MATRIX_4_IDENTITY.js";
  * @param {ArrayLike<number>} translation 3d vector
  */
 export function m4_make_translation(output, translation) {
-    array_copy(MATRIX_4_IDENTITY, 0, output, 0, 16);
+    array_copy(M4_IDENTITY, 0, output, 0, 16);
 
     output[12] = translation[0];
     output[13] = translation[1];

package/src/core/math/spline/spline3_hermite_derivative.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Returns the first-order partial derivative of a hermite curve with control points p0, m0, p1, m1 at the parameter t in [0,1].
+ *
+ * @param {number} t
+ * @param {number} p0
+ * @param {number} p1
+ * @param {number} m0
+ * @param {number} m1
+ * @returns {number}
+ */
+export function spline3_hermite_derivative(t: number, p0: number, p1: number, m0: number, m1: number): number;
+//# sourceMappingURL=spline3_hermite_derivative.d.ts.map

package/src/core/math/spline/spline3_hermite_derivative.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spline3_hermite_derivative.d.ts","sourceRoot":"","sources":["../../../../../src/core/math/spline/spline3_hermite_derivative.js"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,8CAPW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,MAAM,CAclB"}

package/src/core/math/spline/spline3_hermite_derivative.js

@@ -0,0 +1,23 @@
+/**
+ * Returns the first-order partial derivative of a hermite curve with control points p0, m0, p1, m1 at the parameter t in [0,1].
+ *
+ * @param {number} t
+ * @param {number} p0
+ * @param {number} p1
+ * @param {number} m0
+ * @param {number} m1
+ * @returns {number}
+ */
+export function spline3_hermite_derivative(t, p0, p1, m0, m1) {
+
+    // see https://github.com/krishauser/Klampt/blob/0ed16608a3eceee59d04383a17c207ebc33a399f/Python/klampt/math/spline.py#L22
+
+    const t2 = t * t
+    const dcx1 = (6.0 * t2 - 6.0 * t)
+    const dcx2 = (-6.0 * t2 + 6.0 * t)
+    const dcv1 = 3.0 * t2 - 4.0 * t + 1.0
+    const dcv2 = 3.0 * t2 - 2.0 * t
+
+    return dcx1 * p0 + dcx2 * p1 + dcv1 * m0 + dcv2 * m1
+
+}

package/src/core/math/spline/spline3_hermite_subdivide.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Subdivides a hermite curve into two hermite curves.
+ * The result is written in form [a_p0, a_p1, a_m0, a_m1, b_p0, b_p1, b_m0, b_m1], note the stride and offset.
+ * @param {number[]} output where to write the result
+ * @param {number} output_offset where to start writing
+ * @param {number} output_stride what should be the step between result values, useful when working in higher dimensions. Typically, this will be 1.
+ * @param {number} p0
+ * @param {number} p1
+ * @param {number} m0 tangent at p0
+ * @param {number} m1 tangent at p1
+ * @param {number} [t=0.5] where to split, normalized position, must be value between 0 and 1
+ */
+export function spline3_hermite_subdivide(output: number[], output_offset: number, output_stride: number, p0: number, p1: number, m0: number, m1: number, t?: number): void;
+//# sourceMappingURL=spline3_hermite_subdivide.d.ts.map

package/src/core/math/spline/spline3_hermite_subdivide.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spline3_hermite_subdivide.d.ts","sourceRoot":"","sources":["../../../../../src/core/math/spline/spline3_hermite_subdivide.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AACH,kDATW,MAAM,EAAE,iBACR,MAAM,iBACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QA+BhB"}

package/src/core/math/spline/spline3_hermite_subdivide.js

@@ -0,0 +1,46 @@
+import { assert } from "../../assert.js";
+import { spline3_hermite } from "./spline3_hermite.js";
+import { spline3_hermite_derivative } from "./spline3_hermite_derivative.js";
+
+/**
+ * Subdivides a hermite curve into two hermite curves.
+ * The result is written in form [a_p0, a_p1, a_m0, a_m1, b_p0, b_p1, b_m0, b_m1], note the stride and offset.
+ * @param {number[]} output where to write the result
+ * @param {number} output_offset where to start writing
+ * @param {number} output_stride what should be the step between result values, useful when working in higher dimensions. Typically, this will be 1.
+ * @param {number} p0
+ * @param {number} p1
+ * @param {number} m0 tangent at p0
+ * @param {number} m1 tangent at p1
+ * @param {number} [t=0.5] where to split, normalized position, must be value between 0 and 1
+ */
+export function spline3_hermite_subdivide(
+    output,
+    output_offset,
+    output_stride,
+    p0, p1, m0, m1,
+    t = 0.5
+) {
+    assert.isNonNegativeInteger(output_offset, 'output_offset');
+    assert.isNonNegativeInteger(output_stride, 'output_stride');
+    assert.greaterThanOrEqual(output_stride, 1, 'output_stride must be at least 1');
+
+    // see https://github.com/krishauser/Klampt/blob/0ed16608a3eceee59d04383a17c207ebc33a399f/Python/klampt/math/spline.py#L63
+
+    const xm = spline3_hermite(t, p0, p1, m0, m1);
+    const vm = spline3_hermite_derivative(t, p0, p1, m0, m1);
+
+
+    // first segment
+    output[output_offset] = p0;
+    output[output_offset + output_stride] = xm;
+    output[output_offset + output_stride * 2] = m0 * t;
+    output[output_offset + output_stride * 3] = vm * t;
+
+    // second segment
+    output[output_offset + output_stride * 4] = xm;
+    output[output_offset + output_stride * 5] = p1;
+    output[output_offset + output_stride * 6] = vm * (1 - t);
+    output[output_offset + output_stride * 7] = m1 * (1 - t);
+
+}

package/src/engine/ecs/renderable/Renderable.js

@@ -1,6 +1,6 @@
 import { BvhClient } from "../../../core/bvh2/bvh3/BvhClient.js";
 import { AABB3 } from "../../../core/geom/3d/aabb/AABB3.js";
-import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
+import { M4_IDENTITY } from "../../../core/geom/3d/mat4/M4_IDENTITY.js";
 import {
     expand_aabb_by_transformed_three_object
 } from "../../graphics/three/expand_aabb_by_transformed_three_object.js";
@@ -146,7 +146,7 @@ class Renderable {
             -Infinity, -Infinity, -Infinity
         ]);
 
-        expand_aabb_by_transformed_three_object(aabb, object, MATRIX_4_IDENTITY);
+        expand_aabb_by_transformed_three_object(aabb, object, M4_IDENTITY);
 
         // sanity checks to ensure valid bounds
         if (!Number.isFinite(aabb[0])) {

package/src/engine/ecs/terrain/ecs/TerrainSystem.js

@@ -6,7 +6,7 @@ import {
 
 import { noop } from "../../../../core/function/noop.js";
 import { read_three_planes_to_array } from "../../../../core/geom/3d/frustum/read_three_planes_to_array.js";
-import { MATRIX_4_IDENTITY } from "../../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
+import { M4_IDENTITY } from "../../../../core/geom/3d/mat4/M4_IDENTITY.js";
 import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
 import { TextureAssetLoader } from "../../../asset/loaders/texture/TextureAssetLoader.js";
 import { CameraSystem } from '../../../graphics/ecs/camera/CameraSystem.js';
@@ -220,7 +220,7 @@ class TerrainSystem extends System {
             // terrain has a transform
             terrain.transform = transform.matrix;
         } else {
-            terrain.transform = MATRIX_4_IDENTITY;
+            terrain.transform = M4_IDENTITY;
         }
 
         terrain.update(this.__time_delta);

package/src/engine/ecs/transform/Transform.js

@@ -2,8 +2,8 @@ import { assert } from "../../../core/assert.js";
 import { allocate_m4 } from "../../../core/geom/3d/mat4/allocate_m4.js";
 import { compose_matrix4_array } from "../../../core/geom/3d/mat4/compose_matrix4_array.js";
 import { decompose_matrix_4_array } from "../../../core/geom/3d/mat4/decompose_matrix_4_array.js";
+import { M4_IDENTITY } from "../../../core/geom/3d/mat4/M4_IDENTITY.js";
 import { m4_multiply } from "../../../core/geom/3d/mat4/m4_multiply.js";
-import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { TransformFlags } from "./TransformFlags.js";
@@ -400,7 +400,7 @@ export class Transform {
      *      - scale:    [1,1,1]
      */
     makeIdentity() {
-        this.fromMatrix(MATRIX_4_IDENTITY);
+        this.fromMatrix(M4_IDENTITY);
     }
 
     /**

package/src/engine/graphics/geometry/optimization/merge/merge_geometry_hierarchy.js

@@ -2,15 +2,15 @@ import { Group, Matrix4, Mesh } from "three";
 import { mergeBufferGeometries } from "three/examples/jsm/utils/BufferGeometryUtils.js";
 import { array_copy } from "../../../../../core/collection/array/array_copy.js";
 import { HashMap } from "../../../../../core/collection/map/HashMap.js";
+import { M4_IDENTITY } from "../../../../../core/geom/3d/mat4/M4_IDENTITY.js";
 import { m4_multiply } from "../../../../../core/geom/3d/mat4/m4_multiply.js";
-import { MATRIX_4_IDENTITY } from "../../../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
 import { StaticMaterialCache } from "../../../../asset/loaders/material/StaticMaterialCache.js";
 import { computeGeometryEquality } from "../../buffered/computeGeometryEquality.js";
 import { computeGeometryHash } from "../../buffered/computeGeometryHash.js";
 
 class GeometryContext {
     constructor() {
-        this.matrix = new Float32Array(MATRIX_4_IDENTITY);
+        this.matrix = new Float32Array(M4_IDENTITY);
         this.material = null;
         this.geometry = null;
     }
@@ -52,7 +52,7 @@ function compute_transform_matrix(object, ancestor_root, result) {
     //
     path.reverse();
 
-    result.set(MATRIX_4_IDENTITY);
+    result.set(M4_IDENTITY);
 
     for (let i = 0; i < path.length; i++) {
         const el = path[i];