Merge pull request #65 from sorskoot/fix-orbital-cam-issues

Fix orbital cam issues
WonderlandEngine · Sep 10, 2024 · 57de9bc · 57de9bc
2 parents 5ab1430 + 7833164
commit 57de9bc
Show file tree

Hide file tree

Showing 4 changed files with 1,056 additions and 2,680 deletions.
diff --git a/input-profile.ts b/input-profile.ts
@@ -180,7 +180,7 @@ export class InputProfile extends Component {
      * @param event The XR input source change event.
      * @hidden
      */
-    private _onInputSourcesChange(event: XRInputSourceChangeEvent) {
+    private _onInputSourcesChange(event: XRInputSourcesChangeEvent) {
         if (this._isModelLoaded() && !this.mapToDefaultController) {
             this._setComponentsActive(false);
         }

diff --git a/orbital-camera.ts b/orbital-camera.ts
@@ -69,6 +69,7 @@ export class OrbitalCamera extends Component {
     }
 
     start(): void {
+        this._polar = Math.min(this.maxElevation, Math.max(this.minElevation, this._polar));
         this._updateCamera();
     }
 
@@ -78,7 +79,7 @@ export class OrbitalCamera extends Component {
         if (this.mouseButtonIndex === 2) {
             canvas.addEventListener('contextmenu', preventDefault, {passive: false});
         }
-        
+
         canvas.addEventListener('mousedown', this._onMouseDown);
         canvas.addEventListener('wheel', this._onMouseScroll, {passive: false});
 
@@ -159,7 +160,7 @@ export class OrbitalCamera extends Component {
         const directionToCamera = vec3.create();
         vec3.subtract(directionToCamera, position, this._origin as vec3);
         vec3.normalize(directionToCamera, directionToCamera);
-        
+
         /* Scale this direction by the radius of your orbital sphere to get the nearest point on the sphere */
         const nearestPointOnSphere = vec3.create();
         vec3.scale(nearestPointOnSphere, directionToCamera, this.radial);