@needle-tools/engine 3.28.6-beta → 3.28.7-beta.1

package/src/engine-components/SmoothFollow.ts

@@ -1,58 +1,58 @@
-import { Camera } from "./Camera.js";
-import { Behaviour, GameObject } from "./Component.js";
-import * as THREE from "three";
-import { Mathf } from "../engine/engine_math.js";
-import { serializable } from "../engine/engine_serialization_decorator.js";
-import { Object3D } from "three";
-import { getWorldPosition, getWorldQuaternion } from "../engine/engine_three_utils.js";
-import { Axes } from "../engine/engine_physics.types.js";
-
-export class SmoothFollow extends Behaviour {
-
-    @serializable(Object3D)
-    target: THREE.Object3D | null = null;
-
-    @serializable()
-    followFactor = .1;
-    @serializable()
-    rotateFactor = .1;
-
-    @serializable()
-    positionAxes : Axes = Axes.All;
-
-    flipForward: boolean = false;
-
-    private static _invertForward: THREE.Quaternion = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), Math.PI);
-    private _firstUpdate = true;
-
-    onBeforeRender(): void {
-        this.updateNow(false);
-    }
-
-    updateNow(hard: boolean) {
-        if (!this.target || this.target === this.gameObject) return;
-        if (this.followFactor > 0) {
-            const wp = getWorldPosition(this.target);
-            const fpos = this._firstUpdate || hard ? 1 : Mathf.clamp01(this.context.time.deltaTime * this.followFactor);
-            const currentPosition = this.worldPosition;
-
-            if(this.positionAxes & Axes.X) currentPosition.x = Mathf.lerp(currentPosition.x, wp.x, fpos);
-            if(this.positionAxes & Axes.Y) currentPosition.y = Mathf.lerp(currentPosition.y, wp.y, fpos);
-            if(this.positionAxes & Axes.Z) currentPosition.z = Mathf.lerp(currentPosition.z, wp.z, fpos);
-            
-            // TODO lerp distance from target as well
-
-            this.worldPosition = currentPosition;
-        }
-        if (this.rotateFactor > 0) {
-            const wr = getWorldQuaternion(this.target);
-            if (this.flipForward) {
-                wr.premultiply(SmoothFollow._invertForward);
-            }
-            const frot = this._firstUpdate || hard ? 1 : Mathf.clamp01(this.context.time.deltaTime * this.rotateFactor);
-
-            this.worldQuaternion = this.worldQuaternion.slerp(wr, frot);
-        }
-        this._firstUpdate = false;
-    }
+import { Camera } from "./Camera.js";
+import { Behaviour, GameObject } from "./Component.js";
+import * as THREE from "three";
+import { Mathf } from "../engine/engine_math.js";
+import { serializable } from "../engine/engine_serialization_decorator.js";
+import { Object3D } from "three";
+import { getWorldPosition, getWorldQuaternion } from "../engine/engine_three_utils.js";
+import { Axes } from "../engine/engine_physics.types.js";
+
+export class SmoothFollow extends Behaviour {
+
+    @serializable(Object3D)
+    target: THREE.Object3D | null = null;
+
+    @serializable()
+    followFactor = .1;
+    @serializable()
+    rotateFactor = .1;
+
+    @serializable()
+    positionAxes : Axes = Axes.All;
+
+    flipForward: boolean = false;
+
+    private static _invertForward: THREE.Quaternion = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), Math.PI);
+    private _firstUpdate = true;
+
+    onBeforeRender(): void {
+        this.updateNow(false);
+    }
+
+    updateNow(hard: boolean) {
+        if (!this.target || this.target === this.gameObject) return;
+        if (this.followFactor > 0) {
+            const wp = getWorldPosition(this.target);
+            const fpos = this._firstUpdate || hard ? 1 : Mathf.clamp01(this.context.time.deltaTime * this.followFactor);
+            const currentPosition = this.worldPosition;
+
+            if(this.positionAxes & Axes.X) currentPosition.x = Mathf.lerp(currentPosition.x, wp.x, fpos);
+            if(this.positionAxes & Axes.Y) currentPosition.y = Mathf.lerp(currentPosition.y, wp.y, fpos);
+            if(this.positionAxes & Axes.Z) currentPosition.z = Mathf.lerp(currentPosition.z, wp.z, fpos);
+            
+            // TODO lerp distance from target as well
+
+            this.worldPosition = currentPosition;
+        }
+        if (this.rotateFactor > 0) {
+            const wr = getWorldQuaternion(this.target);
+            if (this.flipForward) {
+                wr.premultiply(SmoothFollow._invertForward);
+            }
+            const frot = this._firstUpdate || hard ? 1 : Mathf.clamp01(this.context.time.deltaTime * this.rotateFactor);
+
+            this.worldQuaternion = this.worldQuaternion.slerp(wr, frot);
+        }
+        this._firstUpdate = false;
+    }
 }

package/src/engine-components/SpatialTrigger.ts

@@ -1,142 +1,142 @@
-import { BoxHelper, Layers } from "three";
-import { Behaviour, GameObject } from "./Component.js";
-import { BoxHelperComponent } from "./BoxHelperComponent.js"
-import { EventList } from "./EventList.js";
-import { serializable } from "../engine/engine_serialization_decorator.js";
-import { getParam } from "../engine/engine_utils.js";
-
-const debug = getParam("debugspatialtrigger");
-
-const layer1 = new Layers();
-const layer2 = new Layers();
-function testMask(mask1, mask2) {
-    layer1.mask = mask1;
-    layer2.mask = mask2;
-    return layer1.test(layer2);
-}
-
-export class SpatialTriggerReceiver extends Behaviour {
-
-    // currently Layers in unity but maybe this should be a string or plane number? Or should it be a bitmask to allow receivers use multiple triggers?
-    @serializable()
-    triggerMask: number = 0;
-    @serializable(EventList)
-    onEnter?: EventList;
-    @serializable(EventList)
-    onStay?: EventList;
-    @serializable(EventList)
-    onExit?: EventList;
-
-    start() {
-        if (debug) console.log(this.name, this.triggerMask, this);
-    }
-
-    update(): void {
-        this.currentIntersected.length = 0;
-        for (const trigger of SpatialTrigger.triggers) {
-            if (testMask(trigger.triggerMask, this.triggerMask)) {
-                if (trigger.test(this.gameObject)) {
-                    this.currentIntersected.push(trigger);
-                }
-            }
-        }
-        for (let i = this.lastIntersected.length - 1; i >= 0; i--) {
-            const last = this.lastIntersected[i]
-            if (this.currentIntersected.indexOf(last) < 0) {
-                this.onExitTrigger(last);
-                this.lastIntersected.splice(i, 1);
-            }
-        }
-        for (const cur of this.currentIntersected) {
-            if (this.lastIntersected.indexOf(cur) < 0)
-                this.onEnterTrigger(cur);
-            this.onStayTrigger(cur);
-        }
-        this.lastIntersected.length = 0;
-        this.lastIntersected.push(...this.currentIntersected);
-
-    }
-
-    currentIntersected: SpatialTrigger[] = [];
-    lastIntersected: SpatialTrigger[] = [];
-
-    onEnterTrigger(trigger: SpatialTrigger): void {
-        if(debug) console.log("ENTER TRIGGER", this.name, trigger.name, this, trigger);
-        trigger.raiseOnEnterEvent(this);
-        this.onEnter?.invoke(this, trigger);
-    }
-    onExitTrigger(trigger: SpatialTrigger): void {
-        if(debug) console.log("EXIT TRIGGER", this.name, trigger.name, this, trigger);
-        trigger.raiseOnExitEvent(this);
-        this.onExit?.invoke(this, trigger);
-    }
-
-    onStayTrigger(trigger: SpatialTrigger): void {
-        trigger.raiseOnStayEvent(this);
-        this.onStay?.invoke(this, trigger);
-    }
-}
-
-export class SpatialTrigger extends Behaviour {
-
-    static triggers: SpatialTrigger[] = [];
-
-    @serializable()
-    triggerMask?: number;
-
-    private boxHelper?: BoxHelperComponent;
-
-    start() {
-        if (debug)
-            console.log(this.name, this.triggerMask, this);
-    }
-
-    onEnable(): void {
-        SpatialTrigger.triggers.push(this);
-        if (!this.boxHelper) {
-            this.boxHelper = GameObject.addNewComponent(this.gameObject, BoxHelperComponent);
-            this.boxHelper?.showHelper(null, debug as boolean);
-        }
-    }
-    onDisable(): void {
-        SpatialTrigger.triggers.splice(SpatialTrigger.triggers.indexOf(this), 1);
-    }
-
-    test(obj: THREE.Object3D): boolean {
-        if (!this.boxHelper) return false;
-        return this.boxHelper.isInBox(obj) ?? false;
-    }
-
-    // private args: SpatialTriggerEventArgs = new SpatialTriggerEventArgs();
-
-    raiseOnEnterEvent(rec: SpatialTriggerReceiver) {
-        // this.args.trigger = this;
-        // this.args.source = rec;
-        GameObject.foreachComponent(this.gameObject, c => {
-            if (c === rec) return;
-            if(c instanceof SpatialTriggerReceiver) {
-                c.onEnterTrigger(this);
-            }
-        }, false);
-    }
-
-    raiseOnStayEvent(rec: SpatialTriggerReceiver) {
-        // this.args.trigger = this;
-        // this.args.source = rec;
-        GameObject.foreachComponent(this.gameObject, c => {
-            if (c === rec) return;
-            if(c instanceof SpatialTriggerReceiver) {
-                c.onStayTrigger(this);
-            }
-        }, false);
-    }
-
-    raiseOnExitEvent(rec: SpatialTriggerReceiver) {
-        GameObject.foreachComponent(this.gameObject, c => {
-            if (c === rec) return;
-            if(c instanceof SpatialTriggerReceiver) {
-                c.onExitTrigger(this);
-            }
-        }, false);
-    }
-}
+import { BoxHelper, Layers } from "three";
+import { Behaviour, GameObject } from "./Component.js";
+import { BoxHelperComponent } from "./BoxHelperComponent.js"
+import { EventList } from "./EventList.js";
+import { serializable } from "../engine/engine_serialization_decorator.js";
+import { getParam } from "../engine/engine_utils.js";
+
+const debug = getParam("debugspatialtrigger");
+
+const layer1 = new Layers();
+const layer2 = new Layers();
+function testMask(mask1, mask2) {
+    layer1.mask = mask1;
+    layer2.mask = mask2;
+    return layer1.test(layer2);
+}
+
+export class SpatialTriggerReceiver extends Behaviour {
+
+    // currently Layers in unity but maybe this should be a string or plane number? Or should it be a bitmask to allow receivers use multiple triggers?
+    @serializable()
+    triggerMask: number = 0;
+    @serializable(EventList)
+    onEnter?: EventList;
+    @serializable(EventList)
+    onStay?: EventList;
+    @serializable(EventList)
+    onExit?: EventList;
+
+    start() {
+        if (debug) console.log(this.name, this.triggerMask, this);
+    }
+
+    update(): void {
+        this.currentIntersected.length = 0;
+        for (const trigger of SpatialTrigger.triggers) {
+            if (testMask(trigger.triggerMask, this.triggerMask)) {
+                if (trigger.test(this.gameObject)) {
+                    this.currentIntersected.push(trigger);
+                }
+            }
+        }
+        for (let i = this.lastIntersected.length - 1; i >= 0; i--) {
+            const last = this.lastIntersected[i]
+            if (this.currentIntersected.indexOf(last) < 0) {
+                this.onExitTrigger(last);
+                this.lastIntersected.splice(i, 1);
+            }
+        }
+        for (const cur of this.currentIntersected) {
+            if (this.lastIntersected.indexOf(cur) < 0)
+                this.onEnterTrigger(cur);
+            this.onStayTrigger(cur);
+        }
+        this.lastIntersected.length = 0;
+        this.lastIntersected.push(...this.currentIntersected);
+
+    }
+
+    currentIntersected: SpatialTrigger[] = [];
+    lastIntersected: SpatialTrigger[] = [];
+
+    onEnterTrigger(trigger: SpatialTrigger): void {
+        if(debug) console.log("ENTER TRIGGER", this.name, trigger.name, this, trigger);
+        trigger.raiseOnEnterEvent(this);
+        this.onEnter?.invoke(this, trigger);
+    }
+    onExitTrigger(trigger: SpatialTrigger): void {
+        if(debug) console.log("EXIT TRIGGER", this.name, trigger.name, this, trigger);
+        trigger.raiseOnExitEvent(this);
+        this.onExit?.invoke(this, trigger);
+    }
+
+    onStayTrigger(trigger: SpatialTrigger): void {
+        trigger.raiseOnStayEvent(this);
+        this.onStay?.invoke(this, trigger);
+    }
+}
+
+export class SpatialTrigger extends Behaviour {
+
+    static triggers: SpatialTrigger[] = [];
+
+    @serializable()
+    triggerMask?: number;
+
+    private boxHelper?: BoxHelperComponent;
+
+    start() {
+        if (debug)
+            console.log(this.name, this.triggerMask, this);
+    }
+
+    onEnable(): void {
+        SpatialTrigger.triggers.push(this);
+        if (!this.boxHelper) {
+            this.boxHelper = GameObject.addNewComponent(this.gameObject, BoxHelperComponent);
+            this.boxHelper?.showHelper(null, debug as boolean);
+        }
+    }
+    onDisable(): void {
+        SpatialTrigger.triggers.splice(SpatialTrigger.triggers.indexOf(this), 1);
+    }
+
+    test(obj: THREE.Object3D): boolean {
+        if (!this.boxHelper) return false;
+        return this.boxHelper.isInBox(obj) ?? false;
+    }
+
+    // private args: SpatialTriggerEventArgs = new SpatialTriggerEventArgs();
+
+    raiseOnEnterEvent(rec: SpatialTriggerReceiver) {
+        // this.args.trigger = this;
+        // this.args.source = rec;
+        GameObject.foreachComponent(this.gameObject, c => {
+            if (c === rec) return;
+            if(c instanceof SpatialTriggerReceiver) {
+                c.onEnterTrigger(this);
+            }
+        }, false);
+    }
+
+    raiseOnStayEvent(rec: SpatialTriggerReceiver) {
+        // this.args.trigger = this;
+        // this.args.source = rec;
+        GameObject.foreachComponent(this.gameObject, c => {
+            if (c === rec) return;
+            if(c instanceof SpatialTriggerReceiver) {
+                c.onStayTrigger(this);
+            }
+        }, false);
+    }
+
+    raiseOnExitEvent(rec: SpatialTriggerReceiver) {
+        GameObject.foreachComponent(this.gameObject, c => {
+            if (c === rec) return;
+            if(c instanceof SpatialTriggerReceiver) {
+                c.onExitTrigger(this);
+            }
+        }, false);
+    }
+}