Needle Engine 3.36.6-beta

Files changed (3) hide show

src/engine/api.ts +2 -1
src/engine/engine_camera.ts +3 -2
src/engine-components/webxr/WebARSessionRoot.ts +58 -9

src/engine/api.ts CHANGED Viewed

@@ -3,6 +3,7 @@
 export * from "./engine_addressables.js";
 export * from "./engine_application.js";
 export * from "./engine_assetdatabase.js";
+export { getCameraController,setAutoFitEnabled, setCameraController, useForAutoFit } from "./engine_camera.js"
 export * from "./engine_components.js";
 export * from "./engine_components_internal.js";
 export * from "./engine_components_internal.js";
@@ -20,7 +21,7 @@
 export * from "./engine_hot_reload.js";
 export * from "./engine_input.js";
 export { InstancingUtil } from "./engine_instancing.js";
-export { hasCommercialLicense,hasIndieLicense, hasProLicense } from "./engine_license.js";
+export { hasCommercialLicense, hasIndieLicense, hasProLicense } from "./engine_license.js";
 export * from "./engine_lifecycle_api.js";
 export * from "./engine_math.js";
 export * from "./engine_networking.js";

src/engine/engine_camera.ts CHANGED Viewed

@@ -32,8 +32,9 @@
     return obj[autofit] !== false;
 }
-/** @internal */
+/**
+ * Enable or disable autofitting for the given object
+ */
 export function setAutoFitEnabled(obj: Object3D, enabled: boolean): void {
     obj[autofit] = enabled;
 }

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

@@ -1,14 +1,13 @@
-import { AxesHelper, DoubleSide, Matrix4, Mesh, MeshBasicMaterial, Object3D, Plane, Quaternion, Raycaster, RingGeometry, Scene, Vector3 } from "three";
+import { AxesHelper, DoubleSide, Matrix4, Mesh, MeshBasicMaterial, Object3D, Plane, Raycaster, RingGeometry, Scene, Vector3 } from "three";
 import { isDevEnvironment, showBalloonWarning } from "../../engine/debug/index.js";
 import { AssetReference } from "../../engine/engine_addressables.js";
 import { Context } from "../../engine/engine_context.js";
-import { ObjectUtils, PrimitiveType } from "../../engine/engine_create_objects.js";
 import { destroy, instantiate } from "../../engine/engine_gameobject.js";
 import { InputEventQueue, NEPointerEvent } from "../../engine/engine_input.js";
 import { serializable } from "../../engine/engine_serialization_decorator.js";
 import type { IComponent, IGameObject } from "../../engine/engine_types.js";
-import { getParam, isAndroidDevice, isMobileDevice } from "../../engine/engine_utils.js";
+import { getParam, isAndroidDevice } from "../../engine/engine_utils.js";
 import { NeedleXRController, type NeedleXREventArgs, type NeedleXRHitTestResult, NeedleXRSession } from "../../engine/engine_xr.js";
 import { Behaviour, GameObject } from "../Component.js";
@@ -190,6 +189,7 @@
         }
         else {
+            // Update anchors, if any
             if (this._anchor && args.xr.referenceSpace) {
                 const pose = args.xr.frame.getPose(this._anchor.anchorSpace, args.xr.referenceSpace);
                 if (pose && this.context.time.frame % 20 === 0) {
@@ -204,7 +204,7 @@
                 }
             }
-            // scene has been placed
+            // Scene has been placed
             if (this.arTouchTransform) {
                 if (!this.userInput) this.userInput = new WebXRSessionRootUserInput(this.context);
                 this.userInput?.enable();
@@ -255,9 +255,22 @@
             reticle.visible = false;
         }
-        reticle.position.lerp(hit.position, this.context.time.deltaTime / .1);
-        reticle.quaternion.slerp(hit.quaternion, this.context.time.deltaTime / .05);
+        reticle["lastPos"] = reticle["lastPos"] || hit.position.clone();
+        reticle["lastQuat"] = reticle["lastQuat"] || hit.quaternion.clone();
+        // reticle["targetPos"] = reticle["targetPos"] || hit.position.clone();
+        // reticle["targetQuat"] = reticle["targetQuat"] || hit.quaternion.clone();
+        // TODO we likely want the reticle itself to be placed _exactly_ and then the visuals being lerped,
+        // Right now this leads to a "rotation glitch" when going from a horizontal to a vertical surface
+        reticle.position.copy(reticle["lastPos"].lerp(hit.position, this.context.time.deltaTime / .1));
+        reticle["lastPos"].copy(reticle.position);
+        reticle.quaternion.copy(reticle["lastQuat"].slerp(hit.quaternion, this.context.time.deltaTime / .05));
+        reticle["lastQuat"].copy(reticle.quaternion);
+        // TODO make sure original reticle asset scale is respected, or document it should be uniformly scaled
+        // scale *= this.customReticle?.asset?.scale?.x || 1;
         reticle.scale.set(scale, scale, scale);
         // if (this.invertForward) {
         //     reticle.rotateY(Math.PI);
         // }
@@ -317,6 +330,10 @@
         this.onRevertSceneChanges();
+        // TODO: we should probably use the non-lerped position and quaternion here
+        reticle.position.copy(reticle["lastPos"]);
+        reticle.quaternion.copy(reticle["lastQuat"]);
         this.onApplyPose(reticle);
         if (this.useXRAnchor) {
@@ -362,7 +379,12 @@
         }
     }
+    private upVec: Vector3 = new Vector3(0, 1, 0);
+    private lookPoint: Vector3 = new Vector3();
+    private worldUpVec: Vector3 = new Vector3(0, 1, 0);
     private applyViewBasedTransform(reticle: Object3D) {
         // Make reticle face the user to unify the placement experience across devices.
         // The pose that we're receiving from the hit test varies between devices:
         // - Quest: currently aligned to the mesh that was hit (depends on room setup), has changed a couple times
@@ -372,10 +394,37 @@
         const reticleGo = reticle as GameObject;
         const camWP = camGo.worldPosition;
         const reticleWp = reticleGo.worldPosition;
-        // const distance = camWP.distanceTo(reticleWp);
-        camWP.y = reticleWp.y;
-        reticle.lookAt(camWP);
+        this.upVec.set(0,1,0).applyQuaternion(reticle.quaternion);
+        // upVec may be pointing AWAY from us, we have to flip it if that's the case
+        const camPos = camGo.worldPosition;
+        if (camPos) {
+            const camToReticle = reticle.position.clone().sub(camPos);
+            const angle = camToReticle.angleTo(this.upVec);
+            if (angle < Math.PI / 2) {
+                this.upVec.negate();
+            }
+        }
+        const upAngle = this.upVec.angleTo(this.worldUpVec) * 180 / Math.PI;
+        // For debugging look angle for AR placement
+        // Gizmos.DrawDirection(reticle.position, upVec, "blue", 0.1);
+        // Gizmos.DrawLabel(reticle.position, upAngle.toFixed(2), 0.1);
+        const angleForWallPlacement = 30;
+        if ((upAngle > angleForWallPlacement && upAngle < 180 - angleForWallPlacement) ||
+            (upAngle < -angleForWallPlacement && upAngle > -180 + angleForWallPlacement)) {
+            this.lookPoint.copy(reticle.position).add(this.upVec);
+            this.lookPoint.y = reticle.position.y;
+            reticle.lookAt(this.lookPoint);
+        }
+        else {
+            camWP.y = reticleWp.y;
+            reticle.lookAt(camWP);
+        }
         // TODO: ability to scale the reticle so that we can fit the scene depending on the view angle or distance to the reticle.
         // Currently, doing this leads to wrong placement of the scene.
         /*