Update orbit-camera.js

orbit-camera.js

@@ -56,8 +56,11 @@ 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;
@@ -67,6 +70,7 @@ 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 () {
@@ -77,6 +81,7 @@ 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 () {
@@ -403,38 +408,8 @@ OrbitCameraInputMouse.prototype.onMouseUp = function (event) {
 };
 OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
     if (this.lookButtonDown) {
-        var sens = this.orbitSensitivity;
-        var currentPitch = this.orbitCamera.pitch;
-        var currentYaw   = this.orbitCamera.yaw;
-        var pitchMin     = this.orbitCamera.pitchAngleMin;
-
-        // compute proposed new pitch
-        var proposedPitch = currentPitch - event.dy * sens;
-        var atMinPitch    = currentPitch <= pitchMin + 1e-4;
-        var movingUpward  = event.dy < 0; // drag up → event.dy negative
-
-        console.log(
-            "[Mouse] currentPitch=", currentPitch.toFixed(2),
-            "proposedPitch=", proposedPitch.toFixed(2),
-            "pitchMin=", pitchMin,
-            "atMinPitch=", atMinPitch,
-            "movingUpward=", movingUpward
-        );
-
-        if (atMinPitch && movingUpward) {
-            // suppress only upward pitch
-            proposedPitch = currentPitch;
-            console.log("[Mouse] Upward pitch suppressed");
-        } else if (proposedPitch < pitchMin && movingUpward) {
-            // clamp if slightly past
-            proposedPitch = pitchMin;
-            console.log("[Mouse] Pitch clamped to min");
-        }
-
-        // apply pitch and always apply yaw
-        this.orbitCamera.pitch = proposedPitch;
-        this.orbitCamera.yaw   = currentYaw - event.dx * sens;
-
+        this.orbitCamera.pitch -= event.dy * this.orbitSensitivity;
+        this.orbitCamera.yaw   -= event.dx * this.orbitSensitivity;
     } else if (this.panButtonDown) {
         this.pan(new pc.Vec2(event.x, event.y));
     }
@@ -530,43 +505,20 @@ OrbitCameraInputTouch.prototype.pan = function (midPoint) {
 };
 OrbitCameraInputTouch.pinchMidPoint = new pc.Vec2();
 OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
+    var pinchMidPoint = OrbitCameraInputTouch.pinchMidPoint;
     var touches = event.touches;
     if (touches.length === 1) {
         var touch = touches[0];
-        var sens = this.orbitSensitivity;
-        var currentPitch = this.orbitCamera.pitch;
-        var currentYaw   = this.orbitCamera.yaw;
-        var pitchMin     = this.orbitCamera.pitchAngleMin;
-
-        var deltaY = touch.y - this.lastTouchPoint.y;
-        var proposedPitch = currentPitch - deltaY * sens;
-        var atMinPitch    = currentPitch <= pitchMin + 1e-4;
-        var movingUpward  = deltaY > 0; // moving finger up increases touch.y, so deltaY positive
-
-        console.log(
-            "[Touch] currentPitch=", currentPitch.toFixed(2),
-            "proposedPitch=", proposedPitch.toFixed(2),
-            "pitchMin=", pitchMin,
-            "atMinPitch=", atMinPitch,
-            "movingUpward=", movingUpward
-        );
-
-        if (atMinPitch && movingUpward) {
-            proposedPitch = currentPitch;
-            console.log("[Touch] Upward pitch suppressed");
-        } else if (proposedPitch < pitchMin && movingUpward) {
-            proposedPitch = pitchMin;
-            console.log("[Touch] Pitch clamped to min");
-        }
-
-        this.orbitCamera.pitch = proposedPitch;
-        // always allow horizontal
-        var deltaX = touch.x - this.lastTouchPoint.x;
-        this.orbitCamera.yaw = currentYaw - deltaX * sens;
-
+        this.orbitCamera.pitch -= (touch.y - this.lastTouchPoint.y) * this.orbitSensitivity;
+        this.orbitCamera.yaw   -= (touch.x - this.lastTouchPoint.x) * this.orbitSensitivity;
         this.lastTouchPoint.set(touch.x, touch.y);
-
     } else if (touches.length === 2) {
-        // ... existing pinch/zoom & pan logic unchanged ...
+        var currentPinchDistance = this.getPinchDistance(touches[0], touches[1]);
+        var diffInPinchDistance = currentPinchDistance - this.lastPinchDistance;
+        this.lastPinchDistance = currentPinchDistance;
+        this.orbitCamera.distance -= (diffInPinchDistance * this.distanceSensitivity * 0.1) * (this.orbitCamera.distance * 0.1);
+        this.calcMidPoint(touches[0], touches[1], pinchMidPoint);
+        this.pan(pinchMidPoint);
+        this.lastPinchMidPoint.copy(pinchMidPoint);
     }
-};
+};