Needle Engine 3.21.5

Files changed (7) hide show

src/engine-components/ui/Button.ts +4 -0
src/engine/engine_input.ts +1 -7
src/engine/engine_physics_rapier.ts +0 -2
src/engine-components/ui/EventSystem.ts +8 -2
src/engine-components/timeline/PlayableDirector.ts +41 -30
src/engine-components/webxr/WebXR.ts +31 -9
src/engine-components/webxr/WebXRPlaneTracking.ts +2 -2

src/engine-components/ui/Button.ts CHANGED Viewed

@@ -182,6 +182,10 @@
         super.onEnable();
     }
+    onDestroy(): void {
+        if (this._isHovered) this.context.input.setCursorNormal();
+    }
     private _requestedAnimatorTrigger?: string;
     private *setAnimatorTriggerAtEndOfFrame(requestedTriggerId: string) {
         this._requestedAnimatorTrigger = requestedTriggerId;

src/engine/engine_input.ts CHANGED Viewed

@@ -572,14 +572,8 @@
     }
     // moveEvent?: Event;
     private onMove(evt: NEPointerEvent) {
-        // when we get a pointer move event then the click state needs to be reset
-        // this happens for example if we use touch emulation in chrome and click on an object without using the mouse
-        // since the EventSystem queries `isPointerClicked` and we get an event for onMove we would then falsely emit
-        // two onPointerClick events for one click
         const index = evt.button;
-        this._pointerClick[index] = false;
-        this._pointerDoubleClick[index] = false;
         const isDown = this.getPointerPressed(index);
         if (isDown === false && !this.isInRect(evt)) return;
         if (evt.pointerType === PointerType.Touch && !isDown) return;

src/engine/engine_physics_rapier.ts CHANGED Viewed

@@ -804,7 +804,6 @@
                 col.setDensity(1);
             }
             rigidbody.recomputeMassPropertiesFromColliders();
-            console.log(rigidbody.mass())
         }
         else {
             rigidbody.setAdditionalMass(rb.mass, false);
@@ -813,7 +812,6 @@
                 col.setDensity(0);
             }
             rigidbody.recomputeMassPropertiesFromColliders();
-            console.log(rigidbody.mass())
         }
         // https://rapier.rs/docs/user_guides/javascript/rigid_bodies#mass-properties

src/engine-components/ui/EventSystem.ts CHANGED Viewed

@@ -227,7 +227,7 @@
         data.inputSource = this.context.input;
         data.pointerId = pointerId;
-        data.isClicked = this.context.input.getPointerClicked(pointerId)
+        data.isClicked =  pointerEvent.type == InputEvents.PointerUp && this.context.input.getPointerClicked(pointerId)
         // using the input type directly instead of input API -> otherwise onMove events can sometimes be getPointerUp() == true
         data.isDown = pointerEvent.type == InputEvents.PointerDown;
         data.isUp = pointerEvent.type == InputEvents.PointerUp;
@@ -403,7 +403,13 @@
         }
         // save hovered object
-        this.hoveredByID.set(args.pointerId, { obj: object, data: args });
+        const entry = this.hoveredByID.get(args.pointerId);
+        if (!entry)
+            this.hoveredByID.set(args.pointerId, { obj: object, data: args });
+        else {
+            entry.obj = object;
+            entry.data = args;
+        }
         // create / update pressed entry
         if (args.isDown) {

src/engine-components/timeline/PlayableDirector.ts CHANGED Viewed

@@ -191,7 +191,7 @@
         this._isPlaying = false;
         if (this._isPaused) return;
         this._isPaused = true;
-        this.evaluate();
+        this.internalEvaluate();
         this.invokePauseChangedMethodsOnTracks();
         this.invokeStateChangedMethodsOnTracks();
     }
@@ -205,13 +205,13 @@
             this._time = 0;
             this._isPlaying = false;
             this._isPaused = false;
-            this.evaluate();
+            this.internalEvaluate();
             if (pauseChanged) this.invokePauseChangedMethodsOnTracks();
         }
         this._isPlaying = false;
         this._isPaused = false;
         if (pauseChanged && !wasPlaying) this.invokePauseChangedMethodsOnTracks();
-        if(wasPlaying) this.invokeStateChangedMethodsOnTracks();
+        if (wasPlaying) this.invokeStateChangedMethodsOnTracks();
         if (this._internalUpdateRoutine)
             this.stopCoroutine(this._internalUpdateRoutine);
         this._internalUpdateRoutine = null;
@@ -219,28 +219,7 @@
     }
     evaluate() {
-        if (!this.isValid()) return;
-        let t = this._time;
-        switch (this.extrapolationMode) {
-            case DirectorWrapMode.Hold:
-                if (this._speed > 0)
-                    t = Math.min(t, this._duration);
-                else if (this._speed < 0)
-                    t = Math.max(t, 0);
-                this._time = t;
-                break;
-            case DirectorWrapMode.Loop:
-                t %= this._duration;
-                this._time = t;
-                break;
-            case DirectorWrapMode.None:
-                if (t > this._duration) {
-                    this.stop();
-                    return;
-                }
-                break;
-        }
-        this.internalEvaluate(t);
+        this.internalEvaluate(true);
     }
     isValid() {
@@ -303,14 +282,46 @@
         while (this._isPlaying && this.activeAndEnabled) {
             if (!this._isPaused && this._isPlaying) {
                 this._time += this.context.time.deltaTime * this.speed;
-                this.evaluate();
+                this.internalEvaluate();
             }
             // for (let i = 0; i < 5; i++)
             yield;
         }
     }
-    private internalEvaluate(time: number) {
+    /**
+     * PlayableDirector lifecycle should always call this instead of "evaluate"
+     * @param called_by_user If true the evaluation is called by the user (e.g. via evaluate())
+     */
+    private internalEvaluate(called_by_user: boolean = false) {
+        // when the timeline is called by a user via evaluate() we want to keep updating activation tracks
+        // because "isPlaying" might be false but the director is still active. See NE-3737
+        if (!this.isValid()) return;
+        let t = this._time;
+        switch (this.extrapolationMode) {
+            case DirectorWrapMode.Hold:
+                if (this._speed > 0)
+                    t = Math.min(t, this._duration);
+                else if (this._speed < 0)
+                    t = Math.max(t, 0);
+                this._time = t;
+                break;
+            case DirectorWrapMode.Loop:
+                t %= this._duration;
+                this._time = t;
+                break;
+            case DirectorWrapMode.None:
+                if (t > this._duration) {
+                    this.stop();
+                    return;
+                }
+                break;
+        }
+        const time = this._time;
         for (const track of this.playableAsset!.tracks) {
             if (track.muted) continue;
             switch (track.type) {
@@ -319,7 +330,7 @@
                     // then we want to leave objects active state as they were
                     // see NE-3241
                     // TODO: support all "post-playback-state" settings an activation track has, this is just "Leave as is"
-                    if (!this._isPlaying) continue;
+                    if (!called_by_user && !this._isPlaying) continue;
                     for (let i = 0; i < track.outputs.length; i++) {
                         const binding = track.outputs[i];
@@ -518,9 +529,9 @@
                             }
                             // Try to share the mixer with the animator
                             if (binding instanceof Animator && binding.runtimeAnimatorController) {
-                                if(!binding.__internalDidAwakeAndStart) binding.initializeRuntimeAnimatorController();
+                                if (!binding.__internalDidAwakeAndStart) binding.initializeRuntimeAnimatorController();
                                 // Call bind once to ensure the animator is setup and has a mixer
-                                if(!binding.runtimeAnimatorController.mixer) binding.runtimeAnimatorController.bind(binding);
+                                if (!binding.runtimeAnimatorController.mixer) binding.runtimeAnimatorController.bind(binding);
                                 handler.mixer = binding.runtimeAnimatorController.mixer;
                             }
                             // If we can not get the mixer from the animator then create a new one

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

@@ -7,7 +7,7 @@
 import { XRSessionMode } from "../../engine/engine_setup.js";
 import { getWorldPosition, getWorldQuaternion, setWorldPosition, setWorldQuaternion } from "../../engine/engine_three_utils.js";
 import { INeedleEngineComponent } from "../../engine/engine_types.js";
-import { getParam, isMozillaXR, setOrAddParamsToUrl } from "../../engine/engine_utils.js";
+import { getParam, isMozillaXR, isQuest, setOrAddParamsToUrl } from "../../engine/engine_utils.js";
 import { Behaviour, GameObject } from "../Component.js";
 import { noVoip } from "../Voip.js";
@@ -17,6 +17,7 @@
 import { WebXRSync } from "./WebXRSync.js";
 import { XRFlag, XRState, XRStateFlag } from "../XRFlag.js";
 import { showBalloonWarning } from '../../engine/debug/index.js';
+import { isDestroyed } from '../../engine/engine_gameobject.js';
 const debugWebXR = getParam("debugwebxr");
@@ -154,7 +155,7 @@
     }
     public get Rig(): Object3D {
-        if (!this.rig) this.ensureRig();
+        this.ensureRig();
         return this.rig;
     }
@@ -214,9 +215,7 @@
             sync.webXR = this;
         }
         this.webAR = new WebAR(this);
-    }
-    start() {
         if (location.protocol == 'http:' && location.host.indexOf('localhost') < 0) {
             showBalloonWarning("WebXR only works on https");
             console.warn("WebXR only works on https. https://engine.needle.tools/docs/xr.html");
@@ -284,7 +283,7 @@
     private _currentHeadPose: XRViewerPose | null = null;
     public get HeadPose(): XRViewerPose | null { return this._currentHeadPose; }
-    onBeforeRender(frame) {
+    onBeforeRender(frame:XRFrame | null | undefined) {
         if (!frame) return;
         // TODO: figure out why screen is black if we enable the code written here
         // const referenceSpace = renderer.xr.getReferenceSpace();
@@ -292,7 +291,9 @@
         if (session) {
-            const pose = frame.getViewerPose(this.context.renderer.xr.getReferenceSpace());
+            const referenceSpace = this.context.renderer.xr.getReferenceSpace();
+            if(!referenceSpace) return;
+            const pose = frame.getViewerPose(referenceSpace);
             if (!pose) return;
             this._currentHeadPose = pose;
             const transform: XRRigidTransform = pose?.transform;
@@ -303,6 +304,11 @@
             if (WebXR._isInXr === false && session) {
                 this.onEnterXR(session, frame);
             }
+            else if (this.IsInVR) {
+                if (this.context.mainCamera) {
+                    this.ensureRig();
+                }
+            }
             for (const ctrl of this.controllers) {
                 ctrl.onUpdate(session);
@@ -364,7 +370,7 @@
     }
     private ensureRig() {
-        if (!this.rig) {
+        if (!this.rig || isDestroyed(this.rig)) {
             // currently just used for pose
             const xrRig = GameObject.findObjectOfType(XRRig, this.context);
             if (xrRig) {
@@ -381,6 +387,23 @@
                 this.context.scene.add(this.rig);
             }
         }
+        // Make sure the webxr camera is parented to the xr rig
+        if (this.context.isInXR && this.context.mainCamera && this.context.mainCamera.parent !== this.rig) {
+            this.rig.add(this.context.mainCamera);
+            // Hack: make sure we have the correct position and rotation (e.g. where we are dealing with an implicitly created rig)
+            // This handles the case where we switch between multiple scenes
+            if (this.IsInVR) {
+                const other = GameObject.findObjectOfType(XRRig);
+                if (other && other?.gameObject !== this.rig) {
+                    this.rig.position.copy(other.gameObject.position);
+                    this.rig.quaternion.copy(other.gameObject.quaternion);
+                    this.rig.rotateY(Math.PI);
+                    this.rig.scale.copy(other.gameObject.scale);
+                }
+            }
+        }
     }
@@ -429,7 +452,6 @@
                 }
                 cam.layers.enableAll();
             }
-            this.rig.add(this.context.mainCamera);
             if (this._requestedAR) {
                 this.context.scene.add(this.rig);
             }
@@ -597,7 +619,7 @@
         this.didPlaceARSessionRoot = false;
         this.getAROverlayContainer();
-        const deviceType = navigator.userAgent?.includes("OculusBrowser") ? ControllerType.PhysicalDevice : ControllerType.Touch;
+        const deviceType = isQuest() ? ControllerType.PhysicalDevice : ControllerType.Touch;
         const controllerCount = deviceType === ControllerType.Touch ? 4 : 2;
         for (let i = 0; i < controllerCount; i++) {
             WebXRController.Create(this.webxr, i, this.webxr.gameObject as GameObject, deviceType)

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

@@ -56,12 +56,12 @@
     onEnable(): void {
         WebXR.addEventListener(WebXREvent.XRUpdate, this.onXRUpdate);
-        WebXR.addEventListener("modify-ar-options", this.onModifyAROptions);
+        WebXR.addEventListener(WebXREvent.ModifyAROptions, this.onModifyAROptions);
     }
     onDisable(): void {
         WebXR.removeEventListener(WebXREvent.XRUpdate, this.onXRUpdate);
-        WebXR.removeEventListener("modify-ar-options", this.onModifyAROptions);
+        WebXR.removeEventListener(WebXREvent.ModifyAROptions, this.onModifyAROptions);
     }
     private onModifyAROptions = (event: any) => {