Update deplacement_dans_env/ctrl_camera_pr_env.js

deplacement_dans_env/ctrl_camera_pr_env.js

@@ -266,6 +266,20 @@ 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' });
 
+// --- helper: recenter pivot on current camera view target (camPos + forward * distance)
+OrbitCameraInputMouse.prototype._recenterPivotToCamera = function () {
+    var oc = this.orbitCamera;
+    if (!oc) return;
+    var camPos = this.entity.getPosition().clone();
+    var q = new pc.Quat().setFromEulerAngles(oc._pitch, oc._yaw, 0);
+    var f = new pc.Vec3(); q.transformVector(pc.Vec3.FORWARD, f);
+    var newPivot = camPos.clone().add(f.mulScalar(oc._distance));
+    oc._pivotPoint.copy(newPivot);
+    oc._removeInertia();
+    oc._updatePosition();
+    this.entity.setPosition(camPos);
+};
+
 OrbitCameraInputMouse.prototype.initialize = function () {
     this.orbitCamera = this.entity.script.orbitCamera;
 
@@ -332,9 +346,15 @@ OrbitCameraInputMouse.prototype.pan = function (screenPoint) {
 
 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:
+            // <<< recenter orbit pivot when starting mouse orbit
+            this._recenterPivotToCamera();
+            this.lookButtonDown = true;
+            break;
     }
 };
 
@@ -406,6 +426,20 @@ 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' });
 
+// --- helper: recenter pivot on touch orbit start
+OrbitCameraInputTouch.prototype._recenterPivotToCamera = function () {
+    var oc = this.orbitCamera;
+    if (!oc) return;
+    var camPos = this.entity.getPosition().clone();
+    var q = new pc.Quat().setFromEulerAngles(oc._pitch, oc._yaw, 0);
+    var f = new pc.Vec3(); q.transformVector(pc.Vec3.FORWARD, f);
+    var newPivot = camPos.clone().add(f.mulScalar(oc._distance));
+    oc._pivotPoint.copy(newPivot);
+    oc._removeInertia();
+    oc._updatePosition();
+    this.entity.setPosition(camPos);
+};
+
 OrbitCameraInputTouch.prototype.initialize = function () {
     this.orbitCamera = this.entity.script.orbitCamera;
     this.lastTouchPoint = new pc.Vec2();
@@ -443,6 +477,8 @@ OrbitCameraInputTouch.prototype.calcMidPoint = function (pointA, pointB, result)
 OrbitCameraInputTouch.prototype.onTouchStartEndCancel = function (event) {
     var touches = event.touches;
     if (touches.length === 1) {
+        // <<< recenter orbit pivot when starting a one-finger orbit
+        this._recenterPivotToCamera();
         this.lastTouchPoint.set(touches[0].x, touches[0].y);
     } else if (touches.length === 2) {
         this.lastPinchDistance = this.getPinchDistance(touches[0], touches[1]);
@@ -539,9 +575,9 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
 };
 
 // =================== Orbit Camera Input Keyboard ========================
-// Mappages demandés :
+// Mappages :
 // - 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
+// - Ctrl+flèches : orbiter autour du pivot (clamps actifs)
 // - Maj+flèches : rotation libre sur place (pas de limites yaw/pitch)
 var OrbitCameraInputKeyboard = pc.createScript('orbitCameraInputKeyboard');
 
@@ -573,15 +609,14 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     // -------- Ctrl + flèches : ORBITER autour du pivot (clamp actif) --------
     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;
@@ -655,11 +690,11 @@ OrbitCameraInputKeyboard.prototype.update = function (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)
+        // Respecte 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; // ajuste juste ce qu'il faut
         }
         this.orbitCamera._pivotPoint.add(delta);
     }