@woosh/meep-engine 2.81.1 → 2.81.2

package/build/meep.module.js

@@ -2021,99 +2021,6 @@ function v3_angle_cos_between(
 
 }
 
-/**
- *
- * @param {BinaryBuffer} buffer
- * @param {number[]} result
- * @param {number} result_offset
- */
-function v3_binary_equality_decode(buffer, result, result_offset) {
-    const header = buffer.readUint8();
-
-    let x = 0;
-    let y = 0;
-    let z = 0;
-
-    if ((header & 7) === 7) {
-        //all scale components are the same
-        x = buffer.readFloat32();
-        y = x;
-        z = x;
-    } else if ((header & 1) === 1) {
-        //X and Y are the same, Z is different
-        x = buffer.readFloat32();
-        y = x;
-        z = buffer.readFloat32();
-    } else if ((header & 2) === 2) {
-        //Y and Z are the same, X is different
-        x = buffer.readFloat32();
-        y = buffer.readFloat32();
-        z = y;
-    } else if ((header & 4) === 4) {
-        //X and Z are the same, Y is different
-        x = buffer.readFloat32();
-        y = buffer.readFloat32();
-        z = x;
-    } else {
-        //scale components are different
-        x = buffer.readFloat32();
-        y = buffer.readFloat32();
-        z = buffer.readFloat32();
-    }
-
-    result[result_offset] = x;
-    result[result_offset + 1] = y;
-    result[result_offset + 2] = z;
-}
-
-/**
- *
- * @param {BinaryBuffer} buffer
- * @param {number} x
- * @param {number} y
- * @param {number} z
- */
-function v3_binary_equality_encode(buffer, x, y, z){
-
-    let header = 0;
-
-    if (x === y) {
-        header |= 1;
-    }
-
-    if (y === z) {
-        header |= 2;
-    }
-
-    if (x === z) {
-        header |= 4;
-    }
-
-    buffer.writeUint8(header);
-
-    if ((header & 7) === 7) {
-        //all components are the same
-        buffer.writeFloat32(x);
-    } else if (header === 1) {
-        //X and Y are the same, Z is different
-        buffer.writeFloat32(x);
-        buffer.writeFloat32(z);
-    } else if (header === 2) {
-        //Y and Z are the same, X is different
-        buffer.writeFloat32(x);
-        buffer.writeFloat32(y);
-    } else if (header === 4) {
-        //X and Z are the same, Y is different
-        buffer.writeFloat32(x);
-        buffer.writeFloat32(y);
-    } else {
-        //scale components are different
-        buffer.writeFloat32(x);
-        buffer.writeFloat32(y);
-        buffer.writeFloat32(z);
-    }
-}
-
 /**
  *
  * @param {number} x
@@ -3035,11 +2942,7 @@ let Vector3$1 = class Vector3 {
      * @deprecated use dedicated method directly instead
      */
     toBinaryBufferFloat32_EqualityEncoded(buffer) {
-        const x = this.x;
-        const y = this.y;
-        const z = this.z;
-
-        v3_binary_equality_encode(buffer, x, y, z);
+        throw new Error('deprecated, use v3_binary_equality_encode')
     }
 
     /**
@@ -3048,7 +2951,7 @@ let Vector3$1 = class Vector3 {
      * @deprecated use dedicated method directly instead
      */
     fromBinaryBufferFloat32_EqualityEncoded(buffer) {
-        v3_binary_equality_decode(buffer, this, 0);
+        throw  new Error('deprecated, use v3_binary_equality_decode')
     }
 
     hash() {

package/package.json

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

package/src/core/geom/Vector3.js

@@ -11,8 +11,6 @@ import { lerp } from "../math/lerp.js";
 import { sign } from "../math/sign.js";
 import { computeHashFloat } from "../primitives/numbers/computeHashFloat.js";
 import { v3_angle_between } from "./vec3/v3_angle_between.js";
-import { v3_binary_equality_decode } from "./vec3/v3_binary_equality_decode.js";
-import { v3_binary_equality_encode } from "./vec3/v3_binary_equality_encode.js";
 import { v3_dot } from "./vec3/v3_dot.js";
 import { v3_length } from "./vec3/v3_length.js";
 import { v3_length_sqr } from "./vec3/v3_length_sqr.js";
@@ -861,11 +859,7 @@ class Vector3 {
      * @deprecated use dedicated method directly instead
      */
     toBinaryBufferFloat32_EqualityEncoded(buffer) {
-        const x = this.x;
-        const y = this.y;
-        const z = this.z;
-
-        v3_binary_equality_encode(buffer, x, y, z);
+        throw new Error('deprecated, use v3_binary_equality_encode')
     }
 
     /**
@@ -874,7 +868,7 @@ class Vector3 {
      * @deprecated use dedicated method directly instead
      */
     fromBinaryBufferFloat32_EqualityEncoded(buffer) {
-        v3_binary_equality_decode(buffer, this, 0);
+        throw  new Error('deprecated, use v3_binary_equality_decode')
     }
 
     hash() {

package/src/engine/navigation/ecs/components/Path.js

@@ -11,8 +11,8 @@ import {
     line3_computeSegmentPointDistance_sqr
 } from "../../../../core/geom/3d/line/line3_computeSegmentPointDistance_sqr.js";
 import { v3_distance } from "../../../../core/geom/vec3/v3_distance.js";
-import Vector3 from "../../../../core/geom/Vector3.js";
 import { clamp } from "../../../../core/math/clamp.js";
+import { lerp } from "../../../../core/math/lerp.js";
 import { min2 } from "../../../../core/math/min2.js";
 import {
     computeNonuniformCatmullRomSplineSample
@@ -24,9 +24,6 @@ import { AttributeSpec } from "../../../graphics/geometry/AttributeSpec.js";
 import { VertexDataSpec } from "../../../graphics/geometry/VertexDataSpec.js";
 import { InterpolationType } from "./InterpolationType.js";
 
-const v3_a = new Vector3();
-const v3_b = new Vector3();
-
 const scratch_v3_a = new Float32Array(3);
 const scratch_v3_b = new Float32Array(3);
 
@@ -415,15 +412,14 @@ class Path {
         const max_index = this.getPointCount() - 1;
         const index_next = min2(index + 1, max_index);
 
-        let next = v3_a;
-        let current = v3_b;
-
-        this.getPosition(index, current);
-        this.getPosition(index_next, next);
-
-
-        result.lerpVectors(current, next, t);
+        this.readPositionToArray(index, scratch_v3_a, 0);
+        this.readPositionToArray(index_next, scratch_v3_b, 0);
 
+        result.set(
+            lerp(scratch_v3_a[0], scratch_v3_b[0], t),
+            lerp(scratch_v3_a[1], scratch_v3_b[1], t),
+            lerp(scratch_v3_a[2], scratch_v3_b[2], t),
+        )
         return (t < 0 && index_next !== max_index);
 
     }
@@ -605,11 +601,8 @@ class Path {
 
         const n = this.getPointCount();
 
-
         for (let i = 0; i < n; i++) {
-            this.getPosition(i, v3_a);
-
-            positions.push(v3_a.x, v3_a.y, v3_a.z);
+            this.readPositionToArray(i, positions, i * 3);
         }
 
         return {

package/src/engine/navigation/ecs/components/Path.spec.js

@@ -1,5 +1,5 @@
-import Path from "./Path.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
+import Path from "./Path.js";
 
 test("constructor does not throw", () => {
     new Path();
@@ -130,12 +130,12 @@ test("getLowIndexOfNearestPoint", () => {
     expect(Path.fromJSON({ points: [0, 0, 0] }).getLowIndexOfNearestPoint(new Vector3(-1, 0, 0))).toBe(0);
 
     const p = Path.fromJSON({
-                                points: [
-                                    0, 0, 0,
-                                    1, 0, 0,
-                                    2, 0, 0
-                                ]
-                            });
+        points: [
+            0, 0, 0,
+            1, 0, 0,
+            2, 0, 0
+        ]
+    });
 
     expect(p.getLowIndexOfNearestPoint(new Vector3(-1, 0, 0))).toBe(0);
     expect(p.getLowIndexOfNearestPoint(new Vector3(0, 0, 0))).toBe(0);
@@ -149,8 +149,8 @@ test("getLowIndexOfNearestPoint", () => {
 
 test("getPosition on a path with 1 point", () => {
     const p = Path.fromJSON({
-                                points: [1, 3, 7]
-                            });
+        points: [1, 3, 7]
+    });
 
     const v = new Vector3();
 
@@ -159,21 +159,35 @@ test("getPosition on a path with 1 point", () => {
     expect(v.toJSON()).toEqual({ x: 1, y: 3, z: 7 });
 });
 
+test("sample_linear with 2 points", () => {
+
+    const path = Path.fromJSON({
+        points: [3, 1, 1, 7, 3, 5]
+    });
+
+    const r = new Vector3();
+
+    path.sample_linear(r, 4);
+
+    expect(r.x).toBeCloseTo(5.666);
+    expect(r.y).toBeCloseTo(2.333);
+    expect(r.z).toBeCloseTo(3.666);
+});
 
-test("sample_catmull_rom with very small offsets",()=>{
+test("sample_catmull_rom with very small offsets", () => {
     const path = Path.fromJSON({
-        points:[3, 1, 1, 3, 1, 3, 7, 1, 3, 7, 1, 7, 3, 1, 7, 3, 1, 8]
+        points: [3, 1, 1, 3, 1, 3, 7, 1, 3, 7, 1, 7, 3, 1, 7, 3, 1, 8]
     });
 
     const v = new Vector3();
 
-    path.sample_catmull_rom(v,0);
+    path.sample_catmull_rom(v, 0);
 
     expect(v.x).not.toBeNaN();
     expect(v.y).not.toBeNaN();
     expect(v.z).not.toBeNaN();
 
-    path.sample_catmull_rom(v,0.00005900000113712167);
+    path.sample_catmull_rom(v, 0.00005900000113712167);
 
     expect(v.x).not.toBeNaN();
     expect(v.y).not.toBeNaN();