Update orbit-camera.js

orbit-camera.js

@@ -291,7 +291,7 @@ OrbitCameraInputMouse.prototype.initialize = function () {
     this.app.mouse.disableContextMenu();
 
     this.lookButtonDown = false;
-    this.panButtonDown = false;
+       this.panButtonDown = false;
     this.lastPoint = new pc.Vec2();
 };
 
@@ -541,18 +541,15 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
 // =================== Orbit Camera Input Keyboard ========================
 // Arrows:
 // - No modifier:   Up/Down = vertical pan; Left/Right = strafe
-// - With Shift:    Up/Down = orbit pitch; Left/Right = orbit yaw
+// - With Shift:    Up/Down = orbit pitch; Left/Right = orbit yaw (inverted as requested)
 // - With Ctrl:     Up/Down = zoom in/out
 var OrbitCameraInputKeyboard = pc.createScript('orbitCameraInputKeyboard');
 
-// Keep names for backward compatibility with your viewer.js
 OrbitCameraInputKeyboard.attributes.add('forwardSpeed', { type: 'number', default: 1.2, title: 'Vertical Speed (rel. to distance)' });
 OrbitCameraInputKeyboard.attributes.add('strafeSpeed',  { type: 'number', default: 1.2, title: 'Left/Right Speed (rel. to distance)' });
-OrbitCameraInputKeyboard.attributes.add('fastMultiplier', { type: 'number', default: 2.0, title: 'Shift Speed Multiplier' });
-OrbitCameraInputKeyboard.attributes.add('slowMultiplier', { type: 'number', default: 0.5, title: 'Ctrl Slow Multiplier (when translating)' });
 
-// New fine-tuning attributes
-OrbitCameraInputKeyboard.attributes.add('orbitPitchSpeedDeg', { type: 'number', default: 90, title: 'Orbit Pitch Speed (deg/s) [Shift+Up/Down]' });
+// Fine-tuning
+OrbitCameraInputKeyboard.attributes.add('orbitPitchSpeedDeg', { type: 'number', default: 90,  title: 'Orbit Pitch Speed (deg/s) [Shift+Up/Down]' });
 OrbitCameraInputKeyboard.attributes.add('orbitYawSpeedDeg',   { type: 'number', default: 120, title: 'Orbit Yaw Speed (deg/s) [Shift+Left/Right]' });
 OrbitCameraInputKeyboard.attributes.add('zoomKeySensitivity', { type: 'number', default: 3.0, title: 'Zoom Sensitivity (1/s) [Ctrl+Up/Down]' });
 
@@ -574,17 +571,17 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     // ---- SHIFT: Orbit (pitch / yaw) ----
     if (shift && (up || dn || lt || rt)) {
-        // Yaw (left/right) — follow same sign convention as mouse: yaw = yaw - delta
-        var yawDeltaDeg = (rt ? 1 : 0) - (lt ? 1 : 0);
-        if (yawDeltaDeg !== 0) {
-            var dYaw = yawDeltaDeg * this.orbitYawSpeedDeg * dt;
-            this.orbitCamera.yaw = this.orbitCamera.yaw - dYaw; // setter clamps
+        // Yaw (left/right) — inverted per request: Shift+Right => orbit to the right
+        var yawDir = (rt ? 1 : 0) - (lt ? 1 : 0); // right=+1, left=-1
+        if (yawDir !== 0) {
+            var dYaw = yawDir * this.orbitYawSpeedDeg * dt;
+            this.orbitCamera.yaw = this.orbitCamera.yaw + dYaw; // NOTE: '+' (inversion)
         }
 
-        // Pitch (up/down) — enforce minY like mouse rotate
-        var pitchDeltaDeg = (up ? 1 : 0) - (dn ? 1 : 0);
-        if (pitchDeltaDeg !== 0) {
-            var dPitch = pitchDeltaDeg * this.orbitPitchSpeedDeg * dt;
+        // Pitch (up/down) — Shift+Up => orbit up, Shift+Down => down
+        var pitchDir = (up ? 1 : 0) - (dn ? 1 : 0); // up=+1, down=-1
+        if (pitchDir !== 0) {
+            var dPitch = pitchDir * this.orbitPitchSpeedDeg * dt;
 
             var currPitch = this.orbitCamera.pitch;
             var currYaw   = this.orbitCamera.yaw;
@@ -604,7 +601,7 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
             var wouldGoBelow = proposedY < minY - 1e-4;
 
             if (!(wouldGoBelow && (proposedY < preY))) {
-                this.orbitCamera.pitch = testPitch; // setter clamps
+                this.orbitCamera.pitch = testPitch; // clamped by setter
             }
         }
         return;
@@ -612,14 +609,14 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     // ---- CTRL: Zoom (up/down) ----
     if (ctrl && (up || dn)) {
-        var zoomSign = (up ? 1 : 0) - (dn ? 1 : 0); // up => +1 (zoom in), down => -1 (zoom out)
+        var zoomSign = (up ? 1 : 0) - (dn ? 1 : 0); // up=zoom in, down=zoom out
         if (zoomSign !== 0) {
             if (this.entity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
                 var dz = zoomSign * this.zoomKeySensitivity * (this.orbitCamera.distance * 0.5) * dt;
-                this.orbitCamera.distance -= dz; // setter clamps
+                this.orbitCamera.distance -= dz; // clamped
             } else {
                 var doh = zoomSign * this.zoomKeySensitivity * (this.orbitCamera.orthoHeight * 0.5) * dt;
-                this.orbitCamera.orthoHeight -= doh; // clamped >= 0 by setter
+                this.orbitCamera.orthoHeight -= doh; // clamped >= 0
             }
         }
         return;
@@ -633,23 +630,16 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     // Base speeds relative to distance (consistent feel near/far)
     var dist = Math.max(0.1, this.orbitCamera.distance);
-    var speedV = this.forwardSpeed * dist; // vertical speed (reuses attribute name)
-    var speedR = this.strafeSpeed  * dist;
-
-    // If user also holds Ctrl here (without Shift), we use it as "slow"
-    if (ctrl) { speedV *= this.slowMultiplier; speedR *= this.slowMultiplier; }
-    if (shift) { speedV *= this.fastMultiplier; speedR *= this.fastMultiplier; }
+    var speedV = this.forwardSpeed * dist; // vertical speed
+    var speedR = this.strafeSpeed  * dist; // strafe speed
 
-    // Vertical move (pure Y in world space), respecting minY exactly:
+    // Vertical move (pure Y), respect minY
     var dy = moveVert * speedV * dt;
     if (dy !== 0) {
         var currentCamY = this.orbitCamera.worldCameraYForPivot(this.orbitCamera.pivotPoint);
         var minY = this.orbitCamera.minY;
-
-        // cameraY with vertical pan changes by the same dy (cameraY = pivotY + const)
         var proposedCamY = currentCamY + dy;
         if (proposedCamY < minY) {
-            // clamp movement so we exactly stop at minY
             dy = Math.max(dy, minY - currentCamY);
         }
         if (dy !== 0) {
@@ -657,7 +647,7 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
         }
     }
 
-    // Strafe move (left/right on XZ plane). Does not change pivot.y, so cameraY unchanged.
+    // Strafe on XZ
     var right = this.entity.right.clone(); right.y = 0; if (right.lengthSq() > 1e-8) right.normalize();
     var dx = moveRight * speedR * dt;
     if (dx !== 0) {