Needle Engine 3.32.3-alpha

Files changed (9) hide show

src/engine/engine_context.ts +15 -1
src/engine/engine_input.ts +50 -34
src/engine/engine_physics_rapier.ts +12 -6
src/engine/engine_physics.ts +13 -11
src/engine/engine_utils.ts +27 -0
src/engine/xr/NeedleXRController.ts +4 -1
src/engine-components/ParticleSystem.ts +5 -0
src/engine-components/ParticleSystemModules.ts +9 -2
src/engine-components/webxr/WebARSessionRoot.ts +13 -7

src/engine/engine_context.ts CHANGED Viewed

@@ -294,11 +294,18 @@
 	readonly scripts_immersive_ar: INeedleXRSessionEventReceiver[] = [];
 	readonly coroutines: { [FrameEvent: number]: Array<CoroutineData> } = {}
+	/** callbacks called once after the context has been created */
 	readonly post_setup_callbacks: Function[] = [];
+	/** called every frame at the beginning of the frame (after component start events and before earlyUpdate) */
 	readonly pre_update_callbacks: Function[] = [];
+	/** called every frame before rendering (after all component events) */
 	readonly pre_render_callbacks: Array<(frame: XRFrame | null) => void> = [];
+	/** called every frame after rendering (after all component events) */
 	readonly post_render_callbacks: Function[] = [];
+	/** called every frame befroe update (this list is emptied every frame) */
+	readonly pre_update_oneshot_callbacks: Function[] = [];
 	readonly new_scripts: IComponent[] = [];
 	readonly new_script_start: IComponent[] = [];
 	readonly new_scripts_pre_setup_callbacks: Function[] = [];
@@ -410,7 +417,7 @@
 				}
 			}
 		}
-		if(debug) console.log("Using Renderer Parameters:", params, this.domElement)
+		if (debug) console.log("Using Renderer Parameters:", params, this.domElement)
 		this.renderer = new WebGLRenderer(params);
@@ -1078,6 +1085,13 @@
 			this.setCurrentCamera(last);
 		}
+		if (this.pre_update_oneshot_callbacks) {
+			for (const i in this.pre_update_oneshot_callbacks) {
+				this.pre_update_oneshot_callbacks[i]();
+			}
+			this.pre_update_oneshot_callbacks.length = 0;
+		}
 		if (this.pre_update_callbacks) {
 			for (const i in this.pre_update_callbacks) {
 				this.pre_update_callbacks[i]();

src/engine/engine_input.ts CHANGED Viewed

@@ -6,9 +6,43 @@
 const debug = getParam("debuginput");
+export const enum PointerType {
+    Mouse = "mouse",
+    Touch = "touch",
+    Controller = "controller",
+    Hand = "hand"
+}
+export type PointerTypeNames = EnumToPrimitiveUnion<PointerType>;
+const enum PointerEnumType {
+    PointerDown = "pointerdown",
+    PointerUp = "pointerup",
+    PointerMove = "pointermove",
+}
+const enum KeyboardEnumType {
+    KeyDown = "keydown",
+    KeyUp = "keyup",
+    KeyPressed = "keypress"
+}
+export const enum InputEvents {
+    PointerDown = "pointerdown",
+    PointerUp = "pointerup",
+    PointerMove = "pointermove",
+    KeyDown = "keydown",
+    KeyUp = "keyup",
+    KeyPressed = "keypress"
+}
+export type InputEventNames = EnumToPrimitiveUnion<InputEvents>;
 export declare type NEPointerEventInit = PointerEventInit &
 {
+    origin: object;
     pointerId: number;
+    pointerType: PointerTypeNames;
     mode: XRTargetRayMode,
     ray?: Ray;
     /** The control object for this input. In the case of spatial devices the controller,
@@ -19,6 +53,12 @@
 export class NEPointerEvent extends PointerEvent {
+    /** The origin of the event contains a reference to the creator of this event.
+     * This can be the Needle Engine input system or e.g. a XR controller
+     */
+    readonly origin: object;
     /** the browser event that triggered this event (if any) */
     readonly source: Event | null;
@@ -36,8 +76,12 @@
     /** true if this event is a double click */
     isDoubleClick: boolean = false;
+    // this is set via the init arguments (we override it here for intellisense to show the string options)
+    override readonly pointerType!: PointerTypeNames;
     constructor(type: InputEvents | InputEventNames, source: Event | null, init: NEPointerEventInit) {
         super(type, init)
+        this.origin = init.origin;
         this.source = source;
         this.mode = init.mode;
         this.ray = init.ray;
@@ -88,35 +132,7 @@
 }
-export const enum PointerType {
-    Mouse = "mouse",
-    Touch = "touch",
-    Controller = "controller",
-    Hand = "hand"
-}
-const enum PointerEnumType {
-    PointerDown = "pointerdown",
-    PointerUp = "pointerup",
-    PointerMove = "pointermove",
-}
-const enum KeyboardEnumType {
-    KeyDown = "keydown",
-    KeyUp = "keyup",
-    KeyPressed = "keypress"
-}
-export const enum InputEvents {
-    PointerDown = "pointerdown",
-    PointerUp = "pointerup",
-    PointerMove = "pointermove",
-    KeyDown = "keydown",
-    KeyUp = "keyup",
-    KeyPressed = "keypress"
-}
-export type InputEventNames = EnumToPrimitiveUnion<InputEvents>;
 declare type PointerEventListener = (evt: NEPointerEvent) => void;
 declare type KeyboardEventListener = (evt: NEKeyboardEvent) => void;
 declare type InputEventListener = PointerEventListener | KeyboardEventListener;
@@ -587,7 +603,7 @@
             const id = this.getPointerIndex(touch.identifier)
             if (debug) showBalloonMessage(`touch start #${id}, identifier:${touch.identifier}`);
             const space = this.getAndUpdateSpatialObjectForScreenPosition(id, touch.clientX, touch.clientY);
-            const ne = new NEPointerEvent(InputEvents.PointerDown, evt, { mode: "screen", pointerId: id, button: 0, clientX: touch.clientX, clientY: touch.clientY, pointerType: PointerType.Touch, buttonName: "unknown", device: space });
+            const ne = new NEPointerEvent(InputEvents.PointerDown, evt, { origin: this, mode: "screen", pointerId: id, button: 0, clientX: touch.clientX, clientY: touch.clientY, pointerType: PointerType.Touch, buttonName: "unknown", device: space });
             this.onDown(ne);
         }
     }
@@ -598,7 +614,7 @@
             const touch = evt.changedTouches[i];
             const id = this.getPointerIndex(touch.identifier)
             const space = this.getAndUpdateSpatialObjectForScreenPosition(id, touch.clientX, touch.clientY);
-            const ne = new NEPointerEvent(InputEvents.PointerMove, evt, { mode: "screen", pointerId: id, button: 0, clientX: touch.clientX, clientY: touch.clientY, pointerType: PointerType.Touch, buttonName: "unknown", device: space });
+            const ne = new NEPointerEvent(InputEvents.PointerMove, evt, { origin: this, mode: "screen", pointerId: id, button: 0, clientX: touch.clientX, clientY: touch.clientY, pointerType: PointerType.Touch, buttonName: "unknown", device: space });
             this.onMove(ne);
         }
     }
@@ -613,7 +629,7 @@
             if (debug) showBalloonMessage(`touch up #${id}, identifier:${touch.identifier}`);
             const space = this.getAndUpdateSpatialObjectForScreenPosition(id, touch.clientX, touch.clientY);
-            const ne = new NEPointerEvent(InputEvents.PointerUp, evt, { mode: "screen", pointerId: id, button: 0, clientX: touch.clientX, clientY: touch.clientY, pointerType: PointerType.Touch, buttonName: "unknown", device: space });
+            const ne = new NEPointerEvent(InputEvents.PointerUp, evt, { origin: this, mode: "screen", pointerId: id, button: 0, clientX: touch.clientX, clientY: touch.clientY, pointerType: PointerType.Touch, buttonName: "unknown", device: space });
             this.onUp(ne);
         }
     }
@@ -631,7 +647,7 @@
             case 2: buttonName = "right"; break;
         }
         const space = this.getAndUpdateSpatialObjectForScreenPosition(id, evt.clientX, evt.clientY);
-        const ne = new NEPointerEvent(InputEvents.PointerDown, evt, { mode: "screen", pointerId: 0, button: id, clientX: evt.clientX, clientY: evt.clientY, pointerType: PointerType.Mouse, buttonName: buttonName, device: space });
+        const ne = new NEPointerEvent(InputEvents.PointerDown, evt, { origin: this, mode: "screen", pointerId: 0, button: id, clientX: evt.clientX, clientY: evt.clientY, pointerType: PointerType.Mouse, buttonName: buttonName, device: space });
         this.onDown(ne);
     }
@@ -640,7 +656,7 @@
         if (evt.defaultPrevented) return;
         const id = evt.button;
         const space = this.getAndUpdateSpatialObjectForScreenPosition(id, evt.clientX, evt.clientY);
-        const ne = new NEPointerEvent(InputEvents.PointerMove, evt, { mode: "screen", pointerId: 0, button: id, clientX: evt.clientX, clientY: evt.clientY, pointerType: PointerType.Mouse, buttonName: "none", device: space });
+        const ne = new NEPointerEvent(InputEvents.PointerMove, evt, { origin: this, mode: "screen", pointerId: 0, button: id, clientX: evt.clientX, clientY: evt.clientY, pointerType: PointerType.Mouse, buttonName: "none", device: space });
         this.onMove(ne);
     }
@@ -656,7 +672,7 @@
             case 2: buttonName = "right"; break;
         }
         const space = this.getAndUpdateSpatialObjectForScreenPosition(id, evt.clientX, evt.clientY);
-        const ne = new NEPointerEvent(InputEvents.PointerUp, evt, { mode: "screen", pointerId: 0, button: id, clientX: evt.clientX, clientY: evt.clientY, pointerType: PointerType.Mouse, buttonName: buttonName, device: space, });
+        const ne = new NEPointerEvent(InputEvents.PointerUp, evt, { origin: this, mode: "screen", pointerId: 0, button: id, clientX: evt.clientX, clientY: evt.clientY, pointerType: PointerType.Mouse, buttonName: buttonName, device: space, });
         this.onUp(ne);
     }

src/engine/engine_physics_rapier.ts CHANGED Viewed

@@ -166,12 +166,14 @@
     addForce(rigidbody: IRigidbody, force: Vec3, wakeup: boolean) {
         this.validate();
         const body = this.internal_getRigidbody(rigidbody);
-        body?.addForce(force, wakeup)
+        if(body) body.addForce(force, wakeup)
+        else console.warn("Rigidbody doesn't exist: can not apply force");
     }
     addImpulse(rigidbody: IRigidbody, force: Vec3, wakeup: boolean) {
         this.validate();
         const body = this.internal_getRigidbody(rigidbody);
-        body?.applyImpulse(force, wakeup)
+        if (body) body.applyImpulse(force, wakeup);
+        else console.warn("Rigidbody doesn't exist: can not apply impulse");
     }
     getLinearVelocity(comp: IRigidbody | ICollider): Vec3 | null {
         this.validate();
@@ -204,13 +206,15 @@
     applyImpulse(rb: IRigidbody, vec: Vec3, wakeup: boolean) {
         this.validate();
         const body = this.internal_getRigidbody(rb);
-        body?.applyImpulse(vec, wakeup);
+        if(body) body.applyImpulse(vec, wakeup);
+        else console.warn("Rigidbody doesn't exist: can not apply impulse");
     }
     wakeup(rb: IRigidbody) {
         this.validate();
         const body = this.internal_getRigidbody(rb);
-        body?.wakeUp();
+        if(body) body.wakeUp();
+        else console.warn("Rigidbody doesn't exist: can not wake up");
     }
     isSleeping(rb: IRigidbody) {
         this.validate();
@@ -220,12 +224,14 @@
     setAngularVelocity(rb: IRigidbody, vec: Vec3, wakeup: boolean) {
         this.validate();
         const body = this.internal_getRigidbody(rb);
-        body?.setAngvel(vec, wakeup);
+        if(body) body.setAngvel(vec, wakeup);
+        else console.warn("Rigidbody doesn't exist: can not set angular velocity");
     }
     setLinearVelocity(rb: IRigidbody, vec: Vec3, wakeup: boolean) {
         this.validate();
         const body = this.internal_getRigidbody(rb);
-        body?.setLinvel(vec, wakeup);
+        if(body) body.setLinvel(vec, wakeup);
+        else console.warn("Rigidbody doesn't exist: can not set linear velocity");
     }
     private context?: IContext;

src/engine/engine_physics.ts CHANGED Viewed

@@ -165,17 +165,19 @@
         if (obj.type === "Mesh" && obj.layers.test(mask) && !Gizmos.isGizmo(obj)) {
             const mesh = obj as Mesh;
             const geo = mesh.geometry;
-            if (!geo.boundingBox)
-                geo.computeBoundingBox();
-            if (geo.boundingBox) {
-                if (mesh.matrixWorldNeedsUpdate) mesh.updateMatrixWorld();
-                const test = this.tempBoundingBox.copy(geo.boundingBox).applyMatrix4(mesh.matrixWorld);
-                if (sp.intersectsBox(test)) {
-                    const wp = getWorldPosition(obj);
-                    const dist = wp.distanceTo(sp.center);
-                    const int = new SphereIntersection(obj, dist, wp);
-                    results.push(int);
-                    if (!traverseChildsAfterHit) return;
+            if (geo) {
+                if (!geo.boundingBox)
+                    geo.computeBoundingBox();
+                if (geo.boundingBox) {
+                    if (mesh.matrixWorldNeedsUpdate) mesh.updateMatrixWorld();
+                    const test = this.tempBoundingBox.copy(geo.boundingBox).applyMatrix4(mesh.matrixWorld);
+                    if (sp.intersectsBox(test)) {
+                        const wp = getWorldPosition(obj);
+                        const dist = wp.distanceTo(sp.center);
+                        const int = new SphereIntersection(obj, dist, wp);
+                        results.push(int);
+                        if (!traverseChildsAfterHit) return;
+                    }
                 }
             }
         }

src/engine/engine_utils.ts CHANGED Viewed

@@ -1,6 +1,8 @@
 // use for typesafe interface method calls
 import { Quaternion, type Vector, Vector2, Vector3, Vector4 } from "three";
 import { type SourceIdentifier } from "./engine_types.js";
+import { ContextRegistry } from "./engine_context_registry.js";
+import { type Context } from "./engine_context.js";
 // https://schneidenbach.gitbooks.io/typescript-cookbook/content/nameof-operator.html
 export const nameofFactory = <T>() => (name: keyof T) => name;
@@ -209,12 +211,37 @@
     return obj;
 }
+/** @returns a promise that resolves after a certain amount of milliseconds
+ * e.g. `await delay(1000)` will wait for 1 second
+*/
 export function delay(milliseconds: number): Promise<void> {
     return new Promise((res, _) => {
         setTimeout(res, milliseconds);
     });
 }
+/** @returns a promise that resolves after a certain amount of frames
+ * e.g. `await delayForFrames(10)` will wait for 10 frames to pass
+*/
+export function delayForFrames(frameCount: number, context?: Context): Promise<void> {
+    if (frameCount <= 0) return Promise.resolve();
+    if (!context) context = ContextRegistry.Current as Context;
+    if (!context) return Promise.reject("No context");
+    const endFrame = context.time.frameCount + frameCount;
+    return new Promise((res, rej) => {
+        if (!context) return rej("No context");
+        const cb = () => {
+            if (context!.time.frameCount >= endFrame) {
+                context!.pre_update_callbacks.splice(context!.pre_update_callbacks.indexOf(cb), 1);
+                res();
+            }
+        }
+        context!.pre_update_callbacks.push(cb);
+    });
+}
 // 1) if a timeline is exported via menu item the audio clip path is relative to the glb (same folder)
 // we need to detect that here and build the new audio source path relative to the new glb location
 // the same is/might be true for any file that is/will be exported via menu item

src/engine/xr/NeedleXRController.ts CHANGED Viewed

@@ -202,6 +202,8 @@
         this.xr.context.scene.add(this._object);
         this._ray = new Ray();
         this.pointerInit = {
+            origin: this,
+            pointerType: this.hand ? "hand" : "controller",
             pointerId: -1, // < this will be updated in the emitPointerEvent method
             mode: this.inputSource.targetRayMode,
             ray: this._ray,
@@ -571,14 +573,15 @@
         // that means if the input device is spatial (AR touch on a screen should be handled via touchdown etc still)
         // Not sure if *this* is enough to determine if the event is spatial or not
         if (this.xr.mode === "immersive-vr" || this.xr.isPassThrough) {
+            this.pointerInit.origin = this;
             this.pointerInit.pointerId = this.index * 10 + button;
+            this.pointerInit.pointerType = this.hand ? "hand" : "controller";
             this.pointerInit.button = button;
             this.pointerInit.buttonName = buttonName;
             this.pointerInit.isPrimary = primary;
             this.pointerInit.mode = this.inputSource.targetRayMode;
             this.pointerInit.ray = this.ray;
             this.pointerInit.device = this.object;
-            this.pointerInit.pointerType = this.hand ? PointerType.Hand : PointerType.Controller;
             const prevContext = Context.Current;
             Context.Current = this.xr.context;

src/engine-components/ParticleSystem.ts CHANGED Viewed

@@ -968,6 +968,9 @@
         const emitter = this._particleSystem.emitter;
         this.context.scene.add(emitter);
+        this.inheritVelocity?.awake();
+        this.inheritVelocity.system = this;
         if (debug) {
             console.log(this);
             this.gameObject.add(new AxesHelper(1))
@@ -1110,6 +1113,8 @@
         this._interface.update();
         this.shape.update(this, this.context, this.main.simulationSpace, this.gameObject);
         this.noise.update(this.context);
+        this.inheritVelocity.system = this;
         this.inheritVelocity?.update(this.context);
         this.velocityOverLifetime.update(this);
     }

src/engine-components/ParticleSystemModules.ts CHANGED Viewed

@@ -1385,11 +1385,18 @@
     mode!: ParticleSystemInheritVelocityMode;
     system!: IParticleSystem;
-    private _lastWorldPosition!: Vector3;
+    private _lastWorldPosition: Vector3 | null = null;
     private _velocity: Vector3 = new Vector3();
     private _temp: Vector3 = new Vector3();
-    update(_context: Context) {
+    awake() {
+        this._lastWorldPosition = null!;
+        this._velocity = new Vector3();
+        this._temp = new Vector3();
+    }
+    update (_context: Context) {
         if (!this.enabled) return;
         if (this.system.worldspace === false) return;
         if (this._lastWorldPosition) {

src/engine-components/webxr/WebARSessionRoot.ts CHANGED Viewed

@@ -3,7 +3,7 @@
 import { serializable } from "../../engine/engine_serialization_decorator.js";
 import { Context } from "../../engine/engine_context.js";
 import { IComponent, IGameObject } from "../../engine/engine_types.js";
-import { NeedleXREventArgs, NeedleXRHitTestResult, NeedleXRSession } from "../../engine/engine_xr.js";
+import { NeedleXRController, NeedleXREventArgs, NeedleXRHitTestResult, NeedleXRSession } from "../../engine/engine_xr.js";
 import { NEPointerEvent } from "../../engine/engine_input.js";
 import { getParam } from "../../engine/engine_utils.js";
 import { destroy } from "../../engine/engine_gameobject.js";
@@ -122,6 +122,7 @@
         for (const ret of this._reticle) {
             destroy(ret);
         }
+        this._reticle.length = 0;
         this._isPlacing = true;
         this.context.input.addEventListener("pointerup", this.onPlaceScene);
     }
@@ -148,7 +149,9 @@
             if (rigObject && rigObject.parent !== this.context.scene) {
                 this.context.scene.add(rigObject);
             }
             // in pass through mode we want to place the scene using an XR controller
+            let controllersDidHit = false;
             if (args.xr.isPassThrough && args.xr.controllers.length > 0) {
                 for (const ctrl of args.xr.controllers) {
                     // with this we can only place with the left / first controller right now
@@ -156,12 +159,13 @@
                     // and then place at the reticle for which the user clicked the place button
                     const hit = ctrl.getHitTest();
                     if (hit) {
+                        controllersDidHit = true;
                         this.updateReticleAndHits(args.xr, ctrl.index, hit, args.xr.rigScale);
                     }
                 }
             }
-            // in screen AR mode we use "camera" hit testing
-            else {
+            // in screen AR mode we use "camera" hit testing (or when using the simulator where controller hit testing is not supported)
+            if (!controllersDidHit) {
                 const hit = args.xr.getHitTest();
                 if (hit) {
                     this.updateReticleAndHits(args.xr, 0, hit, args.xr.rigScale);
@@ -246,10 +250,10 @@
         let reticle = this._reticle[0];
         let hit = this._hits[0];
-        if (evt.mode === "tracked-pointer") {
+        if (evt.origin instanceof NeedleXRController) {
             // until we can use hit testing for both controllers and have multple reticles we only allow placement with the first controller
-            reticle = this._reticle[evt.pointerId];
-            hit = this._hits[evt.pointerId];
+            reticle = this._reticle[evt.origin.index];
+            hit = this._hits[evt.origin.index];
         }
         if (!reticle) {
@@ -346,7 +350,9 @@
             rigObject.position.multiplyScalar(this.arScale);
             rigObject.updateMatrix();
-            if (this.invertForward)
+            // if invert forward is disabled we need to invert the forward rotation
+            // we want to look into positive Z direction (if invertForward is enabled we look into negative Z direction)
+            if (!this.invertForward)
                 rigObject.matrix.premultiply(invertForwardMatrix);
             rigObject.matrix.premultiply(this._startOffset);