@needle-tools/engine 3.46.0-beta.1 → 3.46.0-beta.2

package/src/engine-components/Camera.ts

@@ -75,20 +75,28 @@ export class Camera extends Behaviour implements ICamera {
     set nearClipPlane(val) {
         const changed = this._nearClipPlane != val;
         this._nearClipPlane = val;
-        if (this._cam && changed) {
+        if (this._cam && (changed || this._cam.near != val)) {
             this._cam.near = val;
             this._cam.updateProjectionMatrix();
         }
     }
     private _nearClipPlane: number = 0.1;
 
+    applyClippingPlane() {
+        if (this._cam) {
+            this._cam.near = this._nearClipPlane;
+            this._cam.far = this._farClipPlane;
+            this._cam.updateProjectionMatrix();
+        }
+    }
+
     /** The camera's far clipping plane */
     get farClipPlane(): number { return this._farClipPlane; }
     @serializable()
     set farClipPlane(val) {
         const changed = this._farClipPlane != val;
         this._farClipPlane = val;
-        if (this._cam && changed) {
+        if (this._cam && (changed || this._cam.far != val)) {
             this._cam.far = val;
             this._cam.updateProjectionMatrix();
         }

package/src/engine-components/webxr/WebARSessionRoot.ts

@@ -7,7 +7,7 @@ import { destroy, instantiate } from "../../engine/engine_gameobject.js";
 import { Gizmos } from "../../engine/engine_gizmos.js";
 import { InputEventQueue, NEPointerEvent } from "../../engine/engine_input.js";
 import { serializable } from "../../engine/engine_serialization_decorator.js";
-import { getBoundingBox } from "../../engine/engine_three_utils.js";
+import { getBoundingBox, getTempVector } from "../../engine/engine_three_utils.js";
 import type { IComponent, IGameObject } from "../../engine/engine_types.js";
 import { getParam, isAndroidDevice } from "../../engine/engine_utils.js";
 import { NeedleXRController, type NeedleXREventArgs, type NeedleXRHitTestResult, NeedleXRSession } from "../../engine/engine_xr.js";
@@ -213,7 +213,8 @@ export class WebARSessionRoot extends Behaviour {
 
             // 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) {
+            // when auto placing we just use the user's view
+            if (args.xr.isPassThrough && args.xr.controllers.length > 0 && !this.autoPlace) {
                 for (const ctrl of args.xr.controllers) {
                     // with this we can only place with the left / first controller right now
                     // we also only have one reticle... this should probably be refactored a bit so we can have multiple reticles
@@ -273,7 +274,6 @@ export class WebARSessionRoot extends Behaviour {
         // save the hit test
         this._hits[i] = hit.hit;
         let reticle = this._reticle[i];
-
         if (!reticle) {
             if (this.customReticle) {
                 if (this.customReticle.asset) {
@@ -300,7 +300,6 @@ export class WebARSessionRoot extends Behaviour {
             reticle.matrixAutoUpdate = false;
             reticle.visible = false;
         }
-
         reticle["lastPos"] = reticle["lastPos"] || hit.position.clone();
         reticle["lastQuat"] = reticle["lastQuat"] || hit.quaternion.clone();
         // reticle["targetPos"] = reticle["targetPos"] || hit.position.clone();
@@ -336,8 +335,23 @@ export class WebARSessionRoot extends Behaviour {
         }
 
         if (this.autoPlace) {
-            reticle.visible = false;
-            this.onPlaceScene(null);
+            this.upVec.set(0, 1, 0).applyQuaternion(reticle.quaternion);
+            const isUp = this.upVec.dot(getTempVector(0, 1, 0)) > 0.9;
+            if (isUp) {
+                // We want the reticle to be at a suitable spot for a moment before we place the scene (not place it immediately)
+                let autoplace_timer = reticle["autoplace:timer"] || 0;
+                if (autoplace_timer >= 1) {
+                    reticle.visible = false;
+                    this.onPlaceScene(null);
+                }
+                else {
+                    autoplace_timer += this.context.time.deltaTime;
+                    reticle["autoplace:timer"] = autoplace_timer;
+                }
+            }
+            else {
+                reticle["autoplace:timer"] = 0;
+            }
         }
     }
 

package/src/engine-components/webxr/controllers/XRControllerMovement.ts

@@ -14,6 +14,7 @@ import { NeedleXRController, type NeedleXREventArgs, NeedleXRSession } from "../
 import { Behaviour, GameObject } from "../../Component.js"
 import { TeleportTarget } from "../TeleportTarget.js";
 import type { XRMovementBehaviour } from "../types.js";
+import { hasPointerEventComponent } from "../../ui/PointerEvents.js";
 
 const debug = getParam("debugwebxr");
 
@@ -257,8 +258,12 @@ export class XRControllerMovement extends Behaviour implements XRMovementBehavio
                 continue;
             }
 
-            const hit = this.context.physics.raycastFromRay(ctrl.ray, { testObject: this.hitPointRaycastFilter, precise: false })[0];
-            this._hitDistances[i] = hit?.distance;
+            const hits = this.context.physics.raycastFromRay(ctrl.ray, { testObject: this.hitPointRaycastFilter, precise: false });
+            const hit = hits.find(h => {
+                // Only render hits on interactable objects
+                return hasPointerEventComponent(h.object)
+            });
+            this._hitDistances[i] = hit?.distance || 0;
 
             let disc = this._hitDiscs[i];
             if (disc) // save the hit object on the disc