@woosh/meep-engine 2.126.42 → 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.42",
+  "version": "2.126.43",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

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/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_multiply } from "../../../core/geom/3d/mat4/m4_multiply.js";
 import { M4_IDENTITY } from "../../../core/geom/3d/mat4/M4_IDENTITY.js";
+import { m4_multiply } from "../../../core/geom/3d/mat4/m4_multiply.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { TransformFlags } from "./TransformFlags.js";

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

@@ -2,8 +2,8 @@ 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_multiply } from "../../../../../core/geom/3d/mat4/m4_multiply.js";
 import { M4_IDENTITY } from "../../../../../core/geom/3d/mat4/M4_IDENTITY.js";
+import { m4_multiply } from "../../../../../core/geom/3d/mat4/m4_multiply.js";
 import { StaticMaterialCache } from "../../../../asset/loaders/material/StaticMaterialCache.js";
 import { computeGeometryEquality } from "../../buffered/computeGeometryEquality.js";
 import { computeGeometryHash } from "../../buffered/computeGeometryHash.js";