Update deplacement_dans_env/ctrl_camera_pr_env.js

deplacement_dans_env/ctrl_camera_pr_env.js

@@ -1,20 +1,36 @@
-// orbit-camera.js
+// ctrl_camera_pr_env.js
+// ============================================================================
+// ORBIT CAMERA + INPUTS (PlayCanvas) — version bbox + sans maxZoom
+// - Contraintes : minY (altitude min caméra), Bounding Box (X/Y/Z min/max)
+// - Zoom : seul un minimum est imposé (plus de maxZoom)
+// ============================================================================
 
 var OrbitCamera = pc.createScript('orbitCamera');
 
-// 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' });
+// ======================== Attributs Caméra ===========================
+OrbitCamera.attributes.add('distanceMin',   { type: 'number', default: 1,   title: 'Distance Min' });
 
-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' });
+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 (camera world 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' });
+
+// ---- Bounding Box (active si Xmin < Xmax, etc.) ----
+OrbitCamera.attributes.add('Xmin', { type: 'number', default: -Infinity, title: 'BBox Xmin' });
+OrbitCamera.attributes.add('Xmax', { type: 'number', default:  Infinity, title: 'BBox Xmax' });
+OrbitCamera.attributes.add('Ymin', { type: 'number', default: -Infinity, title: 'BBox Ymin' });
+OrbitCamera.attributes.add('Ymax', { type: 'number', default:  Infinity, title: 'BBox Ymax' });
+OrbitCamera.attributes.add('Zmin', { type: 'number', default: -Infinity, title: 'BBox Zmin' });
+OrbitCamera.attributes.add('Zmax', { type: 'number', default:  Infinity, title: 'BBox Zmax' });
+
+// ======================== Propriétés ===========================
 Object.defineProperty(OrbitCamera.prototype, 'distance', {
     get: function () { return this._targetDistance; },
     set: function (value) { this._targetDistance = this._clampDistance(value); }
@@ -40,28 +56,37 @@ Object.defineProperty(OrbitCamera.prototype, 'pivotPoint', {
     set: function (value) { this._pivotPoint.copy(value); }
 });
 
+// ======================== API Publique ===========================
 OrbitCamera.prototype.focus = function (focusEntity) {
     this._buildAabb(focusEntity);
     var halfExtents = this._modelsAabb.halfExtents;
     var radius = Math.max(halfExtents.x, Math.max(halfExtents.y, halfExtents.z));
+
+    // calcule distance initiale (pas de maxZoom à respecter)
     this.distance = (radius * 1.5) / Math.sin(0.5 * this.entity.camera.fov * pc.math.DEG_TO_RAD);
+
     this._removeInertia();
     this._pivotPoint.copy(this._modelsAabb.center);
+    this._clampPivotToBBox(this._pivotPoint);
 };
 
 OrbitCamera.distanceBetween = new pc.Vec3();
 
 OrbitCamera.prototype.resetAndLookAtPoint = function (resetPoint, lookAtPoint) {
     this.pivotPoint.copy(lookAtPoint);
+    this._clampPivotToBBox(this._pivotPoint);
+
     this.entity.setPosition(resetPoint);
     this.entity.lookAt(lookAtPoint);
+
     var distance = OrbitCamera.distanceBetween;
     distance.sub2(lookAtPoint, resetPoint);
     this.distance = distance.length();
-    this.pivotPoint.copy(lookAtPoint);
+
     var cameraQuat = this.entity.getRotation();
-    this.yaw = this._calcYaw(cameraQuat);
+    this.yaw   = this._calcYaw(cameraQuat);
     this.pitch = this._calcPitch(cameraQuat, this.yaw);
+
     this._removeInertia();
     this._updatePosition();
 };
@@ -82,12 +107,16 @@ OrbitCamera.prototype.resetToPosition = function (position, lookAtPoint) {
     this.entity.setPosition(position);
     this.entity.lookAt(lookAtPoint);
     this._pivotPoint.copy(lookAtPoint);
+    this._clampPivotToBBox(this._pivotPoint);
+
     var distanceVec = new pc.Vec3();
     distanceVec.sub2(position, lookAtPoint);
-    this._targetDistance = this._distance = distanceVec.length();
+    this._targetDistance = this._distance = Math.max(this.distanceMin, distanceVec.length());
+
     var cameraQuat = this.entity.getRotation();
-    this._targetYaw = this._yaw = this._calcYaw(cameraQuat);
+    this._targetYaw = this._yaw   = this._calcYaw(cameraQuat);
     this._targetPitch = this._pitch = this._calcPitch(cameraQuat, this._yaw);
+
     this._removeInertia();
     this._updatePosition();
 };
@@ -103,10 +132,7 @@ OrbitCamera.prototype.worldCameraYForPivot = function(pivot) {
     return camPos.y;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//                          Private Methods                                   //
-////////////////////////////////////////////////////////////////////////////////
-
+// ======================== Privé ===========================
 OrbitCamera.prototype.initialize = function () {
     var self = this;
     var onWindowResize = function () { self._checkAspectRatio(); };
@@ -119,6 +145,7 @@ OrbitCamera.prototype.initialize = function () {
     this.entity.lookAt(this._modelsAabb.center);
     this._pivotPoint = new pc.Vec3();
     this._pivotPoint.copy(this._modelsAabb.center);
+    this._clampPivotToBBox(this._pivotPoint);
 
     var cameraQuat = this.entity.getRotation();
     this._yaw = this._calcYaw(cameraQuat);
@@ -138,8 +165,8 @@ OrbitCamera.prototype.initialize = function () {
     }
     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); });
+    // Listeners d’attributs (note: pas de distanceMax)
+    this.on('attr:distanceMin',   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); });
 
@@ -152,14 +179,18 @@ OrbitCamera.prototype.initialize = function () {
         if (value) { this.focus(this.focusEntity || this.app.root); }
     });
 
+    // Clamp bbox dynamique
+    var bboxAttrs = ['Xmin','Xmax','Ymin','Ymax','Zmin','Zmax'];
+    bboxAttrs.forEach((a)=> this.on('attr:'+a, function(){ this._clampPivotToBBox(this._pivotPoint); this._updatePosition(); }));
+
     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();
 };
 
@@ -172,10 +203,16 @@ OrbitCamera.prototype._updatePosition = function () {
     position.mulScalar(-this._distance);
     position.add(this.pivotPoint);
 
-    // Clamp camera's Y position so it never goes below minY
+    // 1) altitude mini
     position.y = Math.max(position.y, this.minY);
 
+    // 2) clamp BBox caméra
+    this._applyBoundingBox(position);
+
     this.entity.setPosition(position);
+
+    // 3) assure que le pivot reste dans la bbox
+    this._clampPivotToBBox(this._pivotPoint);
 };
 
 OrbitCamera.prototype._removeInertia = function () {
@@ -186,7 +223,7 @@ OrbitCamera.prototype._removeInertia = function () {
 
 OrbitCamera.prototype._checkAspectRatio = function () {
     var height = this.app.graphicsDevice.height;
-    var width = this.app.graphicsDevice.width;
+    var width  = this.app.graphicsDevice.width;
     this.entity.camera.horizontalFov = (height > width);
 };
 
@@ -219,11 +256,8 @@ OrbitCamera.prototype._buildAabb = function (entity) {
     }
 
     for (i = 0; i < meshInstances.length; i++) {
-        if (i === 0) {
-            this._modelsAabb.copy(meshInstances[i].aabb);
-        } else {
-            this._modelsAabb.add(meshInstances[i].aabb);
-        }
+        if (i === 0) this._modelsAabb.copy(meshInstances[i].aabb);
+        else this._modelsAabb.add(meshInstances[i].aabb);
     }
 };
 
@@ -234,9 +268,7 @@ OrbitCamera.prototype._calcYaw = function (quat) {
 };
 
 OrbitCamera.prototype._clampDistance = function (distance) {
-    if (this.distanceMax > 0) {
-        return pc.math.clamp(distance, this.distanceMin, this.distanceMax);
-    }
+    // Plus de distanceMax : uniquement un minimum
     return Math.max(distance, this.distanceMin);
 };
 
@@ -261,9 +293,28 @@ OrbitCamera.prototype._calcPitch = function (quat, yaw) {
     return Math.atan2(-transformedForward.y, -transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
-// ===================== Orbit Camera Input Mouse Script ========================
+// -------- Helpers Bounding Box --------
+OrbitCamera.prototype._bboxEnabled = function () {
+    return (this.Xmin < this.Xmax) && (this.Ymin < this.Ymax) && (this.Zmin < this.Zmax);
+};
+
+OrbitCamera.prototype._applyBoundingBox = function (v3 /* camera position */) {
+    if (!this._bboxEnabled()) return;
+    v3.x = pc.math.clamp(v3.x, this.Xmin, this.Xmax);
+    v3.y = pc.math.clamp(v3.y, this.Ymin, this.Ymax);
+    v3.z = pc.math.clamp(v3.z, this.Zmin, this.Zmax);
+};
+
+OrbitCamera.prototype._clampPivotToBBox = function (v3 /* pivot */) {
+    if (!this._bboxEnabled()) return;
+    v3.x = pc.math.clamp(v3.x, this.Xmin, this.Xmax);
+    v3.y = pc.math.clamp(v3.y, this.Ymin, this.Ymax);
+    v3.z = pc.math.clamp(v3.z, this.Zmin, this.Zmax);
+};
+
+// ===================== Orbit Camera Input Mouse ========================
 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 () {
@@ -273,16 +324,16 @@ OrbitCameraInputMouse.prototype.initialize = function () {
         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_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_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);
         });
@@ -291,58 +342,60 @@ OrbitCameraInputMouse.prototype.initialize = function () {
     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 toWorldPoint   = OrbitCameraInputMouse.toWorldPoint;
+    var worldDiff      = OrbitCameraInputMouse.worldDiff;
 
-    var camera = this.entity.camera;
+    var camera   = this.entity.camera;
     var distance = this.orbitCamera.distance;
 
-    camera.screenToWorld(screenPoint.x, screenPoint.y, distance, fromWorldPoint);
+    camera.screenToWorld(screenPoint.x, this.lastPoint.y, distance, fromWorldPoint);
     camera.screenToWorld(this.lastPoint.x, this.lastPoint.y, distance, toWorldPoint);
 
     worldDiff.sub2(toWorldPoint, fromWorldPoint);
 
-    // Enforce minY like vertical/horizontal pan with arrows
+    // Enforce minY + bbox via pivot
     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);
+        this.orbitCamera._clampPivotToBBox(proposedPivot);
+        this.orbitCamera.pivotPoint.copy(proposedPivot);
     } else {
-        // Try horizontal-only
+        // Horizontal-only si nécessaire
         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);
+            this.orbitCamera._clampPivotToBBox(proposedPivot);
+            this.orbitCamera.pivotPoint.copy(proposedPivot);
         }
     }
 };
 
 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;
     }
 };
 
@@ -351,11 +404,11 @@ OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
         var sens = this.orbitSensitivity;
 
         var deltaPitch = event.dy * sens; // mouse up (dy < 0) raises pitch
-        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();
@@ -378,7 +431,7 @@ OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
             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));
@@ -398,31 +451,31 @@ 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 ========================
 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);
         });
     }
 };
@@ -451,15 +504,15 @@ 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 toWorldPoint   = OrbitCameraInputTouch.toWorldPoint;
+    var worldDiff      = OrbitCameraInputTouch.worldDiff;
 
-    var camera = this.entity.camera;
+    var camera   = this.entity.camera;
     var distance = this.orbitCamera.distance;
 
     camera.screenToWorld(midPoint.x, midPoint.y, distance, fromWorldPoint);
@@ -472,13 +525,15 @@ OrbitCameraInputTouch.prototype.pan = function (midPoint) {
     var resultingY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
 
     if (resultingY >= minY - 1e-4) {
-        this.orbitCamera.pivotPoint.add(worldDiff);
+        this.orbitCamera._clampPivotToBBox(proposedPivot);
+        this.orbitCamera.pivotPoint.copy(proposedPivot);
     } 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);
+            this.orbitCamera._clampPivotToBBox(proposedPivot);
+            this.orbitCamera.pivotPoint.copy(proposedPivot);
         }
     }
 };
@@ -494,11 +549,11 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
         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();
@@ -521,14 +576,14 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
             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;
-        this.lastPinchDistance = currentPinchDistance;
+        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);
 
@@ -539,13 +594,12 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
 };
 
 // =================== Orbit Camera Input Keyboard ========================
-// Mappages demandés :
-// - Flèches : déplacement avant/arrière & droite/gauche dans le repère de la caméra (3D)
-// - Ctrl+flèches : orbiter autour du pivot
-// - Maj+flèches : rotation libre sur place (pas de limites yaw/pitch)
+// Flèches : déplacement avant/arrière & droite/gauche (repère caméra, 3D)
+// Ctrl+flèches : orbiter autour du pivot
+// Maj+flèches : rotation libre sur place (pas de limites yaw/pitch)
 var OrbitCameraInputKeyboard = pc.createScript('orbitCameraInputKeyboard');
 
-// Vitesses de déplacement (relatives à la distance pour un ressenti constant)
+// Vitesses (relatives à la distance)
 OrbitCameraInputKeyboard.attributes.add('forwardSpeed', { type: 'number', default: 1.8, title: 'Forward Speed (rel. to distance)' });
 OrbitCameraInputKeyboard.attributes.add('strafeSpeed',  { type: 'number', default: 1.8, title: 'Strafe Speed (rel. to distance)' });
 
@@ -571,17 +625,16 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
     var shift = this.keyboard.isPressed(pc.KEY_SHIFT);
     var ctrl  = this.keyboard.isPressed(pc.KEY_CONTROL);
 
-    // -------- Ctrl + flèches : ORBITER autour du pivot (clamp actif) --------
+    // -------- Ctrl + flèches : ORBIT autour du pivot --------
     if (ctrl && (up || dn || lt || rt)) {
-        var yawDir   = (rt ? 1 : 0) - (lt ? 1 : 0);   // droite = +1, gauche = -1
-        var pitchDir = (up ? 1 : 0) - (dn ? 1 : 0);   // haut = +1, bas = -1
+        var yawDir   = (rt ? 1 : 0) - (lt ? 1 : 0);
+        var pitchDir = (up ? 1 : 0) - (dn ? 1 : 0);
 
         if (yawDir !== 0) {
             this.orbitCamera.yaw = this.orbitCamera.yaw + yawDir * this.orbitYawSpeedDeg * dt;
         }
 
         if (pitchDir !== 0) {
-            // on laisse le clamp faire son travail via le setter
             var currPitch = this.orbitCamera.pitch;
             var currYaw   = this.orbitCamera.yaw;
             var currDist  = this.orbitCamera.distance;
@@ -592,7 +645,7 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
             var preY = currPivot.y + (-forward.y) * currDist;
 
             var testPitch = currPitch + pitchDir * this.orbitPitchSpeedDeg * dt;
-            var testQuat = new pc.Quat().setFromEulerAngles(testPitch, currYaw, 0);
+            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;
 
@@ -606,16 +659,15 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
         return;
     }
 
-    // -------- Maj + flèches : ROTATION SUR PLACE SANS LIMITE --------
+    // -------- Maj + flèches : ROTATION SUR PLACE --------
     if (shift && (up || dn || lt || rt)) {
         var yawDirR   = (rt ? 1 : 0) - (lt ? 1 : 0);
         var pitchDirR = (up ? 1 : 0) - (dn ? 1 : 0);
 
-        // Position actuelle à préserver
         var camPos = this.entity.getPosition().clone();
-        var dist = this.orbitCamera._distance;
+        var dist   = this.orbitCamera._distance;
 
-        // *** Bypass des clamps: on écrit directement dans _yaw/_pitch et leurs cibles ***
+        // bypass clamps pour rotation libre
         this.orbitCamera._yaw   += yawDirR   * this.rotateYawSpeedDeg   * dt;
         this.orbitCamera._pitch += pitchDirR * this.rotatePitchSpeedDeg * dt;
         this.orbitCamera._targetYaw   = this.orbitCamera._yaw;
@@ -625,9 +677,9 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
         var q = new pc.Quat().setFromEulerAngles(this.orbitCamera._pitch, this.orbitCamera._yaw, 0);
         var forward = new pc.Vec3(); q.transformVector(pc.Vec3.FORWARD, forward);
         var newPivot = camPos.clone().add(forward.clone().mulScalar(dist));
+        this.orbitCamera._clampPivotToBBox(newPivot);
         this.orbitCamera._pivotPoint.copy(newPivot);
 
-        // Pas d’inertie pour être exact tout de suite
         this.orbitCamera._removeInertia();
         this.orbitCamera._updatePosition();
         this.entity.setPosition(camPos);
@@ -635,15 +687,14 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
         return;
     }
 
-    // -------- Flèches seules : DÉPLACEMENT DANS LE REPÈRE DE LA CAMÉRA --------
+    // -------- Flèches seules : DÉPLACEMENT REPÈRE CAMÉRA --------
     var moveForward = (up ? 1 : 0) - (dn ? 1 : 0);
     var moveRight   = (rt ? 1 : 0) - (lt ? 1 : 0);
     if (moveForward === 0 && moveRight === 0) return;
 
-    // Vecteurs avant/droite "complets" (incluent Y) → mouvement 3D relatif caméra
     var fwd = this.entity.forward.clone();
     var right = this.entity.right.clone();
-    if (fwd.lengthSq() > 1e-8) fwd.normalize();
+    if (fwd.lengthSq()   > 1e-8) fwd.normalize();
     if (right.lengthSq() > 1e-8) right.normalize();
 
     var camDist = Math.max(0.1, this.orbitCamera._distance);
@@ -652,15 +703,17 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     var delta = new pc.Vec3();
     if (moveForward !== 0) delta.add(fwd.mulScalar(moveForward * speedF * dt));
-    if (moveRight !== 0)   delta.add(right.mulScalar(moveRight * speedR * dt));
+    if (moveRight   !== 0) delta.add(right.mulScalar(moveRight   * speedR * dt));
 
     if (delta.lengthSq() > 0) {
-        // Respecte minY : camY_new = camY_cur + delta.y (car yaw/pitch/distance inchangés)
+        // Respect minY (camY_new = camY_cur + delta.y)
         var currCamY = this.orbitCamera.worldCameraYForPivot(this.orbitCamera._pivotPoint);
         var minY = this.orbitCamera.minY;
         if (currCamY + delta.y < minY) {
-            delta.y = minY - currCamY; // on limite juste ce qu'il faut
+            delta.y = minY - currCamY;
         }
-        this.orbitCamera._pivotPoint.add(delta);
+        var newPivot = this.orbitCamera._pivotPoint.clone().add(delta);
+        this.orbitCamera._clampPivotToBBox(newPivot);
+        this.orbitCamera._pivotPoint.copy(newPivot);
     }
 };