Update orbit-camera.js

orbit-camera.js

@@ -1,21 +1,4 @@
 // orbit-camera.js
-// ==============================
-// Logs de preuve que le fichier est bien chargé :
-console.log('[OrbitFILE] loaded orbit-camera.js');
-
-/*
- * Orbit Camera PlayCanvas (GSplat/SOGS/GLB)
- * - Conserve toutes tes fonctions et restrictions existantes
- * - Ajoute le contrôle clavier façon camera-controls.mjs :
- *   ↑/↓ : orbite nord/sud (pitch)
- *   ←/→ : orbite gauche/droite (yaw)
- *   SHIFT+↑/↓ : zoom / dézoom
- *   SHIFT+←/→ : déplacement latéral (pan sur les côtés)
- * - Respecte minY + inertie + clamps
- * - Ajout de logs et capture clavier robuste (window + focus canvas)
- */
-
-// ===================== Orbit Camera (TON SCRIPT D’ORIGINE, intact) =====================
 
 var OrbitCamera = pc.createScript('orbitCamera');
 
@@ -109,7 +92,7 @@ OrbitCamera.prototype.resetToPosition = function (position, lookAtPoint) {
     this._updatePosition();
 };
 
-// ==== Clamp helper for panning/orbiting pour ne jamais passer sous minY ====
+// ==== Helper: calc cam Y if pivot became 'pivot' (used to enforce minY) ====
 OrbitCamera.prototype.worldCameraYForPivot = function(pivot) {
     var quat = new pc.Quat();
     quat.setFromEulerAngles(this._pitch, this._yaw, 0);
@@ -129,18 +112,23 @@ OrbitCamera.prototype.initialize = function () {
     var onWindowResize = function () { self._checkAspectRatio(); };
     window.addEventListener('resize', onWindowResize, false);
     this._checkAspectRatio();
+
     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);
     this._pitch = this._clampPitchAngle(this._calcPitch(cameraQuat, this._yaw));
     this.entity.setLocalEulerAngles(this._pitch, this._yaw, 0);
+
     this._distance = 0;
     this._targetYaw = this._yaw;
     this._targetPitch = this._pitch;
+
     if (this.frameOnStart) {
         this.focus(this.focusEntity || this.app.root);
     } else {
@@ -149,22 +137,22 @@ OrbitCamera.prototype.initialize = function () {
         this._distance = this._clampDistance(distanceBetween.length());
     }
     this._targetDistance = this._distance;
+
     this.on('attr:distanceMin', function () { this._distance = this._clampDistance(this._distance); });
     this.on('attr:distanceMax', function () { this._distance = this._clampDistance(this._distance); });
     this.on('attr:pitchAngleMin', function () { this._pitch = this._clampPitchAngle(this._pitch); });
     this.on('attr:pitchAngleMax', function () { this._pitch = this._clampPitchAngle(this._pitch); });
+
     this.on('attr:focusEntity', function (value) {
         if (this.frameOnStart) { this.focus(value || this.app.root); }
         else { this.resetAndLookAtEntity(this.entity.getPosition(), value || this.app.root); }
     });
+
     this.on('attr:frameOnStart', function (value) {
         if (value) { this.focus(this.focusEntity || this.app.root); }
     });
-    this.on('destroy', function () { window.removeEventListener('resize', onWindowResize, false); });
 
-    // log d’état initial
-    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) {
@@ -178,12 +166,15 @@ OrbitCamera.prototype.update = function (dt) {
 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);
+
     // Clamp camera's Y position so it never goes below minY
     position.y = Math.max(position.y, this.minY);
+
     this.entity.setPosition(position);
 };
 
@@ -201,6 +192,7 @@ OrbitCamera.prototype._checkAspectRatio = function () {
 
 OrbitCamera.prototype._buildAabb = function (entity) {
     var i, m, meshInstances = [];
+
     var renders = entity.findComponents('render');
     for (i = 0; i < renders.length; i++) {
         var render = renders[i];
@@ -208,6 +200,7 @@ OrbitCamera.prototype._buildAabb = function (entity) {
             meshInstances.push(render.meshInstances[m]);
         }
     }
+
     var models = entity.findComponents('model');
     for (i = 0; i < models.length; i++) {
         var model = models[i];
@@ -215,6 +208,7 @@ OrbitCamera.prototype._buildAabb = function (entity) {
             meshInstances.push(model.meshInstances[m]);
         }
     }
+
     var gsplats = entity.findComponents('gsplat');
     for (i = 0; i < gsplats.length; i++) {
         var gsplat = gsplats[i];
@@ -223,6 +217,7 @@ OrbitCamera.prototype._buildAabb = function (entity) {
             meshInstances.push(instance.meshInstance);
         }
     }
+
     for (i = 0; i < meshInstances.length; i++) {
         if (i === 0) {
             this._modelsAabb.copy(meshInstances[i].aabb);
@@ -235,7 +230,7 @@ OrbitCamera.prototype._buildAabb = function (entity) {
 OrbitCamera.prototype._calcYaw = function (quat) {
     var transformedForward = new pc.Vec3();
     quat.transformVector(pc.Vec3.FORWARD, transformedForward);
-    return Math.atan2(-transformedForward.x, -transformedForward.z) * pc.math.RAD_TO_DEG; // DEGRÉS
+    return Math.atan2(-transformedForward.x, -transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
 OrbitCamera.prototype._clampDistance = function (distance) {
@@ -250,8 +245,7 @@ OrbitCamera.prototype._clampPitchAngle = function (pitch) {
 };
 
 OrbitCamera.prototype._clampYawAngle = function (yaw) {
-    // FIX: clamp correct (pas d'inversion min/max)
-    return pc.math.clamp(yaw, this.yawAngleMin, this.yawAngleMax);
+    return pc.math.clamp(yaw, -this.yawAngleMax, -this.yawAngleMin);
 };
 
 OrbitCamera.quatWithoutYaw = new pc.Quat();
@@ -267,22 +261,24 @@ OrbitCamera.prototype._calcPitch = function (quat, yaw) {
     return Math.atan2(-transformedForward.y, -transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
-// ===================== Orbit Camera Input Mouse Script (inchangé) =====================
-
+// ===================== 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 (e) { self.onMouseOut(e); };
+        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);
@@ -291,9 +287,11 @@ OrbitCameraInputMouse.prototype.initialize = function () {
             window.removeEventListener('mouseout', onMouseOut, false);
         });
     }
+
     this.app.mouse.disableContextMenu();
+
     this.lookButtonDown = false;
-    this.panButtonDown = false;
+       this.panButtonDown = false;
     this.lastPoint = new pc.Vec2();
 };
 
@@ -305,13 +303,16 @@ 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, screenPoint.y, distance, fromWorldPoint);
     camera.screenToWorld(this.lastPoint.x, this.lastPoint.y, distance, toWorldPoint);
+
     worldDiff.sub2(toWorldPoint, fromWorldPoint);
 
-    // Clamp so camera never goes below minY
+    // Enforce minY like vertical/horizontal pan with arrows
     var proposedPivot = this.orbitCamera.pivotPoint.clone().add(worldDiff);
     var minY = this.orbitCamera.minY;
     var resultingY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
@@ -319,14 +320,13 @@ OrbitCameraInputMouse.prototype.pan = function (screenPoint) {
     if (resultingY >= minY - 1e-4) {
         this.orbitCamera.pivotPoint.add(worldDiff);
     } else {
-        // Only allow horizontal pan if it would help
+        // Try horizontal-only
         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);
         }
-        // Otherwise, suppress pan
     }
 };
 
@@ -337,6 +337,7 @@ OrbitCameraInputMouse.prototype.onMouseDown = function (event) {
         case pc.MOUSEBUTTON_RIGHT: this.lookButtonDown = true; break;
     }
 };
+
 OrbitCameraInputMouse.prototype.onMouseUp = function (event) {
     switch (event.button) {
         case pc.MOUSEBUTTON_LEFT: this.panButtonDown = false; break;
@@ -344,10 +345,12 @@ OrbitCameraInputMouse.prototype.onMouseUp = function (event) {
         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 deltaPitch = event.dy * sens; // mouse up (dy < 0) raises pitch
         var deltaYaw = event.dx * sens;
 
         var currPitch = this.orbitCamera.pitch;
@@ -370,6 +373,7 @@ OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
 
         var minY = this.orbitCamera.minY;
         var wouldGoBelow = proposedY < minY - 1e-4;
+
         if (wouldGoBelow && (proposedY < preY)) {
             this.orbitCamera.yaw = currYaw - deltaYaw;
         } else {
@@ -379,6 +383,7 @@ OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
     } else if (this.panButtonDown) {
         this.pan(new pc.Vec2(event.x, event.y));
     }
+
     this.lastPoint.set(event.x, event.y);
 };
 
@@ -390,25 +395,29 @@ OrbitCameraInputMouse.prototype.onMouseWheel = function (event) {
     }
     event.event.preventDefault();
 };
+
 OrbitCameraInputMouse.prototype.onMouseOut = function () {
     this.lookButtonDown = false;
     this.panButtonDown = false;
 };
 
-// =================== Orbit Camera Input Touch Script (inchangé) ========================
+// =================== 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);
@@ -417,17 +426,20 @@ OrbitCameraInputTouch.prototype.initialize = function () {
         });
     }
 };
+
 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) {
@@ -437,17 +449,22 @@ OrbitCameraInputTouch.prototype.onTouchStartEndCancel = function (event) {
         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);
@@ -471,9 +488,11 @@ 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;
 
@@ -497,254 +516,141 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
 
         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 (nouveau, simple) ========================
+// =================== Orbit Camera Input Keyboard ========================
+// Arrows:
+// - No modifier:   Up/Down = vertical pan; Left/Right = strafe
+// - 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');
 
-/*
- * Contrôles :
- * - ↑ / ↓ : orbiter nord/sud (pitch)
- * - ← / → : orbiter gauche/droite (yaw)
- * - SHIFT + ↑ / ↓ : zoom / dézoom
- * - SHIFT + ← / → : déplacement latéral (pan)
- *
- * Robuste : écoute `window` (style camera-controls.mjs), union avec app.keyboard,
- * preventDefault sur les flèches, focus auto du canvas pour voir les logs.
- */
-
-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: true, title: 'Enable Debug Logs' });
-
-OrbitCameraInputKeyboard.prototype._log = function () {
-    if (!this.debugLogs) return;
-    // eslint-disable-next-line no-console
-    console.log.apply(console, arguments);
-};
+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)' });
+
+// 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]' });
 
 OrbitCameraInputKeyboard.prototype.initialize = function () {
-    console.log('[OrbitKB] initialize()'); // log inconditionnel
     this.orbitCamera = this.entity.script.orbitCamera;
-
-    // S'assure que le clavier PlayCanvas existe
-    if (!this.app.keyboard) {
-        this.app.keyboard = new pc.Keyboard(window);
-        this._log('[OrbitKB] created pc.Keyboard(window)');
-    } else {
-        this._log('[OrbitKB] app.keyboard OK');
-    }
-
-    // Canvas focusable + focus auto au clic (utile pour capter les flèches sur certaines intégrations)
-    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._log('[OrbitKB] set canvas tabindex=0');
-        }
-        var self = this;
-        this._onPointerDown = function () {
-            try { self.canvas.focus(); self._log('[OrbitKB] canvas focused via pointer'); } catch (e) {}
-        };
-        this.canvas.addEventListener('pointerdown', this._onPointerDown);
-    }
-
-    // État clavier façon camera-controls.mjs (au niveau window)
-    this._keyState = Object.create(null);
-    var self = this;
-    this._onWinKeyDown = function (e) {
-        self._keyState[e.key] = true;
-        // éviter le scroll de page avec les flèches
-        if (e.key && e.key.indexOf('Arrow') === 0) e.preventDefault();
-        if (self.debugLogs) console.log('[OrbitKB] window.keydown', e.key);
-    };
-    this._onWinKeyUp = function (e) {
-        self._keyState[e.key] = false;
-        if (self.debugLogs) console.log('[OrbitKB] window.keyup  ', e.key);
-    };
-    window.addEventListener('keydown', this._onWinKeyDown, { passive: false });
-    window.addEventListener('keyup', this._onWinKeyUp);
-
-    // preventDefault (séparé) pour les flèches
-    this._preventDefault = function (e) {
-        var tag = (e.target && e.target.tagName) ? e.target.tagName.toUpperCase() : '';
-        if (tag === 'INPUT' || tag === 'TEXTAREA' || e.isContentEditable) return;
-        var key = e.key || '';
-        if (key === 'ArrowUp' || key === 'ArrowDown' || key === 'ArrowLeft' || key === 'ArrowRight') {
-            e.preventDefault();
-            if (self.debugLogs) console.log('[OrbitKB] preventDefault on', key);
-        }
-    };
-    window.addEventListener('keydown', this._preventDefault, { passive: false });
-
-    this.on('destroy', function () {
-        window.removeEventListener('keydown', this._onWinKeyDown, { passive: false });
-        window.removeEventListener('keyup', this._onWinKeyUp);
-        window.removeEventListener('keydown', this._preventDefault, { passive: false });
-        if (this.canvas && this._onPointerDown) this.canvas.removeEventListener('pointerdown', this._onPointerDown);
-    });
-
-    this._log('[OrbitKB] ready. yaw=%s pitch=%s dist=%s',
-        this.orbitCamera ? this.orbitCamera.yaw.toFixed(2) : 'n/a',
-        this.orbitCamera ? this.orbitCamera.pitch.toFixed(2) : 'n/a',
-        this.orbitCamera ? this.orbitCamera.distance.toFixed(3) : 'n/a'
-    );
-};
-
-OrbitCameraInputKeyboard.prototype._pressed = function (pcKey, keyString) {
-    var pcPressed = this.app.keyboard && this.app.keyboard.isPressed ? this.app.keyboard.isPressed(pcKey) : false;
-    var winPressed = !!this._keyState[keyString];
-    return pcPressed || winPressed;
+    this.keyboard = this.app.keyboard || null;
 };
 
-// Test minY identique à la souris pour le pitch
-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();
-    camQuat.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();
-    testQuat.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.update = function (dt) {
+    if (!this.orbitCamera || !this.keyboard) return;
+
+    var up = this.keyboard.isPressed(pc.KEY_UP);
+    var dn = this.keyboard.isPressed(pc.KEY_DOWN);
+    var lt = this.keyboard.isPressed(pc.KEY_LEFT);
+    var rt = this.keyboard.isPressed(pc.KEY_RIGHT);
+
+    var shift = this.keyboard.isPressed(pc.KEY_SHIFT);
+    var ctrl  = this.keyboard.isPressed(pc.KEY_CONTROL);
+
+    // ---- SHIFT: Orbit (pitch / yaw) ----
+    if (shift && (up || dn || lt || rt)) {
+        // 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)
+        }
 
-// Pan latéral (SHIFT+←/→) en respectant minY
-OrbitCameraInputKeyboard.prototype._panSideways = function (delta) {
-    var cam = this.orbitCamera;
+        // 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 quat = new pc.Quat();
-    quat.setFromEulerAngles(cam.pitch, cam.yaw, 0);
+            var currPitch = this.orbitCamera.pitch;
+            var currYaw   = this.orbitCamera.yaw;
+            var currDist  = this.orbitCamera.distance;
+            var currPivot = this.orbitCamera.pivotPoint.clone();
 
-    var right = new pc.Vec3();
-    quat.transformVector(pc.Vec3.RIGHT, right);
+            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 move = right.scale(delta);
+            var testPitch = currPitch + dPitch;
+            var testQuat = new pc.Quat().setFromEulerAngles(testPitch, currYaw, 0);
+            var testForward = new pc.Vec3(); testQuat.transformVector(pc.Vec3.FORWARD, testForward);
+            var proposedY = currPivot.y + (-testForward.y) * currDist;
 
-    var minY = cam.minY;
-    var proposedPivot = cam.pivotPoint.clone().add(move);
-    var resultingY = cam.worldCameraYForPivot(proposedPivot);
+            var minY = this.orbitCamera.minY;
+            var wouldGoBelow = proposedY < minY - 1e-4;
 
-    if (resultingY >= minY - 1e-4) {
-        cam.pivotPoint.add(move);
-        this._log('[OrbitKB] panSideways OK delta=%s -> pivot=(%s,%s,%s)',
-            delta.toFixed(3),
-            cam.pivotPoint.x.toFixed(3),
-            cam.pivotPoint.y.toFixed(3),
-            cam.pivotPoint.z.toFixed(3));
-    } else {
-        move.y = 0;
-        proposedPivot = cam.pivotPoint.clone().add(move);
-        resultingY = cam.worldCameraYForPivot(proposedPivot);
-        if (resultingY >= minY - 1e-4) {
-            cam.pivotPoint.add(move);
-            this._log('[OrbitKB] panSideways horizontal-only delta=%s', delta.toFixed(3));
-        } else {
-            this._log('[OrbitKB] panSideways blocked by minY delta=%s', delta.toFixed(3));
+            if (!(wouldGoBelow && (proposedY < preY))) {
+                this.orbitCamera.pitch = testPitch; // clamped by setter
+            }
         }
+        return;
     }
-};
-
-OrbitCameraInputKeyboard.prototype.update = function (dt) {
-    if (!this.orbitCamera) return;
-
-    var cam = this.orbitCamera;
-
-    // états de touches (union window+pc)
-    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 (this.debugLogs && (up || down || left || right)) {
-        console.log('[OrbitKB] pressed: shift=%s up=%s down=%s left=%s right=%s', !!shift, !!up, !!down, !!left, !!right);
-    }
-
-    if (!(up || down || left || right)) return;
-
-    if (shift) {
-        // --- Zoom (Shift + ↑/↓) ---
-        if (up || down) {
-            var k = this.zoomFactorPerSecond;
+    // ---- CTRL: Zoom (up/down) ----
+    if (ctrl && (up || dn)) {
+        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 = k * dt * (cam.distance * 0.8);
-                var before = cam.distance;
-                cam.distance = before + (down ? +dz : -dz);
-                this._log('[OrbitKB] SHIFT Zoom persp %s -> %s (dz=%s)',
-                    before.toFixed(3), cam.distance.toFixed(3), dz.toFixed(3));
+                var dz = zoomSign * this.zoomKeySensitivity * (this.orbitCamera.distance * 0.5) * dt;
+                this.orbitCamera.distance -= dz; // clamped
             } else {
-                var dh = k * dt * (this.entity.camera.orthoHeight * 0.8);
-                var beforeH = this.entity.camera.orthoHeight;
-                this.entity.camera.orthoHeight = beforeH + (down ? +dh : -dh);
-                this._log('[OrbitKB] SHIFT Zoom ortho %s -> %s (dh=%s)',
-                    beforeH.toFixed(3), this.entity.camera.orthoHeight.toFixed(3), dh.toFixed(3));
+                var doh = zoomSign * this.zoomKeySensitivity * (this.orbitCamera.orthoHeight * 0.5) * dt;
+                this.orbitCamera.orthoHeight -= doh; // clamped >= 0
             }
         }
+        return;
+    }
 
-        // --- Pan latéral (Shift + ←/→) ---
-        if (left || right) {
-            var speed = this.panUnitsPerSecond * cam.distance; // unités monde / s
-            var delta = speed * dt * (left ? -1 : +1);
-            this._log('[OrbitKB] SHIFT Pan delta=%s (speed=%s, dist=%s)', delta.toFixed(3), speed.toFixed(3), cam.distance.toFixed(3));
-            this._panSideways(delta);
-        }
+    // ---- No modifier: translate (vertical + strafe) ----
+    var moveVert = (up ? 1 : 0) - (dn ? 1 : 0); // Up=+1 => go up
+    var moveRight = (rt ? 1 : 0) - (lt ? 1 : 0);
 
-        return; // pas d’orbite quand SHIFT est enfoncé
-    }
+    if (moveVert === 0 && moveRight === 0) return;
 
-    // --- Orbite sans SHIFT ---
-    var orbitRate = this.orbitDegreesPerSecond * dt;
-
-    // Pitch (↑/↓) — même garde minY que la souris
-    if (up || down) {
-        var dir = up ? -1 : +1; // ↑ = réduire le pitch (orbiter vers le nord)
-        var beforePitch = cam.pitch;
-        var proposedPitch = beforePitch + dir * orbitRate;
-        var test = this._wouldGoBelowMinYWithPitch(proposedPitch);
-        if (!(test.wouldGoBelow && (test.proposedY < test.preY))) {
-            cam.pitch = proposedPitch;
-            this._log('[OrbitKB] Orbit PITCH %s -> %s (rate=%s)', beforePitch.toFixed(3), cam.pitch.toFixed(3), orbitRate.toFixed(3));
-        } else {
-            this._log('[OrbitKB] Orbit PITCH blocked by minY (before=%s proposed=%s)', beforePitch.toFixed(3), proposedPitch.toFixed(3));
+    // 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
+    var speedR = this.strafeSpeed  * dist; // strafe speed
+
+    // 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;
+        var proposedCamY = currentCamY + dy;
+        if (proposedCamY < minY) {
+            dy = Math.max(dy, minY - currentCamY);
+        }
+        if (dy !== 0) {
+            this.orbitCamera._pivotPoint.y += dy;
         }
     }
 
-    // Yaw (←/→)
-    if (left || right) {
-        var beforeYaw = cam.yaw;
-        if (left)  cam.yaw = cam.yaw + orbitRate;  // tourner à gauche
-        if (right) cam.yaw = cam.yaw - orbitRate;  // tourner à droite
-        this._log('[OrbitKB] Orbit YAW %s -> %s (rate=%s)', beforeYaw.toFixed(3), cam.yaw.toFixed(3), orbitRate.toFixed(3));
+    // 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) {
+        this.orbitCamera._pivotPoint.add(right.mulScalar(dx));
     }
-};
+};