Update orbit-camera.js

orbit-camera.js

@@ -1,12 +1,13 @@
 // orbit-camera.js
 // ==============================
-console.log('[OrbitFILE] loaded orbit-camera.js'); // preuve que le fichier est bien chargé
 
 /*
  * PlayCanvas Orbit Camera for GSplat/SOGS/GLB viewers.
- * - Handles min/max zoom, pitch, yaw, minY (don't go below ground)
- * - Mouse, touch & keyboard controls (orbit, pan, zoom)
- * - Attributes are auto-injected by viewer.js
+ * - Min/Max zoom, pitch, yaw, minY clamping
+ * - Mouse, Touch & Keyboard controls (orbit, pan, zoom)
+ * - Robust keyboard capture (works even if canvas has no focus)
+ * - Yaw conversion fixed (degrees everywhere)
+ * - Optional debug logs
  */
 
 var OrbitCamera = pc.createScript('orbitCamera');
@@ -62,7 +63,7 @@ OrbitCamera.prototype.resetAndLookAtPoint = function (resetPoint, lookAtPoint) {
     this.distance = distance.length();
     this.pivotPoint.copy(lookAtPoint);
     var cameraQuat = this.entity.getRotation();
-    this.yaw = this._calcYaw(cameraQuat);
+    this.yaw = this._calcYaw(cameraQuat);         // degrees
     this.pitch = this._calcPitch(cameraQuat, this.yaw);
     this._removeInertia();
     this._updatePosition();
@@ -88,7 +89,7 @@ OrbitCamera.prototype.resetToPosition = function (position, lookAtPoint) {
     distanceVec.sub2(position, lookAtPoint);
     this._targetDistance = this._distance = distanceVec.length();
     var cameraQuat = this.entity.getRotation();
-    this._targetYaw = this._yaw = this._calcYaw(cameraQuat);
+    this._targetYaw = this._yaw = this._calcYaw(cameraQuat);       // degrees
     this._targetPitch = this._pitch = this._calcPitch(cameraQuat, this._yaw);
     this._removeInertia();
     this._updatePosition();
@@ -112,13 +113,14 @@ OrbitCamera.prototype.initialize = function () {
 
     this._modelsAabb = new pc.BoundingBox();
     this._buildAabb(this.focusEntity || this.app.root);
+
     this.entity.lookAt(this._modelsAabb.center);
 
     this._pivotPoint = new pc.Vec3();
     this._pivotPoint.copy(this._modelsAabb.center);
 
     var cameraQuat = this.entity.getRotation();
-    this._yaw = this._calcYaw(cameraQuat); // DEGRÉS
+    this._yaw = this._calcYaw(cameraQuat);                                // degrees
     this._pitch = this._clampPitchAngle(this._calcPitch(cameraQuat, this._yaw));
     this.entity.setLocalEulerAngles(this._pitch, this._yaw, 0);
 
@@ -147,28 +149,31 @@ OrbitCamera.prototype.initialize = function () {
         if (value) { this.focus(this.focusEntity || this.app.root); }
     });
 
-    this.on('destroy', function () { window.removeEventListener('resize', onWindowResize, false); });
-
-    console.log('[OrbitCam] init yaw=%s° pitch=%s° dist=%s',
-        this._yaw.toFixed(2), this._pitch.toFixed(2), this._distance.toFixed(3));
+    this.on('destroy', function () {
+        window.removeEventListener('resize', onWindowResize, false);
+    });
 };
 
 OrbitCamera.prototype.update = function (dt) {
     var t = this.inertiaFactor === 0 ? 1 : Math.min(dt / this.inertiaFactor, 1);
     this._distance = pc.math.lerp(this._distance, this._targetDistance, t);
-    this._yaw = pc.math.lerp(this._yaw, this._targetYaw, t);
-    this._pitch = pc.math.lerp(this._pitch, this._targetPitch, t);
+    this._yaw      = pc.math.lerp(this._yaw,      this._targetYaw,      t);
+    this._pitch    = pc.math.lerp(this._pitch,    this._targetPitch,    t);
     this._updatePosition();
 };
 
 OrbitCamera.prototype._updatePosition = function () {
     this.entity.setLocalPosition(0, 0, 0);
     this.entity.setLocalEulerAngles(this._pitch, this._yaw, 0);
+
     var position = this.entity.getPosition();
     position.copy(this.entity.forward);
     position.mulScalar(-this._distance);
     position.add(this.pivotPoint);
+
+    // Never below ground
     position.y = Math.max(position.y, this.minY);
+
     this.entity.setPosition(position);
 };
 
@@ -185,4 +190,494 @@ OrbitCamera.prototype._checkAspectRatio = function () {
 };
 
 OrbitCamera.prototype._buildAabb = function (entity) {
-    var i, m, mes
+    var i, m, meshInstances = [];
+
+    var renders = entity.findComponents('render');
+    for (i = 0; i < renders.length; i++) {
+        var render = renders[i];
+        for (m = 0; m < render.meshInstances.length; m++) {
+            meshInstances.push(render.meshInstances[m]);
+        }
+    }
+
+    var models = entity.findComponents('model');
+    for (i = 0; i < models.length; i++) {
+        var model = models[i];
+        for (m = 0; m < model.meshInstances.length; m++) {
+            meshInstances.push(model.meshInstances[m]);
+        }
+    }
+
+    var gsplats = entity.findComponents('gsplat');
+    for (i = 0; i < gsplats.length; i++) {
+        var gsplat = gsplats[i];
+        var instance = gsplat.instance;
+        if (instance && instance.meshInstance) {
+            meshInstances.push(instance.meshInstance);
+        }
+    }
+
+    for (i = 0; i < meshInstances.length; i++) {
+        if (i === 0) {
+            this._modelsAabb.copy(meshInstances[i].aabb);
+        } else {
+            this._modelsAabb.add(meshInstances[i].aabb);
+        }
+    }
+};
+
+OrbitCamera.prototype._calcYaw = function (quat) {
+    // return DEGREES
+    var f = new pc.Vec3();
+    quat.transformVector(pc.Vec3.FORWARD, f);
+    return Math.atan2(-f.x, -f.z) * pc.math.RAD_TO_DEG;
+};
+
+OrbitCamera.prototype._clampDistance = function (distance) {
+    if (this.distanceMax > 0) {
+        return pc.math.clamp(distance, this.distanceMin, this.distanceMax);
+    }
+    return Math.max(distance, this.distanceMin);
+};
+
+OrbitCamera.prototype._clampPitchAngle = function (pitch) {
+    return pc.math.clamp(pitch, this.pitchAngleMin, this.pitchAngleMax);
+};
+
+OrbitCamera.prototype._clampYawAngle = function (yaw) {
+    return pc.math.clamp(yaw, this.yawAngleMin, this.yawAngleMax);
+};
+
+OrbitCamera.quatWithoutYaw = new pc.Quat();
+OrbitCamera.yawOffset = new pc.Quat();
+
+OrbitCamera.prototype._calcPitch = function (quat, yaw) {
+    var quatWithoutYaw = OrbitCamera.quatWithoutYaw;
+    var yawOffset = OrbitCamera.yawOffset;
+    yawOffset.setFromEulerAngles(0, -yaw, 0);
+    quatWithoutYaw.mul2(yawOffset, quat);
+    var f = new pc.Vec3();
+    quatWithoutYaw.transformVector(pc.Vec3.FORWARD, f);
+    return Math.atan2(-f.y, -f.z) * pc.math.RAD_TO_DEG;
+};
+
+// =================== Orbit Camera Input Mouse Script ========================
+
+var OrbitCameraInputMouse = pc.createScript('orbitCameraInputMouse');
+OrbitCameraInputMouse.attributes.add('orbitSensitivity',    { type: 'number', default: 0.3, title: 'Orbit Sensitivity' });
+OrbitCameraInputMouse.attributes.add('distanceSensitivity', { type: 'number', default: 0.4, title: 'Distance Sensitivity' });
+
+OrbitCameraInputMouse.prototype.initialize = function () {
+    this.orbitCamera = this.entity.script.orbitCamera;
+    if (this.orbitCamera) {
+        var self = this;
+        var onMouseOut = function () { self.onMouseOut(); };
+
+        this.app.mouse.on(pc.EVENT_MOUSEDOWN, this.onMouseDown, this);
+        this.app.mouse.on(pc.EVENT_MOUSEUP,   this.onMouseUp,   this);
+        this.app.mouse.on(pc.EVENT_MOUSEMOVE, this.onMouseMove, this);
+        this.app.mouse.on(pc.EVENT_MOUSEWHEEL,this.onMouseWheel,this);
+
+        window.addEventListener('mouseout', onMouseOut, false);
+
+        this.on('destroy', function () {
+            this.app.mouse.off(pc.EVENT_MOUSEDOWN, this.onMouseDown, this);
+            this.app.mouse.off(pc.EVENT_MOUSEUP,   this.onMouseUp,   this);
+            this.app.mouse.off(pc.EVENT_MOUSEMOVE, this.onMouseMove, this);
+            this.app.mouse.off(pc.EVENT_MOUSEWHEEL,this.onMouseWheel,this);
+            window.removeEventListener('mouseout', onMouseOut, false);
+        });
+    }
+    this.app.mouse.disableContextMenu();
+
+    this.lookButtonDown = false;
+    this.panButtonDown  = false;
+    this.lastPoint = new pc.Vec2();
+};
+OrbitCameraInputMouse.fromWorldPoint = new pc.Vec3();
+OrbitCameraInputMouse.toWorldPoint   = new pc.Vec3();
+OrbitCameraInputMouse.worldDiff      = new pc.Vec3();
+
+OrbitCameraInputMouse.prototype.pan = function (screenPoint) {
+    var fromWorldPoint = OrbitCameraInputMouse.fromWorldPoint;
+    var toWorldPoint   = OrbitCameraInputMouse.toWorldPoint;
+    var worldDiff      = OrbitCameraInputMouse.worldDiff;
+
+    var camera   = this.entity.camera;
+    var distance = this.orbitCamera.distance;
+
+    camera.screenToWorld(screenPoint.x, this.lastPoint.y, distance, fromWorldPoint);
+    camera.screenToWorld(this.lastPoint.x, this.lastPoint.y, distance, toWorldPoint);
+    camera.screenToWorld(screenPoint.x, screenPoint.y, distance, fromWorldPoint);
+    worldDiff.sub2(toWorldPoint, fromWorldPoint);
+
+    var proposedPivot = this.orbitCamera.pivotPoint.clone().add(worldDiff);
+    var minY = this.orbitCamera.minY;
+    var resultingY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
+
+    if (resultingY >= minY - 1e-4) {
+        this.orbitCamera.pivotPoint.add(worldDiff);
+    } else {
+        worldDiff.y = 0;
+        proposedPivot = this.orbitCamera.pivotPoint.clone().add(worldDiff);
+        resultingY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
+        if (resultingY >= minY - 1e-4) {
+            this.orbitCamera.pivotPoint.add(worldDiff);
+        }
+    }
+};
+
+OrbitCameraInputMouse.prototype.onMouseDown = function (event) {
+    switch (event.button) {
+        case pc.MOUSEBUTTON_LEFT:   this.panButtonDown  = true; break;
+        case pc.MOUSEBUTTON_MIDDLE:
+        case pc.MOUSEBUTTON_RIGHT:  this.lookButtonDown = true; break;
+    }
+};
+OrbitCameraInputMouse.prototype.onMouseUp = function (event) {
+    switch (event.button) {
+        case pc.MOUSEBUTTON_LEFT:   this.panButtonDown  = false; break;
+        case pc.MOUSEBUTTON_MIDDLE:
+        case pc.MOUSEBUTTON_RIGHT:  this.lookButtonDown = false; break;
+    }
+};
+OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
+    if (this.lookButtonDown) {
+        var sens = this.orbitSensitivity;
+        var deltaPitch = event.dy * sens;
+        var deltaYaw   = event.dx * sens;
+
+        var currPitch = this.orbitCamera.pitch;
+        var currYaw   = this.orbitCamera.yaw;
+        var currDist  = this.orbitCamera.distance;
+        var currPivot = this.orbitCamera.pivotPoint.clone();
+
+        var camQuat = new pc.Quat().setFromEulerAngles(currPitch, currYaw, 0);
+        var forward = new pc.Vec3(); camQuat.transformVector(pc.Vec3.FORWARD, forward);
+        var preY = currPivot.y + (-forward.y) * currDist;
+
+        var proposedPitch = currPitch - deltaPitch;
+        var testQuat = new pc.Quat().setFromEulerAngles(proposedPitch, currYaw, 0);
+        var testForward = new pc.Vec3(); testQuat.transformVector(pc.Vec3.FORWARD, testForward);
+        var proposedY = currPivot.y + (-testForward.y) * currDist;
+
+        var minY = this.orbitCamera.minY;
+        var wouldGoBelow = proposedY < minY - 1e-4;
+
+        if (wouldGoBelow && (proposedY < preY)) {
+            this.orbitCamera.yaw   = currYaw - deltaYaw;
+        } else {
+            this.orbitCamera.pitch = proposedPitch;
+            this.orbitCamera.yaw   = currYaw - deltaYaw;
+        }
+    } else if (this.panButtonDown) {
+        this.pan(new pc.Vec2(event.x, event.y));
+    }
+
+    this.lastPoint.set(event.x, event.y);
+};
+
+OrbitCameraInputMouse.prototype.onMouseWheel = function (event) {
+    if (this.entity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
+        this.orbitCamera.distance -= event.wheelDelta * this.distanceSensitivity * (this.orbitCamera.distance * 0.1);
+    } else {
+        this.orbitCamera.orthoHeight -= event.wheelDelta * this.distanceSensitivity * (this.orbitCamera.orthoHeight * 0.1);
+    }
+    event.event.preventDefault();
+};
+OrbitCameraInputMouse.prototype.onMouseOut = function () {
+    this.lookButtonDown = false;
+    this.panButtonDown  = false;
+};
+
+// =================== Orbit Camera Input Touch Script ========================
+
+var OrbitCameraInputTouch = pc.createScript('orbitCameraInputTouch');
+OrbitCameraInputTouch.attributes.add('orbitSensitivity',    { type: 'number', default: 0.6, title: 'Orbit Sensitivity' });
+OrbitCameraInputTouch.attributes.add('distanceSensitivity', { type: 'number', default: 0.5, title: 'Distance Sensitivity' });
+
+OrbitCameraInputTouch.prototype.initialize = function () {
+    this.orbitCamera = this.entity.script.orbitCamera;
+    this.lastTouchPoint    = new pc.Vec2();
+    this.lastPinchMidPoint = new pc.Vec2();
+    this.lastPinchDistance = 0;
+
+    if (this.orbitCamera && this.app.touch) {
+        this.app.touch.on(pc.EVENT_TOUCHSTART,  this.onTouchStartEndCancel, this);
+        this.app.touch.on(pc.EVENT_TOUCHEND,    this.onTouchStartEndCancel, this);
+        this.app.touch.on(pc.EVENT_TOUCHCANCEL, this.onTouchStartEndCancel, this);
+        this.app.touch.on(pc.EVENT_TOUCHMOVE,   this.onTouchMove, this);
+
+        this.on('destroy', function () {
+            this.app.touch.off(pc.EVENT_TOUCHSTART,  this.onTouchStartEndCancel, this);
+            this.app.touch.off(pc.EVENT_TOUCHEND,    this.onTouchStartEndCancel, this);
+            this.app.touch.off(pc.EVENT_TOUCHCANCEL, this.onTouchStartEndCancel, this);
+            this.app.touch.off(pc.EVENT_TOUCHMOVE,   this.onTouchMove, this);
+        });
+    }
+};
+OrbitCameraInputTouch.prototype.getPinchDistance = function (pointA, pointB) {
+    var dx = pointA.x - pointB.x;
+    var dy = pointA.y - pointB.y;
+    return Math.sqrt((dx * dx) + (dy * dy));
+};
+OrbitCameraInputTouch.prototype.calcMidPoint = function (pointA, pointB, result) {
+    result.set(pointB.x - pointA.x, pointB.y - pointA.y);
+    result.mulScalar(0.5);
+    result.x += pointA.x;
+    result.y += pointA.y;
+};
+OrbitCameraInputTouch.prototype.onTouchStartEndCancel = function (event) {
+    var touches = event.touches;
+    if (touches.length === 1) {
+        this.lastTouchPoint.set(touches[0].x, touches[0].y);
+    } else if (touches.length === 2) {
+        this.lastPinchDistance = this.getPinchDistance(touches[0], touches[1]);
+        this.calcMidPoint(touches[0], touches[1], this.lastPinchMidPoint);
+    }
+};
+OrbitCameraInputTouch.fromWorldPoint = new pc.Vec3();
+OrbitCameraInputTouch.toWorldPoint   = new pc.Vec3();
+OrbitCameraInputTouch.worldDiff      = new pc.Vec3();
+
+OrbitCameraInputTouch.prototype.pan = function (midPoint) {
+    var fromWorldPoint = OrbitCameraInputTouch.fromWorldPoint;
+    var toWorldPoint   = OrbitCameraInputTouch.toWorldPoint;
+    var worldDiff      = OrbitCameraInputTouch.worldDiff;
+
+    var camera   = this.entity.camera;
+    var distance = this.orbitCamera.distance;
+
+    camera.screenToWorld(midPoint.x, midPoint.y, distance, fromWorldPoint);
+    camera.screenToWorld(this.lastPinchMidPoint.x, this.lastPinchMidPoint.y, distance, toWorldPoint);
+    worldDiff.sub2(toWorldPoint, fromWorldPoint);
+
+    var proposedPivot = this.orbitCamera.pivotPoint.clone().add(worldDiff);
+    var minY = this.orbitCamera.minY;
+    var resultingY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
+
+    if (resultingY >= minY - 1e-4) {
+        this.orbitCamera.pivotPoint.add(worldDiff);
+    } else {
+        worldDiff.y = 0;
+        proposedPivot = this.orbitCamera.pivotPoint.clone().add(worldDiff);
+        resultingY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
+        if (resultingY >= minY - 1e-4) {
+            this.orbitCamera.pivotPoint.add(worldDiff);
+        }
+    }
+};
+
+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 deltaPitch = (touch.y - this.lastTouchPoint.y) * sens;
+        var deltaYaw   = (touch.x - this.lastTouchPoint.x) * sens;
+
+        var currPitch = this.orbitCamera.pitch;
+        var currYaw   = this.orbitCamera.yaw;
+        var currDist  = this.orbitCamera.distance;
+        var currPivot = this.orbitCamera.pivotPoint.clone();
+
+        var camQuat = new pc.Quat().setFromEulerAngles(currPitch, currYaw, 0);
+        var forward = new pc.Vec3(); camQuat.transformVector(pc.Vec3.FORWARD, forward);
+        var preY = currPivot.y + (-forward.y) * currDist;
+
+        var proposedPitch = currPitch - deltaPitch;
+        var testQuat = new pc.Quat().setFromEulerAngles(proposedPitch, currYaw, 0);
+        var testForward = new pc.Vec3(); testQuat.transformVector(pc.Vec3.FORWARD, testForward);
+        var proposedY = currPivot.y + (-testForward.y) * currDist;
+
+        var minY = this.orbitCamera.minY;
+        var wouldGoBelow = proposedY < minY - 1e-4;
+
+        if (wouldGoBelow && (proposedY < preY)) {
+            this.orbitCamera.yaw   = currYaw - deltaYaw;
+        } else {
+            this.orbitCamera.pitch = proposedPitch;
+            this.orbitCamera.yaw   = currYaw - deltaYaw;
+        }
+
+        this.lastTouchPoint.set(touch.x, touch.y);
+    } else if (touches.length === 2) {
+        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);
+    }
+};
+
+// =================== Orbit Camera Input Keyboard Script ========================
+
+var OrbitCameraInputKeyboard = pc.createScript('orbitCameraInputKeyboard');
+
+/*
+ * Keyboard:
+ * - ↑ / ↓ : orbit pitch (north/south)
+ * - ← / → : orbit yaw   (left/right)
+ * - Shift + ↑ / ↓ : zoom in / out (persp: distance, ortho: orthoHeight)
+ * - Shift + ← / → : pan sideways
+ *
+ * Robust capture: uses both pc.Keyboard and window key events
+ * (works even if the canvas isn’t focused). Optionally focus canvas on pointer down.
+ */
+
+OrbitCameraInputKeyboard.attributes.add('orbitDegreesPerSecond', { type: 'number', default: 180, title: 'Orbit Degrees / s' });
+OrbitCameraInputKeyboard.attributes.add('zoomFactorPerSecond',   { type: 'number', default: 2.0,  title: 'Zoom Factor / s' });
+OrbitCameraInputKeyboard.attributes.add('panUnitsPerSecond',     { type: 'number', default: 1.0,  title: 'Pan (distance frac) / s' });
+OrbitCameraInputKeyboard.attributes.add('autoFocusCanvas',       { type: 'boolean', default: true, title: 'Auto-focus Canvas on Click' });
+OrbitCameraInputKeyboard.attributes.add('debugLogs',             { type: 'boolean', default: false, title: 'Enable Debug Logs' });
+
+OrbitCameraInputKeyboard.prototype._log = function () {
+    if (!this.debugLogs) return;
+    console.log.apply(console, arguments); // eslint-disable-line no-console
+};
+
+OrbitCameraInputKeyboard.prototype.initialize = function () {
+    this.orbitCamera = this.entity.script.orbitCamera;
+
+    // Ensure PlayCanvas keyboard exists
+    if (!this.app.keyboard) {
+        this.app.keyboard = new pc.Keyboard(window);
+        this._log('[OrbitKB] created pc.Keyboard(window)');
+    }
+
+    // Window-level key state (works regardless of focus target)
+    this._keyState = Object.create(null);
+    this._onWinKeyDown = (e) => {
+        this._keyState[e.key] = true;
+        // prevent page scroll on arrows
+        if (e.key && e.key.indexOf('Arrow') === 0) e.preventDefault();
+        this._log('[OrbitKB] down', e.key);
+    };
+    this._onWinKeyUp = (e) => {
+        this._keyState[e.key] = false;
+        this._log('[OrbitKB] up', e.key);
+    };
+    window.addEventListener('keydown', this._onWinKeyDown, { passive: false });
+    window.addEventListener('keyup',   this._onWinKeyUp);
+
+    // Optional: make canvas focusable and auto-focus on click
+    this.canvas = this.app.graphicsDevice && this.app.graphicsDevice.canvas;
+    if (this.canvas && this.autoFocusCanvas) {
+        if (!this.canvas.hasAttribute('tabindex')) this.canvas.setAttribute('tabindex', '0');
+        this._onPointerDown = () => { try { this.canvas.focus(); } catch (e) {} };
+        this.canvas.addEventListener('pointerdown', this._onPointerDown);
+    }
+
+    this.on('destroy', function () {
+        window.removeEventListener('keydown', this._onWinKeyDown, { passive: false });
+        window.removeEventListener('keyup',   this._onWinKeyUp);
+        if (this.canvas && this._onPointerDown) this.canvas.removeEventListener('pointerdown', this._onPointerDown);
+    });
+};
+
+OrbitCameraInputKeyboard.prototype._pressed = function (pcKey, keyString) {
+    // true if either PlayCanvas reports it or our window listener does
+    var pcPressed = this.app.keyboard && this.app.keyboard.isPressed ? this.app.keyboard.isPressed(pcKey) : false;
+    var winPressed = !!this._keyState[keyString];
+    return pcPressed || winPressed;
+};
+
+OrbitCameraInputKeyboard.prototype._wouldGoBelowMinYWithPitch = function (proposedPitch) {
+    var cam = this.orbitCamera;
+    var currPitch = cam.pitch;
+    var currYaw = cam.yaw;
+    var currDist = cam.distance;
+    var pivot = cam.pivotPoint.clone();
+
+    var camQuat = new pc.Quat().setFromEulerAngles(currPitch, currYaw, 0);
+    var forward = new pc.Vec3(); camQuat.transformVector(pc.Vec3.FORWARD, forward);
+    var preY = pivot.y + (-forward.y) * currDist;
+
+    var testQuat = new pc.Quat().setFromEulerAngles(proposedPitch, currYaw, 0);
+    var testForward = new pc.Vec3(); testQuat.transformVector(pc.Vec3.FORWARD, testForward);
+    var proposedY = pivot.y + (-testForward.y) * currDist;
+
+    var minY = cam.minY;
+    return { wouldGoBelow: proposedY < minY - 1e-4, preY: preY, proposedY: proposedY };
+};
+
+OrbitCameraInputKeyboard.prototype._panSideways = function (delta) {
+    var cam = this.orbitCamera;
+
+    var quat = new pc.Quat().setFromEulerAngles(cam.pitch, cam.yaw, 0);
+    var right = new pc.Vec3(); quat.transformVector(pc.Vec3.RIGHT, right);
+    var move = right.scale(delta);
+
+    var minY = cam.minY;
+    var proposedPivot = cam.pivotPoint.clone().add(move);
+    var resultingY = cam.worldCameraYForPivot(proposedPivot);
+
+    if (resultingY >= minY - 1e-4) {
+        cam.pivotPoint.add(move);
+    } else {
+        move.y = 0;
+        proposedPivot = cam.pivotPoint.clone().add(move);
+        resultingY = cam.worldCameraYForPivot(proposedPivot);
+        if (resultingY >= minY - 1e-4) cam.pivotPoint.add(move);
+    }
+};
+
+OrbitCameraInputKeyboard.prototype.update = function (dt) {
+    if (!this.orbitCamera) return;
+
+    var cam = this.orbitCamera;
+
+    var shift = this._pressed(pc.KEY_SHIFT, 'Shift') || this._pressed(pc.KEY_SHIFT, 'ShiftLeft') || this._pressed(pc.KEY_SHIFT, 'ShiftRight');
+    var up    = this._pressed(pc.KEY_UP,    'ArrowUp');
+    var down  = this._pressed(pc.KEY_DOWN,  'ArrowDown');
+    var left  = this._pressed(pc.KEY_LEFT,  'ArrowLeft');
+    var right = this._pressed(pc.KEY_RIGHT, 'ArrowRight');
+
+    if (!(up || down || left || right)) return;
+
+    if (shift) {
+        // Zoom (Shift + Up/Down)
+        if (up || down) {
+            var k = this.zoomFactorPerSecond;
+            if (this.entity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
+                var dz = k * dt * (cam.distance * 0.8);
+                cam.distance = cam.distance + (down ? +dz : -dz);
+            } else {
+                var dh = k * dt * (this.entity.camera.orthoHeight * 0.8);
+                this.entity.camera.orthoHeight += (down ? +dh : -dh);
+            }
+        }
+        // Pan lateral (Shift + Left/Right)
+        if (left || right) {
+            var speed = this.panUnitsPerSecond * cam.distance; // world units / s
+            var delta = speed * dt * (left ? -1 : +1);
+            this._panSideways(delta);
+        }
+        return;
+    }
+
+    // Orbit (no Shift)
+    var orbitRate = this.orbitDegreesPerSecond * dt;
+
+    if (up || down) {
+        var dir = up ? -1 : +1; // Up: decrease pitch
+        var currPitch = cam.pitch;
+        var proposedPitch = currPitch + dir * orbitRate;
+        var test = this._wouldGoBelowMinYWithPitch(proposedPitch);
+        if (!(test.wouldGoBelow && (test.proposedY < test.preY))) {
+            cam.pitch = proposedPitch;
+        }
+    }
+
+    if (left)  cam.yaw = cam.yaw + orbitRate;
+    if (right) cam.yaw = cam.yaw - orbitRate;
+};