Needle Engine 4.2.0

Files changed (7) hide show

src/engine-components/DragControls.ts +13 -3
src/engine/engine_utils.ts +7 -0
src/engine/xr/NeedleXRController.ts +0 -14
src/engine/xr/NeedleXRSession.ts +10 -2
src/engine-components/webxr/WebXRPlaneTracking.ts +2 -2
src/engine-components/webxr/controllers/XRControllerFollow.ts +3 -0
src/engine-components/webxr/controllers/XRControllerModel.ts +15 -0

src/engine-components/DragControls.ts CHANGED Viewed

@@ -248,9 +248,14 @@
                 const iterator = this._dragHandlers.values();
                 const a = iterator.next().value;
                 const b = iterator.next().value;
-                const mtHandler = new MultiTouchDragHandler(this, this._targetObject!, a, b);
-                this._dragHandlers.set(this.gameObject, mtHandler);
-                mtHandler.onDragStart(args);
+                if (a instanceof DragPointerHandler && b instanceof DragPointerHandler) {
+                    const mtHandler = new MultiTouchDragHandler(this, this._targetObject!, a, b);
+                    this._dragHandlers.set(this.gameObject, mtHandler);
+                    mtHandler.onDragStart(args);
+                }
+                else {
+                    console.error("Attempting to construct a MultiTouchDragHandler with invalid DragPointerHandlers. This is likely a bug.", { a, b });
+                }
             }
             args.use();
@@ -605,6 +610,11 @@
         const draggedObject = this.gameObject;
         const targetObject = this._followObject;
+        if (!draggedObject) {
+            console.error("MultiTouchDragHandler has no dragged object. This is likely a bug.");
+            return;
+        }
         targetObject.updateMatrix();
         targetObject.updateMatrixWorld(true);

src/engine/engine_utils.ts CHANGED Viewed

@@ -630,6 +630,13 @@
         }
     }
+    let __isVisionOS: boolean | undefined;
+    /** @returns `true` for VisionOS devices */
+    export function isVisionOS() {
+        if (__isVisionOS !== undefined) return __isVisionOS;
+        return __isVisionOS = (isMacOS() && "xr" in navigator);
+    }
     let __isiOS: boolean | undefined;
     const iosDevices = ['iPad Simulator', 'iPhone Simulator', 'iPod Simulator', 'iPad', 'iPhone', 'iPod'];

src/engine/xr/NeedleXRController.ts CHANGED Viewed

@@ -161,7 +161,6 @@
     private _hasSelectEvent = false;
     get hasSelectEvent() { return this._hasSelectEvent; }
     private _isMxInk = false;
-    private _isMxInkFallback = false;
     private _isMetaQuestTouchController = false;
     /** Perform a hit test against the XR planes or meshes. shorthand for `xr.getHitTest(controller)`
@@ -438,14 +437,6 @@
             rayPositionRaw = getTempVector(t.position);
             rayQuaternionRaw = getTempQuaternion(t.orientation);
-            // HACK: offset for MX Ink on QuestOS v69 and less. This will hopefully not be required with OS v70+ anymore,
-            // when the pen should have its own proper profile and correct ray space.
-            if (this._isMxInk && !this._isMxInkFallback) {
-                const offset = getTempVector(0.013, 0.000, -0.028).applyQuaternion(rayQuaternionRaw);
-                rayPositionRaw.add(offset);
-                this._rayPosition.add(offset);
-            }
             this._rayPositionRaw.copy(rayPositionRaw);
             this._rayRotationRaw.copy(rayQuaternionRaw);
         }
@@ -759,11 +750,6 @@
             this.getMotionController = fetchProfileCall.then(res => {
                 if (!this.connected) return null;
-                if (this._isMxInk && !res.assetPath) {
-                    if (debug) console.log("Falling back to custom MX Ink model", res.profile, res.assetPath);
-                    res.assetPath = "https://cdn.needle.tools/static/models/controllers/logitech_vr_stylus_v1.3.1_grip_questos68.glb";
-                    this._isMxInkFallback = true;
-                }
                 this._motioncontroller = new MotionController(
                     this.inputSource,

src/engine/xr/NeedleXRSession.ts CHANGED Viewed

@@ -373,12 +373,20 @@
     static getDefaultSessionInit(mode: Omit<XRSessionMode, "inline">): XRSessionInit {
         switch (mode) {
             case "immersive-ar":
+                const arFeatures = ['anchors', 'local-floor', 'layers', 'dom-overlay', 'hit-test', 'unbounded'];
+                // Don't request handtracking by default on VisionOS
+                if (!DeviceUtilities.isVisionOS())
+                    arFeatures.push('hand-tracking');
                 return {
-                    optionalFeatures: ['anchors', 'local-floor', 'hand-tracking', 'layers', 'dom-overlay', 'hit-test', 'unbounded'],
+                    optionalFeatures: arFeatures,
                 }
             case "immersive-vr":
+                const vrFeatures = ['local-floor', 'bounded-floor', 'high-fixed-foveation-level', 'layers'];
+                // Don't request handtracking by default on VisionOS
+                if (!DeviceUtilities.isVisionOS())
+                    vrFeatures.push('hand-tracking');
                 return {
-                    optionalFeatures: ['local-floor', 'bounded-floor', 'hand-tracking', 'high-fixed-foveation-level', 'layers'],
+                    optionalFeatures: vrFeatures,
                 }
             default:
                 console.warn("No default session init for mode", mode);

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

@@ -364,7 +364,7 @@
                     if (newPlane instanceof Mesh) {
                         disposeObjectResources(newPlane.geometry);
                         newPlane.geometry = this.createGeometry(data);
-                        this.makeOccluder(newPlane, newPlane.material, this.occluder);
+                        this.makeOccluder(newPlane, newPlane.material, this.occluder && !this.dataTemplate);
                     }
                     else if (newPlane instanceof Group) {
                         // We want to process only one level of children on purpose here
@@ -372,7 +372,7 @@
                             if (ch instanceof Mesh) {
                                 disposeObjectResources(ch.geometry);
                                 ch.geometry = this.createGeometry(data);
-                                this.makeOccluder(ch, ch.material, this.occluder);
+                                this.makeOccluder(ch, ch.material, this.occluder && !this.dataTemplate);
                             }
                         }
                     }

src/engine-components/webxr/controllers/XRControllerFollow.ts CHANGED Viewed

@@ -71,6 +71,9 @@
     /** @internal */
     onUpdateXR(args: NeedleXREventArgs): void {
+        // explicit check since we're overriding activeAndEnabled
+        if (!this.enabled) return;
         // try to get the controller
         const ctrl = args.xr.getController(this.side);
         if (ctrl) {

src/engine-components/webxr/controllers/XRControllerModel.ts CHANGED Viewed

@@ -113,6 +113,7 @@
             }
         }
     }
     onXRControllerRemoved(args: NeedleXRControllerEventArgs): void {
         console.debug("XR Controller Removed", args.controller.side, args.controller.index);
         // we need to find the index by the controller because if controller 0 is removed first then args.controller.index 1 will be at index 0
@@ -128,6 +129,19 @@
             entry.model = undefined;
         }
     }
+    onBeforeXR(_mode: XRSessionMode, args: XRSessionInit & { trackedImages: Array<any> }): void {
+        // When a custom hand model is used, we want to ensure we're requesting hand tracking,
+        // even when the platform default doesn't include it (for example, on VisionOS we don't
+        // request hand tracking by default because there's an additional permissions dialogue.
+        if (this.createHandModel && (this.customLeftHand || this.customRightHand)) {
+            args.optionalFeatures = args.optionalFeatures || [];
+            if (!args.optionalFeatures.includes("hand-tracking")) {
+                args.optionalFeatures.push("hand-tracking");
+            }
+        }
+    }
     onLeaveXR(_args: NeedleXREventArgs): void {
         for (const entry of this._models) {
             if (!entry) continue;
@@ -145,6 +159,7 @@
         }
         this._models.length = 0;
     }
     onBeforeRender() {
         if (!NeedleXRSession.active) return;