Update orbit-camera.js

orbit-camera.js

@@ -56,11 +56,8 @@ Object.defineProperty(OrbitCamera.prototype, 'orthoHeight', {
     }
 });
 
-
 // Property to get and set the pitch (in degrees) of the camera around the pivot.
 // The pitch value is clamped between pitchAngleMin and pitchAngleMax.
-// With your JSON (minAngle: -90, maxAngle: 0), the allowed pitch will be from -90 (overhead)
-// to 0 (horizontal).
 Object.defineProperty(OrbitCamera.prototype, 'pitch', {
     get: function () {
         return this._targetPitch;
@@ -70,7 +67,6 @@ Object.defineProperty(OrbitCamera.prototype, 'pitch', {
     }
 });
 
-
 // Property to get and set the yaw (in degrees) of the camera around the pivot.
 Object.defineProperty(OrbitCamera.prototype, 'yaw', {
     get: function () {
@@ -81,7 +77,6 @@ Object.defineProperty(OrbitCamera.prototype, 'yaw', {
     }
 });
 
-
 // Property to get and set the world position of the pivot point that the camera orbits around.
 Object.defineProperty(OrbitCamera.prototype, 'pivotPoint', {
     get: function () {
@@ -408,8 +403,19 @@ OrbitCameraInputMouse.prototype.onMouseUp = function (event) {
 };
 OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
     if (this.lookButtonDown) {
-        this.orbitCamera.pitch -= event.dy * this.orbitSensitivity;
-        this.orbitCamera.yaw   -= event.dx * this.orbitSensitivity;
+        // Compute proposed new pitch and yaw
+        var sens = this.orbitSensitivity;
+        var currentPitch = this.orbitCamera.pitch;
+        var proposedPitch = currentPitch - event.dy * sens;
+        // If we're already at the minimum pitch and trying to go further up, ignore vertical
+        if (proposedPitch < this.orbitCamera.pitchAngleMin) {
+            proposedPitch = currentPitch;
+        }
+        this.orbitCamera.pitch = proposedPitch;
+        // Always allow horizontal yaw
+        var currentYaw = this.orbitCamera.yaw;
+        var proposedYaw = currentYaw - event.dx * sens;
+        this.orbitCamera.yaw = proposedYaw;
     } else if (this.panButtonDown) {
         this.pan(new pc.Vec2(event.x, event.y));
     }
@@ -509,8 +515,18 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
     var touches = event.touches;
     if (touches.length === 1) {
         var touch = touches[0];
-        this.orbitCamera.pitch -= (touch.y - this.lastTouchPoint.y) * this.orbitSensitivity;
-        this.orbitCamera.yaw   -= (touch.x - this.lastTouchPoint.x) * this.orbitSensitivity;
+        var sens = this.orbitSensitivity;
+        var currentPitch = this.orbitCamera.pitch;
+        var delta = (touch.y - this.lastTouchPoint.y) * sens;
+        var proposedPitch = currentPitch - delta;
+        // Suppress upward (negative) pitch when at minimum
+        if (proposedPitch < this.orbitCamera.pitchAngleMin) {
+            proposedPitch = currentPitch;
+        }
+        this.orbitCamera.pitch = proposedPitch;
+        var currentYaw = this.orbitCamera.yaw;
+        var yawDelta = (touch.x - this.lastTouchPoint.x) * sens;
+        this.orbitCamera.yaw = currentYaw - yawDelta;
         this.lastTouchPoint.set(touch.x, touch.y);
     } else if (touches.length === 2) {
         var currentPinchDistance = this.getPinchDistance(touches[0], touches[1]);
@@ -521,4 +537,4 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
         this.pan(pinchMidPoint);
         this.lastPinchMidPoint.copy(pinchMidPoint);
     }
-};
+};