@needle-tools/engine 4.9.0-alpha.2 → 4.9.0-alpha.4

package/src/engine/xr/NeedleXRSession.ts

@@ -221,6 +221,8 @@ function handleAutoStart(value: string | null) {
 //     });
 // }
 
+const $initialFov = Symbol("initial-fov");
+
 /** 
  * This class manages an XRSession to provide helper methods and events. It provides easy access to the XRInputSources (controllers and hands)   
  * - Start a XRSession with `NeedleXRSession.start(...)`
@@ -914,6 +916,7 @@ export class NeedleXRSession implements INeedleXRSession {
      */
     private _mainCamera: ICamera | null = null;
 
+
     private constructor(mode: XRSessionMode, session: XRSession, context: Context, extra: {
         scripts: INeedleXRSessionEventReceiver[],
         controller_added: ControllerChangedEvt[],
@@ -954,6 +957,9 @@ export class NeedleXRSession implements INeedleXRSession {
             this._originalCameraWorldRotation = getWorldQuaternion(this.context.mainCamera, new Quaternion());
             this._originalCameraWorldScale = getWorldScale(this.context.mainCamera, new Vector3());
             this._originalCameraParent = this.context.mainCamera.parent;
+            if (this.context.mainCamera instanceof PerspectiveCamera) {
+                this.context.mainCamera[$initialFov] = this.context.mainCamera.fov;
+            }
         }
 
         this._defaultRig = new ImplictXRRig();
@@ -1058,7 +1064,7 @@ export class NeedleXRSession implements INeedleXRSession {
                 if (debug) console.log("Disconnecting controller", oldController.index);
 
                 const index = array.indexOf(oldController);
-                if(index >= 0) array.splice(index, 1);
+                if (index >= 0) array.splice(index, 1);
 
                 this.invokeControllerEvent(oldController, this._controllerRemoved, "removed");
                 const args: NeedleXRControllerEventArgs = {
@@ -1161,6 +1167,11 @@ export class NeedleXRSession implements INeedleXRSession {
             if (this._originalCameraWorldScale) {
                 setWorldScale(this.context.mainCamera, this._originalCameraWorldScale);
             }
+
+            if (this.context.mainCamera instanceof PerspectiveCamera && this.context.mainCamera[$initialFov]) {
+                this.context.mainCamera.fov = this.context.mainCamera[$initialFov]!;
+                this.context.mainCamera[$initialFov] = 0;
+            }
         }
 
         // mark for size change since DPI might have changed
@@ -1564,7 +1575,7 @@ export class NeedleXRSession implements INeedleXRSession {
             if (this._camera instanceof PerspectiveCamera && Math.abs(this._camera.near - minNearPlane) > .0001) {
                 this.originalCameraNearPlane = this._camera.near;
                 this._camera.near = minNearPlane;
-                if(debug) console.debug(`Setting camera near plane to ${minNearPlane} (was ${this.originalCameraNearPlane}) to account for XR rendering scale`);
+                if (debug) console.debug(`Setting camera near plane to ${minNearPlane} (was ${this.originalCameraNearPlane}) to account for XR rendering scale`);
             }
         }
     }

package/src/engine-components/Component.ts

@@ -147,6 +147,7 @@ export abstract class GameObject extends Object3D implements Object3D, IGameObje
      * The forward direction vector of this GameObject in world space
      */
     abstract get worldForward(): Vector3;
+    abstract set worldForward(val: Vector3);
 
     /**
      * The right direction vector of this GameObject in world space

package/src/engine-components/OrbitControls.ts

@@ -522,11 +522,15 @@ export class OrbitControls extends Behaviour implements ICameraController {
             if (debug) Gizmos.DrawWireSphere(hit.point, 0.1, 0xff0000, 2);
             this._controls?.target.copy(hits[0].point);
         }
+        else {
+            if (debug) console.log("OrbitControls: No hit found when updating target", { hits: [...hits] });
+        }
     }
 
     private _orbitStartAngle: number = 0;
     private _zoomStartDistance: number = 0;
     private onControlsChangeStarted = () => {
+        if(debug) console.debug("OrbitControls: Change started");
         if (this._controls) {
             this._orbitStartAngle = this._controls.getAzimuthalAngle() + this._controls.getPolarAngle();
             this._zoomStartDistance = this._controls.getDistance();
@@ -536,6 +540,7 @@ export class OrbitControls extends Behaviour implements ICameraController {
         }
     }
     private onControlsChangeEnded = () => {
+        if(debug) console.debug("OrbitControls: Change ended", { autoTarget: this.autoTarget });
         if (this._controls) {
             if (this.autoTarget) {
                 const newAngle = this._controls.getAzimuthalAngle() + this._controls.getPolarAngle();