@needle-tools/engine 4.8.8 → 4.8.9-next.5e888f7

package/lib/engine-components/splines/Spline.js

@@ -0,0 +1,270 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { BufferGeometry, CatmullRomCurve3, Line, LineBasicMaterial, LineCurve3, Quaternion, Vector3 } from "three";
+import { Mathf } from "../../engine/engine_math.js";
+import { serializeable } from "../../engine/engine_serialization.js";
+import { getParam } from "../../engine/engine_utils.js";
+import { Behaviour } from "../Component.js";
+const debug = getParam("debugsplines");
+export class SplineData {
+    position = new Vector3();
+    rotation = new Quaternion();
+    tangentIn = new Vector3();
+    tangentOut = new Vector3();
+}
+__decorate([
+    serializeable(Vector3)
+], SplineData.prototype, "position", void 0);
+__decorate([
+    serializeable(Quaternion)
+], SplineData.prototype, "rotation", void 0);
+__decorate([
+    serializeable(Vector3)
+], SplineData.prototype, "tangentIn", void 0);
+__decorate([
+    serializeable(Vector3)
+], SplineData.prototype, "tangentOut", void 0);
+// enum SplineTypeEnum {
+//     CatmullRom = 0,
+//     Bezier = 1,
+//     Linear = 2
+// }
+// type SplineType = "CatmullRom" | "Bezier" | "Linear";
+//@dont-generate-component
+/**
+ * Holds spline data and generates a spline curve. Use with SplineWalker to move objects along the spline or call getPointAt to sample points on the spline.
+ * The spline is defined by an array of knots (SplineData) which define position, rotation and tangents.
+ *
+ * You can create a SplineContainer from an array of points using the static method 'createFromPoints'.
+ */
+export class SplineContainer extends Behaviour {
+    /**
+     * Adds a knot to the end of the spline.
+     */
+    addKnot(knot) {
+        if (knot instanceof SplineData) {
+            this.spline.push(knot);
+            this._isDirty = true;
+        }
+        else {
+            const k = new SplineData();
+            k.position.copy(knot.position);
+            this.spline.push(k);
+            this._isDirty = true;
+        }
+        return this;
+    }
+    /**
+     * Removes a knot by index or by reference.
+     */
+    removeKnot(index) {
+        if (typeof index === "number") {
+            this.spline.splice(index, 1);
+            this._isDirty = true;
+        }
+        else {
+            const i = this.spline.indexOf(index);
+            if (i !== -1) {
+                this.spline.splice(i, 1);
+                this._isDirty = true;
+            }
+        }
+        return this;
+    }
+    /**
+     * Gets a point on the spline in world space.
+     */
+    getPointAt(t, target) {
+        if (!this.curve)
+            return new Vector3();
+        const pos = this.curve.getPointAt(Mathf.clamp01(t), target);
+        const worldMatrix = this.gameObject.matrixWorld ?? undefined;
+        if (worldMatrix) {
+            pos.applyMatrix4(worldMatrix);
+        }
+        return pos;
+    }
+    /**
+     * Marks the spline as dirty, causing it to be rebuilt on the next update.
+     */
+    markDirty() {
+        this._isDirty = true;
+    }
+    /**
+     * Gets the tangent vector on the spline in world space.
+     */
+    getTangentAt(t, target) {
+        if (!this.curve)
+            return target ?? new Vector3();
+        const wr = this.gameObject.worldQuaternion;
+        return this.curve.getTangentAt(Mathf.clamp01(t), target).applyQuaternion(wr);
+    }
+    set closed(value) {
+        this._closed = value;
+        this._isDirty = true;
+    }
+    get closed() { return this._closed; }
+    _closed = false;
+    /** Spline data. Call 'markDirty' if modified */
+    spline = [];
+    /** Enable to render the spline curve for debugging */
+    set debug(debug) {
+        if (debug && !this._builtCurve)
+            this.buildCurve();
+        if (!this._debugLine)
+            return;
+        this._debugLine.visible = debug;
+    }
+    /** Gets the spline curve generated from the 'spline' data */
+    get curve() {
+        return this._curve;
+    }
+    get isDirty() { return this._isDirty; }
+    _isDirty = false;
+    _curve = null;
+    _builtCurve = false;
+    _debugLine = null;
+    /** @internal */
+    awake() {
+        if (debug) {
+            console.log(`[Spline] ${this.name}`, this);
+            this.buildCurve();
+        }
+    }
+    /** @internal */
+    update() {
+        if (this._isDirty) {
+            this.buildCurve(true);
+        }
+        if (this._debugLine && this._debugLine.parent !== this.gameObject)
+            this.gameObject.add(this._debugLine);
+    }
+    buildCurve(force = false) {
+        if (this._builtCurve && !force)
+            return;
+        this._builtCurve = true;
+        if (!this.spline) {
+            console.error("[Spline] Can not build curve, no spline data", this.name);
+            return;
+        }
+        this._isDirty = false;
+        this._curve = createCatmullRomCurve(this.spline, this.closed);
+        this.buildDebugCurve();
+        // TODO: Unity supports spline interpolation type per knot which we don't support right now. Additionally EditType is deprecated. For simplicity we're just supporting CatmullRom for now.
+        // switch (this.editType) {
+        //     case SplineType.CatmullRom:
+        //         this.createCatmullRomCurve();
+        //         break;
+        //     case SplineType.Bezier:
+        //         console.warn("Bezier spline not implemented yet", this.name);
+        //         this.createCatmullRomCurve();
+        //         // this.createBezierCurve();
+        //         break;
+        //     case SplineType.Linear:
+        //         this.createLinearCurve();
+        //         break;
+        // }
+    }
+    buildDebugCurve() {
+        if (debug && this.spline && this._curve) {
+            this._debugLine?.removeFromParent();
+            this._debugLine = null;
+            const material = new LineBasicMaterial({
+                color: 0x6600ff,
+            });
+            const res = this.spline.length * 10;
+            const splinePoints = this._curve.getPoints(res);
+            const geometry = new BufferGeometry().setFromPoints(splinePoints);
+            this._debugLine = new Line(geometry, material);
+            this.gameObject?.add(this._debugLine);
+        }
+    }
+}
+__decorate([
+    serializeable()
+], SplineContainer.prototype, "closed", null);
+__decorate([
+    serializeable(SplineData)
+], SplineContainer.prototype, "spline", void 0);
+function createCatmullRomCurve(data, closed) {
+    const points = data.map(knot => new Vector3(-knot.position.x, knot.position.y, knot.position.z));
+    if (points.length === 1)
+        points.push(points[0]);
+    const averageTension = data.reduce((acc, knot) => acc + Math.abs(knot.tangentOut.x) + Math.abs(knot.tangentOut.y) + Math.abs(knot.tangentOut.z), 0) / data.length;
+    const tension = Mathf.remap(averageTension, 0, 0.3, 0, .5);
+    return new CatmullRomCurve3(points, closed, "catmullrom", tension);
+}
+function createLinearCurve(data, closed) {
+    if (!data || data.length < 2)
+        return null;
+    const points = data.map(knot => new Vector3(-knot.position.x, knot.position.y, knot.position.z));
+    if (closed)
+        points.push(points[0]);
+    return new LineCurve3(points.at(0), points.at(1));
+}
+// function createBezierCurve(data: SplineData[], closed: boolean): CubicBezierCurve3 | null {
+//     if (!data || data.length < 2) return null;
+//     for (let k = 0; k < data.length; k++) {
+//         const k0 = data[k];
+//         let nextIndex = k + 1;
+//         if (nextIndex >= data.length) {
+//             if (!closed) break;
+//             nextIndex = 0;
+//         }
+//         const k1 = data[nextIndex];
+//         // points
+//         const p0 = new Vector3(-k0.position.x, k0.position.y, k0.position.z);
+//         const p1 = new Vector3(-k1.position.x, k1.position.y, k1.position.z);
+//         // tangents
+//         const t0 = new Vector3(-k0.tangentOut.x, k0.tangentOut.y, k0.tangentOut.z);
+//         const t1 = new Vector3(-k1.tangentIn.x, k1.tangentIn.y, k1.tangentIn.z);
+//         // rotations
+//         // const q0 = k0.rotation;// new Quaternion(k0.rotation.value.x, k0.rotation.value.y, k0.rotation.value.z, k0.rotation.value.w);
+//         // const q1 = k1.rotation;// new Quaternion(k1.rotation.value.x, k1.rotation.value.y, k1.rotation.value.z, k1.rotation.value.w);
+//         // const a = new Vector3(0,1,0);
+//         // const angle = Math.PI*.5;
+//         // t0.sub(p0).applyQuaternion(q0).add(p0);
+//         // t1.sub(p1).applyQuaternion(q1).add(p1);
+//         t0.add(p0);
+//         // t0.applyQuaternion(q0);
+//         t1.add(p1);
+//         const curve = new CubicBezierCurve3(p0, t0, t1, p1);
+//         return curve;
+//     }
+//     return null;
+// }
+// class SplineCurve {
+//     private spline: Spline;
+//     constructor(spline: Spline) {
+//         this.spline = spline;
+//     }
+//     getPoints(num: number): Vector3[] {
+//         const points: Vector3[] = [];
+//         const samplePerKnot = num / this.spline.length;
+//         for (let k = 1; k < this.spline.length; k++) {
+//             const cur = this.spline[k];
+//             const prev = this.spline[k - 1];
+//             for (let i = 0; i < samplePerKnot; i++) {
+//                 const t = i / (samplePerKnot - 1);
+//                 console.log(CurveUtils);
+//                 const x = this.interpolate(-prev.Position.x, -cur.Position.x, -prev.tangentOut.x, -cur.TangentIn.x, t);
+//                 const y = this.interpolate(prev.Position.y, cur.Position.y, prev.tangentOut.y, cur.TangentIn.y, t);
+//                 const z = this.interpolate(prev.Position.z, cur.Position.z, prev.tangentOut.z, cur.TangentIn.z, t);
+//                 points.push(new Vector3(x, y, z));
+//             }
+//         }
+//         return points;
+//     }
+//     interpolate(p0, p1, p2, p3, t) {
+//         var v0 = (p2 - p0) * 0.5;
+//         var v1 = (p3 - p1) * 0.5;
+//         var t2 = t * t;
+//         var t3 = t * t2;
+//         return (2 * p1 - 2 * p2 + v0 + v1) * t3 + (- 3 * p1 + 3 * p2 - 2 * v0 - v1) * t2 + v0 * t + p1;
+//     }
+// }
+//# sourceMappingURL=Spline.js.map

package/lib/engine-components/splines/Spline.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Spline.js","sourceRoot":"","sources":["../../../src/engine-components/splines/Spline.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAA4B,IAAI,EAAE,iBAAiB,EAAC,UAAU,EAAY,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEtJ,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;AAEvC,MAAM,OAAO,UAAU;IAEnB,QAAQ,GAAY,IAAI,OAAO,EAAE,CAAC;IAGlC,QAAQ,GAAe,IAAI,UAAU,EAAE,CAAC;IAGxC,SAAS,GAAY,IAAI,OAAO,EAAE,CAAC;IAGnC,UAAU,GAAY,IAAI,OAAO,EAAE,CAAC;CACvC;AAVG;IADC,aAAa,CAAC,OAAO,CAAC;4CACW;AAGlC;IADC,aAAa,CAAC,UAAU,CAAC;4CACc;AAGxC;IADC,aAAa,CAAC,OAAO,CAAC;6CACY;AAGnC;IADC,aAAa,CAAC,OAAO,CAAC;8CACa;AAGxC,wBAAwB;AACxB,sBAAsB;AACtB,kBAAkB;AAClB,iBAAiB;AACjB,IAAI;AACJ,wDAAwD;AAGxD,0BAA0B;AAC1B;;;;;GAKG;AACH,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAE1C;;OAEG;IACH,OAAO,CAAC,IAAwC;QAC5C,IAAI,IAAI,YAAY,UAAU,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACxB;aACI;YACD,MAAM,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;YAC3B,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACxB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,KAA0B;QACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACxB;aAAM;YACH,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;aACxB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,CAAS,EAAE,MAAgB;QAClC,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,OAAO,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,SAAS,CAAC;QAC7D,IAAI,WAAW,EAAE;YACb,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;SACjC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;OAEG;IACH,SAAS;QACL,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,CAAS,EAAE,MAAgB;QACpC,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAChD,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;QAC3C,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAGD,IAAI,MAAM,CAAC,KAAc;QACrB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IACD,IAAI,MAAM,KAAK,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7B,OAAO,GAAY,KAAK,CAAC;IAGjC,gDAAgD;IAEhD,MAAM,GAAiB,EAAE,CAAC;IAE1B,sDAAsD;IACtD,IAAI,KAAK,CAAC,KAAc;QACpB,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,IAAI,CAAC,UAAU,EAAE,CAAC;QAClD,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,OAAO;QAC7B,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;IACpC,CAAC;IAED,6DAA6D;IAC7D,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE/B,QAAQ,GAAY,KAAK,CAAC;IAE1B,MAAM,GAA0B,IAAI,CAAC;IACrC,WAAW,GAAY,KAAK,CAAC;IAC7B,UAAU,GAAoB,IAAI,CAAC;IAE3C,gBAAgB;IAChB,KAAK;QACD,IAAI,KAAK,EAAE;YACP,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,UAAU,EAAE,CAAC;SACrB;IACL,CAAC;IAED,gBAAgB;IAChB,MAAM;QACF,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACzB;QACD,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5G,CAAC;IAEO,UAAU,CAAC,QAAiB,KAAK;QACrC,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK;YAAE,OAAO;QACvC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAExB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,8CAA8C,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACzE,OAAO;SACV;QACD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,0LAA0L;QAC1L,2BAA2B;QAC3B,kCAAkC;QAClC,wCAAwC;QACxC,iBAAiB;QACjB,8BAA8B;QAC9B,wEAAwE;QACxE,wCAAwC;QACxC,uCAAuC;QACvC,iBAAiB;QACjB,8BAA8B;QAC9B,oCAAoC;QACpC,iBAAiB;QACjB,IAAI;IACR,CAAC;IAEO,eAAe;QACnB,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE;YACrC,IAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YAEvB,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC;gBACnC,KAAK,EAAE,QAAQ;aAClB,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC;YACpC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YAClE,IAAI,CAAC,UAAU,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC/C,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACzC;IACL,CAAC;CACJ;AA1FG;IADC,aAAa,EAAE;6CAIf;AAOD;IADC,aAAa,CAAC,UAAU,CAAC;+CACA;AAmF9B,SAAS,qBAAqB,CAAC,IAAkB,EAAE,MAAe;IAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACjG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IAClK,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3D,OAAO,IAAI,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAkB,EAAE,MAAe;IAC1D,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACjG,IAAI,MAAM;QAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAGD,8FAA8F;AAC9F,iDAAiD;AAEjD,8CAA8C;AAC9C,8BAA8B;AAC9B,iCAAiC;AACjC,0CAA0C;AAC1C,kCAAkC;AAClC,6BAA6B;AAC7B,YAAY;AACZ,sCAAsC;AACtC,oBAAoB;AACpB,gFAAgF;AAChF,gFAAgF;AAChF,sBAAsB;AACtB,sFAAsF;AACtF,mFAAmF;AACnF,uBAAuB;AACvB,2IAA2I;AAC3I,2IAA2I;AAC3I,2CAA2C;AAC3C,uCAAuC;AACvC,qDAAqD;AACrD,qDAAqD;AACrD,sBAAsB;AACtB,qCAAqC;AACrC,sBAAsB;AACtB,+DAA+D;AAC/D,wBAAwB;AACxB,QAAQ;AACR,mBAAmB;AACnB,IAAI;AAEJ,sBAAsB;AAEtB,8BAA8B;AAE9B,oCAAoC;AACpC,gCAAgC;AAChC,QAAQ;AAER,0CAA0C;AAC1C,wCAAwC;AACxC,0DAA0D;AAC1D,yDAAyD;AACzD,0CAA0C;AAC1C,+CAA+C;AAE/C,wDAAwD;AACxD,qDAAqD;AACrD,2CAA2C;AAC3C,0HAA0H;AAC1H,sHAAsH;AACtH,sHAAsH;AACtH,qDAAqD;AACrD,gBAAgB;AAChB,YAAY;AAEZ,yBAAyB;AACzB,QAAQ;AAER,uCAAuC;AAEvC,oCAAoC;AACpC,oCAAoC;AACpC,0BAA0B;AAC1B,2BAA2B;AAC3B,0GAA0G;AAC1G,QAAQ;AACR,IAAI"}

package/lib/engine-components/splines/SplineUtils.d.ts

@@ -0,0 +1,12 @@
+import { Vector3 } from "three";
+import { SplineContainer } from "./Spline.js";
+export declare namespace SplineUtils {
+    /**
+     * Creates a SplineContainer from an array of points.
+     * @param positions The positions of the knots.
+     * @param closed Whether the spline is closed (the last knot connects to the first).
+     * @param tension The tension of the spline. 0 is no tension, 1 is high tension (straight lines between knots). Default is 0.75.
+     * @return The created SplineContainer component - add it to an Object3D to use it.
+     */
+    function createFromPoints(positions: Vector3[], closed?: boolean, tension?: number): SplineContainer;
+}

package/lib/engine-components/splines/SplineUtils.js

@@ -0,0 +1,33 @@
+import { Vector3 } from "three";
+import { Mathf } from "../../engine/engine_math.js";
+import { SplineContainer, SplineData } from "./Spline.js";
+export var SplineUtils;
+(function (SplineUtils) {
+    /**
+     * Creates a SplineContainer from an array of points.
+     * @param positions The positions of the knots.
+     * @param closed Whether the spline is closed (the last knot connects to the first).
+     * @param tension The tension of the spline. 0 is no tension, 1 is high tension (straight lines between knots). Default is 0.75.
+     * @return The created SplineContainer component - add it to an Object3D to use it.
+     */
+    function createFromPoints(positions, closed = false, tension = .75) {
+        const spline = new SplineContainer();
+        const tangentFactor = 1 - Mathf.clamp(tension, 0, 1);
+        positions.forEach((pos, index) => {
+            const tangent = new Vector3();
+            if (index < positions.length - 1)
+                tangent.subVectors(positions[index + 1], pos).normalize().multiplyScalar(tangentFactor);
+            else if (closed && positions.length > 1)
+                tangent.subVectors(positions[0], pos).normalize().multiplyScalar(tangentFactor);
+            const knot = new SplineData();
+            knot.position.copy(pos);
+            knot.tangentIn.copy(tangent);
+            knot.tangentOut.copy(tangent);
+            spline.addKnot(knot);
+        });
+        spline.closed = closed;
+        return spline;
+    }
+    SplineUtils.createFromPoints = createFromPoints;
+})(SplineUtils || (SplineUtils = {}));
+//# sourceMappingURL=SplineUtils.js.map

package/lib/engine-components/splines/SplineUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SplineUtils.js","sourceRoot":"","sources":["../../../src/engine-components/splines/SplineUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,KAAW,WAAW,CAyB3B;AAzBD,WAAiB,WAAW;IAExB;;;;;;OAMG;IACH,SAAgB,gBAAgB,CAAC,SAAoB,EAAE,SAAkB,KAAK,EAAE,UAAkB,GAAG;QACjG,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QACrC,MAAM,aAAa,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACrD,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC9B,IAAI,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;iBACrH,IAAI,MAAM,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YACzH,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC9B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,OAAO,MAAM,CAAC;IAClB,CAAC;IAfe,4BAAgB,mBAe/B,CAAA;AACL,CAAC,EAzBgB,WAAW,KAAX,WAAW,QAyB3B"}

package/lib/engine-components/splines/SplineWalker.d.ts

@@ -0,0 +1,47 @@
+import { Object3D } from "three";
+import { Behaviour } from "../Component.js";
+import { SplineContainer } from "./Spline.js";
+/**
+ * Moves an object along a spline. Use this with a SplineContainer component.
+ */
+export declare class SplineWalker extends Behaviour {
+    /**
+     * The spline to use/walk along. Add a SplineContainer component to an object and assign it here.
+     */
+    spline: SplineContainer | null;
+    /** The object to move along the spline. If object is undefined then the spline walker will use the gameObject the component has been added to
+     * @default undefined
+    */
+    object?: Object3D | null;
+    /** The object to look at while moving along the spline
+     * @default null
+    */
+    lookAt: Object3D | null;
+    /**
+     * When clamp is set to true, the position01 value will be clamped between 0 and 1 and the object will not loop the spline.
+     * @default false
+     */
+    clamp: boolean;
+    /** The current position on the spline. The value ranges from 0 (start of the spline curve) to 1 (end of the spline curve)
+     * @default 0
+     */
+    get position01(): number;
+    set position01(v: number);
+    /** Resets the position to 0 */
+    reset(): void;
+    /**
+     * If true the SplineWalker will automatically move along the spline
+     * @default true
+     */
+    autoRun: boolean;
+    /**
+     * The duration in seconds it takes to complete the whole spline when autoWalk is enabled.
+     * @default 10
+     */
+    duration: number;
+    private _position01;
+    /** @internal */
+    start(): void;
+    update(): void;
+    private updateFromPosition;
+}

package/lib/engine-components/splines/SplineWalker.js

@@ -0,0 +1,113 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { Object3D } from "three";
+import { Mathf } from "../../engine/engine_math.js";
+import { serializeable } from "../../engine/engine_serialization_decorator.js";
+import { Behaviour } from "../Component.js";
+import { SplineContainer } from "./Spline.js";
+/**
+ * Moves an object along a spline. Use this with a SplineContainer component.
+ */
+export class SplineWalker extends Behaviour {
+    /**
+     * The spline to use/walk along. Add a SplineContainer component to an object and assign it here.
+     */
+    spline = null;
+    /** The object to move along the spline. If object is undefined then the spline walker will use the gameObject the component has been added to
+     * @default undefined
+    */
+    object = undefined;
+    /** The object to look at while moving along the spline
+     * @default null
+    */
+    lookAt = null;
+    /**
+     * When clamp is set to true, the position01 value will be clamped between 0 and 1 and the object will not loop the spline.
+     * @default false
+     */
+    clamp = false;
+    /** The current position on the spline. The value ranges from 0 (start of the spline curve) to 1 (end of the spline curve)
+     * @default 0
+     */
+    // @type float
+    get position01() {
+        return this._position01;
+    }
+    set position01(v) {
+        this._position01 = v;
+        this.updateFromPosition();
+    }
+    /** Resets the position to 0 */
+    reset() {
+        this._position01 = 0;
+    }
+    /**
+     * If true the SplineWalker will automatically move along the spline
+     * @default true
+     */
+    autoRun = true;
+    /**
+     * The duration in seconds it takes to complete the whole spline when autoWalk is enabled.
+     * @default 10
+     */
+    duration = 10;
+    // #region internal
+    _position01 = 0;
+    /** @internal */
+    start() {
+        if (this.object === undefined)
+            this.object = this.gameObject;
+        this.updateFromPosition();
+    }
+    update() {
+        if (this.autoRun) {
+            this._position01 += this.context.time.deltaTime / this.duration;
+            this.updateFromPosition();
+        }
+    }
+    updateFromPosition() {
+        if (!this.spline || !this.spline.curve)
+            return;
+        if (!this.object)
+            return;
+        if (this.clamp)
+            this._position01 = Mathf.clamp01(this._position01);
+        else
+            this._position01 = this._position01 % 1;
+        const t = this._position01 >= 1 ? 1 : this._position01 % 1;
+        const pt = this.spline.getPointAt(t);
+        this.object.worldPosition = pt;
+        if (!this.lookAt) {
+            const tan = this.spline.getTangentAt(t);
+            this.object.lookAt(pt.add(tan));
+        }
+        else
+            this.object.lookAt(this.lookAt.worldPosition);
+    }
+}
+__decorate([
+    serializeable(SplineContainer)
+], SplineWalker.prototype, "spline", void 0);
+__decorate([
+    serializeable(Object3D)
+], SplineWalker.prototype, "object", void 0);
+__decorate([
+    serializeable(Object3D)
+], SplineWalker.prototype, "lookAt", void 0);
+__decorate([
+    serializeable()
+], SplineWalker.prototype, "clamp", void 0);
+__decorate([
+    serializeable()
+], SplineWalker.prototype, "position01", null);
+__decorate([
+    serializeable()
+], SplineWalker.prototype, "autoRun", void 0);
+__decorate([
+    serializeable()
+], SplineWalker.prototype, "duration", void 0);
+//# sourceMappingURL=SplineWalker.js.map

package/lib/engine-components/splines/SplineWalker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SplineWalker.js","sourceRoot":"","sources":["../../../src/engine-components/splines/SplineWalker.ts"],"names":[],"mappings":"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"}

package/lib/engine-components/splines/index.d.ts

@@ -0,0 +1,3 @@
+export { SplineContainer } from "./Spline.js";
+export { SplineUtils } from "./SplineUtils.js";
+export { SplineWalker } from "./SplineWalker.js";

package/lib/engine-components/splines/index.js

@@ -0,0 +1,4 @@
+export { SplineContainer } from "./Spline.js";
+export { SplineUtils } from "./SplineUtils.js";
+export { SplineWalker } from "./SplineWalker.js";
+//# sourceMappingURL=index.js.map

package/lib/engine-components/splines/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/engine-components/splines/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/engine",
-  "version": "4.8.8",
+  "version": "4.8.9-next.5e888f7",
   "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development with great integrations into editors like Unity or Blender - and can be deployed onto any device! It is flexible, extensible and networking and XR are built-in.",
   "main": "dist/needle-engine.min.js",
   "exports": {
@@ -93,8 +93,8 @@
   ],
   "dependencies": {
     "@dimforge/rapier3d-compat": "^0.14.0",
-    "@needle-tools/gltf-progressive": "3.3.2",
-    "@needle-tools/three-animation-pointer": "1.0.1",
+    "@needle-tools/gltf-progressive": "3.3.3",
+    "@needle-tools/three-animation-pointer": "1.0.2",
     "@webxr-input-profiles/motion-controllers": "^1.0.0",
     "flatbuffers": "2.0.4",
     "md5": "^2.3.0",
@@ -168,4 +168,4 @@
   "module": "lib/needle-engine.js",
   "typings": "lib/needle-engine.d.ts",
   "types": "lib/needle-engine.d.ts"
-}
+}

package/plugins/common/files.js

@@ -24,9 +24,12 @@ export function copyFilesSync(src, dest, override = true, ctx = undefined) {
         });
     }
     else if (override || !existsSync(dest)) {
-        if (ctx) {
-            ctx.count += 1;
+        if (exists) {
+            if (ctx) {
+                ctx.count += 1;
+            }
+            copyFileSync(src, dest);
         }
-        copyFileSync(src, dest);
+        else console.warn(`[needle-copy] - File at ${src} does not exist`);
     }
 };

package/plugins/vite/alias.js

@@ -60,8 +60,9 @@ const packages_to_resolve = {
     'postprocessing': "auto-resolve",
     '@dimforge/rapier3d-compat': "auto-resolve",
 
-    '@needle-tools/gltf-progressive': "auto-resolve",
-    '@needle-tools/materialx': "auto-resolve",
+    // Note: this isnt necessary anymore since we exclude needle-engine from optimization when locally installed in the dev server
+    // '@needle-tools/gltf-progressive': "auto-resolve",
+    // '@needle-tools/materialx': "auto-resolve",
 }
 
 /**

package/plugins/vite/editor-connection.js

@@ -63,16 +63,16 @@ function createPlugin(isInstalled) {
         name: "needle-editor-connection",
         // Setup HMR port for connecting to the editor
         config(config) {
-            if (!isInstalled) {
+            if (isInstalled) {
                 if (!config.server) config.server = {};
                 if (!config.server.hmr) config.server.hmr = {};
                 if (config.server.hmr === false) {
-                    setTimeout(() => console.log("HMR is disabled, not initializing Needle Editor"));
+                    setTimeout(() => console.log("[needle-editor-sync] HMR is disabled, not initializing Needle Editor"));
                     return;
                 }
-                if (config.server.hmr.port !== 1107) {
+                if (config.server.hmr.port === undefined) {
                     config.server.hmr.port = 1107;
-                    setTimeout(() => console.log("Update HMR port to " + config.server.hmr.port));
+                    setTimeout(() => console.log("[needle-editor-sync] Update HMR port to " + config.server.hmr.port));
                 }
             }
 

package/src/engine/codegen/register_types.ts

@@ -95,6 +95,8 @@ import { SmoothFollow } from "../../engine-components/SmoothFollow.js";
 import { SpatialTriggerReceiver } from "../../engine-components/SpatialTrigger.js";
 import { SpatialTrigger } from "../../engine-components/SpatialTrigger.js";
 import { SpectatorCamera } from "../../engine-components/SpectatorCamera.js";
+import { SplineContainer } from "../../engine-components/splines/Spline.js";
+import { SplineWalker } from "../../engine-components/splines/SplineWalker.js";
 import { SpriteRenderer } from "../../engine-components/SpriteRenderer.js";
 import { SyncedCamera } from "../../engine-components/SyncedCamera.js";
 import { SyncedRoom } from "../../engine-components/SyncedRoom.js";
@@ -245,6 +247,8 @@ TypeStore.add("SmoothFollow", SmoothFollow);
 TypeStore.add("SpatialTriggerReceiver", SpatialTriggerReceiver);
 TypeStore.add("SpatialTrigger", SpatialTrigger);
 TypeStore.add("SpectatorCamera", SpectatorCamera);
+TypeStore.add("SplineContainer", SplineContainer);
+TypeStore.add("SplineWalker", SplineWalker);
 TypeStore.add("SpriteRenderer", SpriteRenderer);
 TypeStore.add("SyncedCamera", SyncedCamera);
 TypeStore.add("SyncedRoom", SyncedRoom);

package/src/engine/engine_addressables.ts

@@ -440,6 +440,8 @@ export class AssetReference {
             const scene = asset.scene as Group;
             if (scene.isGroup && scene.children.length === 1 && scene.children[0].name + "glb" === scene.name) {
                 const root = scene.children[0];
+                // HACK we want to keep the animations on the root object. Please keep in sync with engine_loader. This is so autoplay animations works (e.g. with AnimationUtils.autoplayAnimations where we get the animations from the root object). One case where an additioanl root exists is the SOC old mcdonald scene
+                root.animations = scene.animations;
                 return root;
             }
             // ok the scene is the scene, just use that then

package/src/engine/engine_animation.ts

@@ -120,7 +120,7 @@ export class AnimationUtils {
                     }
                 }
 
-                let animationComponent = findAnimationGameObjectInParent(obj) || findAnimationGameObjectInParent(scene);
+                let animationComponent = findAnimationComponentInParent(obj) || findAnimationComponentInParent(scene);
                 if (!animationComponent) {
                     const anim = TypeStore.get("Animation");
                     animationComponent = scene.addComponent(anim);
@@ -137,18 +137,18 @@ export class AnimationUtils {
         }
         return animationComponents;
 
-        function findAnimationGameObjectInParent(obj): IAnimationComponent | null {
+        function findAnimationComponentInParent(obj): IAnimationComponent | null {
             if (!obj) return null;
             const components = obj.userData?.components;
             if (components && components.length > 0) {
                 for (let i = 0; i < components.length; i++) {
                     const component = components[i] as IAnimationComponent;
                     if (component.isAnimationComponent === true) {
-                        return obj;
+                        return component;
                     }
                 }
             }
-            return findAnimationGameObjectInParent(obj.parent);
+            return findAnimationComponentInParent(obj.parent);
         }
     }
 }