Needle Engine 3.32.5-alpha

Files changed (6) hide show

src/engine/xr/NeedleXRController.ts CHANGED Viewed

@@ -456,7 +456,7 @@
                         }
                     }
                 }
-                if (debug) console.log(this._layout, this.inputSource);
+                // if (debug) console.log(this._layout, this.inputSource);
                 // debugger;
                 // this.getButton("a-button")
                 return this._motioncontroller;

src/engine/xr/NeedleXRSession.ts CHANGED Viewed

@@ -375,8 +375,11 @@
             controller_removed: this._controllerRemovedListeners,
             init: init
         });
-        session.addEventListener("end", this.onEnd)
-        console.log("%c" + `Started ${mode} session`, "font-weight:bold;");
+        session.addEventListener("end", this.onEnd);
+        if (debug)
+            console.log("%c" + `Started ${mode} session`, "font-weight:bold;", scripts);
+        else
+            console.log("%c" + `Started ${mode} session`, "font-weight:bold;");
         return this._activeSession;
     }
     /** stops the active XR session */
@@ -901,7 +904,10 @@
             }
             // invoke session listeners start
-            for (const script of this._xr_scripts) {
+            // we need to make a copy because the array might be modified during the loop (could also use a for loop and iterate backwards perhaps but then order of invocation would be changed OR check if the size has changed...)
+            const copy = [...this._xr_scripts];
+            if (debug) console.log("NeedleXRSession start, handle scripts:", copy);
+            for (const script of copy) {
                 if (script.destroyed) {
                     this._script_to_remove.push(script);
                     continue;

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

@@ -99,6 +99,7 @@
         const rootObject = new Object3D();
         this._createdPlacementObject = rootObject;
         rootObject.name = "AR Session Root";
+        this._placementScene.name = "AR Placement Scene";
         this._placementScene.children.length = 0;
         for (let i = this.context.scene.children.length - 1; i >= 0; i--) {
             const ch = this.context.scene.children[i];
@@ -136,6 +137,7 @@
     }
     onUpdateXR(args: NeedleXREventArgs): void {
+        // disable session placement while images are being tracked
         if (args.xr.isTrackingImages) {
             for (const ret of this._reticle)
                 ret.visible = false;
@@ -292,8 +294,10 @@
     private onRevertSceneChanges() {
         for (const ret of this._reticle) {
+            ret.visible = false;
             ret?.removeFromParent();
         }
+        this._reticle.length = 0;
         for (let i = this._placementScene.children.length - 1; i >= 0; i--) {
             const ch = this._placementScene.children[i];

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

@@ -175,6 +175,7 @@
                 sessionroot.arTouchTransform = this.usePlacementAdjustment;
                 sessionroot.useXRAnchor = this.useXRAnchor;
             }
+            else if(debug) console.log("WebXR: WebARSessionRoot already exists, not creating a new one")
         }
         // handle VR controls

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

@@ -47,6 +47,7 @@
     onEnterXR(args: NeedleXREventArgs): void {
         this._startScale = this.gameObject.scale.clone();
         args.xr.addRig(this);
+        if(debug) console.log("WebXR: add Rig", this.name, this.priority)
     }
     onLeaveXR(args: NeedleXREventArgs): void {
         args.xr.removeRig(this);

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

@@ -187,6 +187,8 @@
             const rot = ctrl.rayWorldQuaternion;
             line.position.copy(pos);
             line.quaternion.copy(rot);
+            const scale = session.rigScale;
+            line.scale.set(scale, scale, scale);
             line.visible = true;
             line.layers.disableAll();
             line.layers.enable(2);
@@ -204,7 +206,7 @@
             const hit = this.context.physics.raycastFromRay(ctrl.ray, {})[0];
             if (hit) {
-                const rigScale = (session.rig?.gameObject.worldScale.x ?? 1);
+                const rigScale = (session.rigScale ?? 1);
                 if (debug) Gizmos.DrawWireSphere(hit.point, .025 * rigScale, 0xff0000, .2);
                 let disc = this._hitDiscs[i];
@@ -213,7 +215,7 @@
                     this._hitDiscs[i] = disc;
                 }
                 disc.visible = true;
-                const size = .01 * (1 + hit.distance) * rigScale;
+                const size = (.01 * (1 + hit.distance));
                 disc.scale.set(size, size, size);
                 disc.layers.disableAll();
                 disc.layers.enable(2);