Update orbit-camera.js

orbit-camera.js

@@ -1,33 +1,47 @@
 // orbit-camera.js
 // ==============================
+// Logs de preuve que le fichier est bien chargé :
+console.log('[OrbitFILE] loaded orbit-camera.js');
 
 /*
- * PlayCanvas Orbit Camera for GSplat/SOGS/GLB viewers.
- * - 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
+ * 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');
 
-OrbitCamera.attributes.add('distanceMax',      { type: 'number', default: 20,  title: 'Distance Max' });
-OrbitCamera.attributes.add('distanceMin',      { type: 'number', default: 1,   title: 'Distance Min' });
-OrbitCamera.attributes.add('pitchAngleMax',    { type: 'number', default: 90,  title: 'Pitch Angle Max (degrees)' });
-OrbitCamera.attributes.add('pitchAngleMin',    { type: 'number', default: 0,   title: 'Pitch Angle Min (degrees)' });
-OrbitCamera.attributes.add('yawAngleMax',      { type: 'number', default: 360, title: 'Yaw Angle Max (degrees)' });
-OrbitCamera.attributes.add('yawAngleMin',      { type: 'number', default: -360,title: 'Yaw Angle Min (degrees)' });
-OrbitCamera.attributes.add('minY',             { type: 'number', default: 0,   title: 'Minimum Y' });
-OrbitCamera.attributes.add('inertiaFactor',    { type: 'number', default: 0.2, title: 'Inertia Factor' });
-OrbitCamera.attributes.add('focusEntity',      { type: 'entity',               title: 'Focus Entity' });
-OrbitCamera.attributes.add('frameOnStart',     { type: 'boolean', default: true, title: 'Frame on Start' });
+// Camera attributes
+OrbitCamera.attributes.add('distanceMax', { type: 'number', default: 20, title: 'Distance Max' });
+OrbitCamera.attributes.add('distanceMin', { type: 'number', default: 1, title: 'Distance Min' });
+OrbitCamera.attributes.add('pitchAngleMax', { type: 'number', default: 90, title: 'Pitch Angle Max (degrees)' });
+OrbitCamera.attributes.add('pitchAngleMin', { type: 'number', default: 0, title: 'Pitch Angle Min (degrees)' });
+OrbitCamera.attributes.add('yawAngleMax', { type: 'number', default: 360, title: 'Yaw Angle Max (degrees)' });
+OrbitCamera.attributes.add('yawAngleMin', { type: 'number', default: -360, title: 'Yaw Angle Min (degrees)' });
+OrbitCamera.attributes.add('minY', { type: 'number', default: 0, title: 'Minimum Y', description: 'Minimum Y value for camera world position' });
+
+OrbitCamera.attributes.add('inertiaFactor', { type: 'number', default: 0.2, title: 'Inertia Factor' });
+OrbitCamera.attributes.add('focusEntity', { type: 'entity', title: 'Focus Entity' });
+OrbitCamera.attributes.add('frameOnStart', { type: 'boolean', default: true, title: 'Frame on Start' });
 
 Object.defineProperty(OrbitCamera.prototype, 'distance', {
     get: function () { return this._targetDistance; },
     set: function (value) { this._targetDistance = this._clampDistance(value); }
 });
 
+Object.defineProperty(OrbitCamera.prototype, 'orthoHeight', {
+    get: function () { return this.entity.camera.orthoHeight; },
+    set: function (value) { this.entity.camera.orthoHeight = Math.max(0, value); }
+});
+
 Object.defineProperty(OrbitCamera.prototype, 'pitch', {
     get: function () { return this._targetPitch; },
     set: function (value) { this._targetPitch = this._clampPitchAngle(value); }
@@ -63,7 +77,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);         // degrees
+    this.yaw = this._calcYaw(cameraQuat);
     this.pitch = this._calcPitch(cameraQuat, this.yaw);
     this._removeInertia();
     this._updatePosition();
@@ -89,12 +103,13 @@ 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);       // degrees
+    this._targetYaw = this._yaw = this._calcYaw(cameraQuat);
     this._targetPitch = this._pitch = this._calcPitch(cameraQuat, this._yaw);
     this._removeInertia();
     this._updatePosition();
 };
 
+// ==== Clamp helper for panning/orbiting pour ne jamais passer sous minY ====
 OrbitCamera.prototype.worldCameraYForPivot = function(pivot) {
     var quat = new pc.Quat();
     quat.setFromEulerAngles(this._pitch, this._yaw, 0);
@@ -105,29 +120,27 @@ OrbitCamera.prototype.worldCameraYForPivot = function(pivot) {
     return camPos.y;
 };
 
+////////////////////////////////////////////////////////////////////////////////
+//                          Private Methods                                   //
+////////////////////////////////////////////////////////////////////////////////
+
 OrbitCamera.prototype.initialize = function () {
     var self = this;
     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);                                // degrees
+    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 {
@@ -136,7 +149,6 @@ 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); });
@@ -148,32 +160,30 @@ OrbitCamera.prototype.initialize = function () {
     this.on('attr:frameOnStart', function (value) {
         if (value) { this.focus(this.focusEntity || this.app.root); }
     });
+    this.on('destroy', function () { window.removeEventListener('resize', onWindowResize, false); });
 
-    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));
 };
 
 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
+    // Clamp camera's Y position so it never goes below minY
     position.y = Math.max(position.y, this.minY);
-
     this.entity.setPosition(position);
 };
 
@@ -191,7 +201,6 @@ 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];
@@ -199,7 +208,6 @@ 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];
@@ -207,16 +215,14 @@ 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];
         var instance = gsplat.instance;
-        if (instance && instance.meshInstance) {
+        if (instance?.meshInstance) {
             meshInstances.push(instance.meshInstance);
         }
     }
-
     for (i = 0; i < meshInstances.length; i++) {
         if (i === 0) {
             this._modelsAabb.copy(meshInstances[i].aabb);
@@ -227,10 +233,9 @@ OrbitCamera.prototype._buildAabb = function (entity) {
 };
 
 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;
+    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
 };
 
 OrbitCamera.prototype._clampDistance = function (distance) {
@@ -245,6 +250,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);
 };
 
@@ -256,61 +262,56 @@ OrbitCamera.prototype._calcPitch = function (quat, yaw) {
     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;
+    var transformedForward = new pc.Vec3();
+    quatWithoutYaw.transformVector(pc.Vec3.FORWARD, transformedForward);
+    return Math.atan2(-transformedForward.y, -transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
-// =================== Orbit Camera Input Mouse Script ========================
+// ===================== Orbit Camera Input Mouse Script (inchangé) =====================
 
 var OrbitCameraInputMouse = pc.createScript('orbitCameraInputMouse');
-OrbitCameraInputMouse.attributes.add('orbitSensitivity',    { type: 'number', default: 0.3, title: 'Orbit Sensitivity' });
+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(); };
-
+        var onMouseOut = function (e) { self.onMouseOut(e); };
         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_MOUSEUP, this.onMouseUp, this);
         this.app.mouse.on(pc.EVENT_MOUSEMOVE, this.onMouseMove, this);
-        this.app.mouse.on(pc.EVENT_MOUSEWHEEL,this.onMouseWheel,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_MOUSEUP, this.onMouseUp, this);
             this.app.mouse.off(pc.EVENT_MOUSEMOVE, this.onMouseMove, this);
-            this.app.mouse.off(pc.EVENT_MOUSEWHEEL,this.onMouseWheel,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.panButtonDown = false;
     this.lastPoint = new pc.Vec2();
 };
+
 OrbitCameraInputMouse.fromWorldPoint = new pc.Vec3();
-OrbitCameraInputMouse.toWorldPoint   = new pc.Vec3();
-OrbitCameraInputMouse.worldDiff      = 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 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);
+    camera.screenToWorld(this.lastPoint.x, this.lastPoint.y, distance, toWorldPoint);
     worldDiff.sub2(toWorldPoint, fromWorldPoint);
 
+    // Clamp so camera never goes below minY
     var proposedPivot = this.orbitCamera.pivotPoint.clone().add(worldDiff);
     var minY = this.orbitCamera.minY;
     var resultingY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
@@ -318,62 +319,66 @@ OrbitCameraInputMouse.prototype.pan = function (screenPoint) {
     if (resultingY >= minY - 1e-4) {
         this.orbitCamera.pivotPoint.add(worldDiff);
     } else {
+        // Only allow horizontal pan if it would help
         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
     }
 };
 
 OrbitCameraInputMouse.prototype.onMouseDown = function (event) {
     switch (event.button) {
-        case pc.MOUSEBUTTON_LEFT:   this.panButtonDown  = true; break;
+        case pc.MOUSEBUTTON_LEFT: this.panButtonDown = true; break;
         case pc.MOUSEBUTTON_MIDDLE:
-        case pc.MOUSEBUTTON_RIGHT:  this.lookButtonDown = true; break;
+        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_LEFT: this.panButtonDown = false; break;
         case pc.MOUSEBUTTON_MIDDLE:
-        case pc.MOUSEBUTTON_RIGHT:  this.lookButtonDown = false; break;
+        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 deltaYaw = event.dx * sens;
 
         var currPitch = this.orbitCamera.pitch;
-        var currYaw   = this.orbitCamera.yaw;
-        var currDist  = this.orbitCamera.distance;
+        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 camQuat = new pc.Quat();
+        camQuat.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 testQuat = new pc.Quat();
+        testQuat.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;
+            this.orbitCamera.yaw = currYaw - deltaYaw;
         } else {
             this.orbitCamera.pitch = proposedPitch;
-            this.orbitCamera.yaw   = currYaw - deltaYaw;
+            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);
 };
 
@@ -387,32 +392,28 @@ OrbitCameraInputMouse.prototype.onMouseWheel = function (event) {
 };
 OrbitCameraInputMouse.prototype.onMouseOut = function () {
     this.lookButtonDown = false;
-    this.panButtonDown  = false;
+    this.panButtonDown = false;
 };
 
-// =================== Orbit Camera Input Touch Script ========================
-
+// =================== Orbit Camera Input Touch Script (inchangé) ========================
 var OrbitCameraInputTouch = pc.createScript('orbitCameraInputTouch');
-OrbitCameraInputTouch.attributes.add('orbitSensitivity',    { type: 'number', default: 0.6, title: 'Orbit Sensitivity' });
+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.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_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.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_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);
+            this.app.touch.off(pc.EVENT_TOUCHMOVE, this.onTouchMove, this);
         });
     }
 };
@@ -437,17 +438,14 @@ OrbitCameraInputTouch.prototype.onTouchStartEndCancel = function (event) {
     }
 };
 OrbitCameraInputTouch.fromWorldPoint = new pc.Vec3();
-OrbitCameraInputTouch.toWorldPoint   = new pc.Vec3();
-OrbitCameraInputTouch.worldDiff      = 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 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);
@@ -473,124 +471,151 @@ 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 deltaYaw = (touch.x - this.lastTouchPoint.x) * sens;
 
         var currPitch = this.orbitCamera.pitch;
-        var currYaw   = this.orbitCamera.yaw;
-        var currDist  = this.orbitCamera.distance;
+        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 camQuat = new pc.Quat();
+        camQuat.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 testQuat = new pc.Quat();
+        testQuat.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;
+            this.orbitCamera.yaw = currYaw - deltaYaw;
         } else {
             this.orbitCamera.pitch = proposedPitch;
-            this.orbitCamera.yaw   = currYaw - deltaYaw;
+            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;
+        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 ========================
-
+// =================== Orbit Camera Input Keyboard Script (nouveau, simple) ========================
 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
+ * Contrôles :
+ * - ↑ / ↓ : orbiter nord/sud (pitch)
+ * - ← / → : orbiter gauche/droite (yaw)
+ * - SHIFT + ↑ / ↓ : zoom / dézoom
+ * - SHIFT + ← / → : déplacement latéral (pan)
  *
- * Robust capture: uses both pc.Keyboard and window key events
- * (works even if the canvas isn’t focused). Optionally focus canvas on pointer down.
+ * 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: false, title: 'Enable Debug Logs' });
+OrbitCameraInputKeyboard.attributes.add('debugLogs',             { type: 'boolean', default: true, title: 'Enable Debug Logs' });
 
 OrbitCameraInputKeyboard.prototype._log = function () {
     if (!this.debugLogs) return;
-    console.log.apply(console, arguments); // eslint-disable-line no-console
+    // eslint-disable-next-line no-console
+    console.log.apply(console, arguments);
 };
 
 OrbitCameraInputKeyboard.prototype.initialize = function () {
+    console.log('[OrbitKB] initialize()'); // log inconditionnel
     this.orbitCamera = this.entity.script.orbitCamera;
 
-    // Ensure PlayCanvas keyboard exists
+    // 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');
     }
 
-    // Window-level key state (works regardless of focus target)
+    // 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);
-    this._onWinKeyDown = (e) => {
-        this._keyState[e.key] = true;
-        // prevent page scroll on arrows
+    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();
-        this._log('[OrbitKB] down', e.key);
+        if (self.debugLogs) console.log('[OrbitKB] window.keydown', e.key);
     };
-    this._onWinKeyUp = (e) => {
-        this._keyState[e.key] = false;
-        this._log('[OrbitKB] up', 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);
-
-    // 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);
-    }
+    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('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) {
-    // 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;
 };
 
+// Test minY identique à la souris pour le pitch
 OrbitCameraInputKeyboard.prototype._wouldGoBelowMinYWithPitch = function (proposedPitch) {
     var cam = this.orbitCamera;
     var currPitch = cam.pitch;
@@ -598,23 +623,32 @@ OrbitCameraInputKeyboard.prototype._wouldGoBelowMinYWithPitch = function (propos
     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 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().setFromEulerAngles(proposedPitch, currYaw, 0);
-    var testForward = new pc.Vec3(); testQuat.transformVector(pc.Vec3.FORWARD, testForward);
+    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 };
 };
 
+// Pan latéral (SHIFT+←/→) en respectant minY
 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 quat = new pc.Quat();
+    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;
@@ -623,11 +657,21 @@ OrbitCameraInputKeyboard.prototype._panSideways = function (delta) {
 
     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);
+        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));
+        }
     }
 };
 
@@ -636,48 +680,71 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     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 + Up/Down)
+        // --- Zoom (Shift + ↑/↓) ---
         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);
+                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));
             } else {
                 var dh = k * dt * (this.entity.camera.orthoHeight * 0.8);
-                this.entity.camera.orthoHeight += (down ? +dh : -dh);
+                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));
             }
         }
-        // Pan lateral (Shift + Left/Right)
+
+        // --- Pan latéral (Shift + ←/→) ---
         if (left || right) {
-            var speed = this.panUnitsPerSecond * cam.distance; // world units / s
+            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);
         }
-        return;
+
+        return; // pas d’orbite quand SHIFT est enfoncé
     }
 
-    // Orbit (no Shift)
+    // --- Orbite sans SHIFT ---
     var orbitRate = this.orbitDegreesPerSecond * dt;
 
+    // Pitch (↑/↓) — même garde minY que la souris
     if (up || down) {
-        var dir = up ? -1 : +1; // Up: decrease pitch
-        var currPitch = cam.pitch;
-        var proposedPitch = currPitch + dir * orbitRate;
+        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));
         }
     }
 
-    if (left)  cam.yaw = cam.yaw + orbitRate;
-    if (right) cam.yaw = cam.yaw - orbitRate;
+    // 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));
+    }
 };