Update deplacement_dans_env/ctrl_camera_pr_env.js

deplacement_dans_env/ctrl_camera_pr_env.js

@@ -1,11 +1,10 @@
 // ctrl_camera_pr_env.js
 // ============================================================================
-// ORBIT CAMERA + INPUTS (PlayCanvas) — version bbox "rotation-libre"
+// ORBIT CAMERA + INPUTS (PlayCanvas) — bbox + rotation libre & sens corrigés
 // - Zoom : uniquement un minimum (pas de maxZoom)
-// - Bounding Box : on contraint UNIQUEMENT la position caméra
-//   -> si la position sort, on la clampe puis on décale le pivot
-//      pour conserver l'orientation ET la distance (orbite fluide).
-// - minY : altitude mini de la caméra (appliquée comme une "box" horizontale)
+// - Bounding Box : clamp SEULEMENT la position caméra, jamais l'orientation
+// - Yaw : pas de clamp -> rotations illimitées (±2000° etc.)
+// - Pitch : clamp via min/max (configurable), minY préservé
 // ============================================================================
 
 var OrbitCamera = pc.createScript('orbitCamera');
@@ -16,8 +15,9 @@ OrbitCamera.attributes.add('distanceMin',   { type: 'number', default: 1,   titl
 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)' });
+// NB: gardés pour compat, mais non utilisés pour brider le yaw (rotation libre)
+OrbitCamera.attributes.add('yawAngleMax',   { type: 'number', default: 360,  title: 'Yaw Angle Max (unused clamp)' });
+OrbitCamera.attributes.add('yawAngleMin',   { type: 'number', default: -360, title: 'Yaw Angle Min (unused clamp)' });
 
 OrbitCamera.attributes.add('minY',          { type: 'number', default: 0,   title: 'Minimum Y (camera world Y)' });
 
@@ -51,7 +51,10 @@ Object.defineProperty(OrbitCamera.prototype, 'pitch', {
 
 Object.defineProperty(OrbitCamera.prototype, 'yaw', {
     get: function () { return this._targetYaw; },
-    set: function (value) { this._targetYaw = this._clampYawAngle(value); }
+    set: function (value) { 
+        // Yaw LIBRE : pas de clamp pour permettre ±2000°, etc.
+        this._targetYaw = value; 
+    }
 });
 
 Object.defineProperty(OrbitCamera.prototype, 'pivotPoint', {
@@ -196,22 +199,20 @@ OrbitCamera.prototype._updatePosition = function () {
     var forward = this.entity.forward.clone(); // direction de visée
     var desired = this._pivotPoint.clone().add(forward.clone().mulScalar(-this._distance));
 
-    // 3) applique minY (comme un plan horizontal)
+    // 3) applique minY (plan horizontal)
     if (desired.y < this.minY) {
         desired.y = this.minY;
     }
 
     // 4) contraint UNIQUEMENT la position caméra à la bbox
     var clamped = desired.clone();
-    var wasClamped = this._applyBoundingBox(clamped); // retourne true si clamp effectué
+    var wasClamped = this._applyBoundingBox(clamped); // true si clamp
 
-    // 5) positionne la caméra
+    // 5) place la caméra
     this.entity.setPosition(clamped);
 
-    // 6) si clamp (bbox ou minY), on recalcule un pivot cohérent sur le même rayon
-    //    (préserve orientation + distance => rotation reste fluide au contact)
+    // 6) si clamp (bbox/minY), recalcule un pivot cohérent sur le même rayon
     if (wasClamped || clamped.y !== desired.y) {
-        // forward pointe de la caméra vers la scène
         // pos = pivot - forward * distance  =>  pivot = pos + forward * distance
         this._pivotPoint.copy(clamped.clone().add(forward.mulScalar(this._distance)));
     }
@@ -266,7 +267,8 @@ 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;
+    // Convention: yaw croissant = rotation CCW vue de dessus
+    return Math.atan2(transformedForward.x, transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
 OrbitCamera.prototype._clampDistance = function (distance) {
@@ -277,9 +279,8 @@ OrbitCamera.prototype._clampPitchAngle = function (pitch) {
     return pc.math.clamp(pitch, this.pitchAngleMin, this.pitchAngleMax);
 };
 
-OrbitCamera.prototype._clampYawAngle = function (yaw) {
-    return pc.math.clamp(yaw, -this.yawAngleMax, -this.yawAngleMin);
-};
+// Yaw: pas de clamp (rotation libre)
+OrbitCamera.prototype._clampYawAngle = function (yaw) { return yaw; };
 
 OrbitCamera.quatWithoutYaw = new pc.Quat();
 OrbitCamera.yawOffset = new pc.Quat();
@@ -299,20 +300,14 @@ OrbitCamera.prototype._bboxEnabled = function () {
     return (this.Xmin < this.Xmax) && (this.Ymin < this.Ymax) && (this.Zmin < this.Zmax);
 };
 
-/**
- * Contrainte position caméra à la bbox.
- * @returns {boolean} true si un clamp a été appliqué
- */
-OrbitCamera.prototype._applyBoundingBox = function (v3 /* camera position */) {
+/** Clamp position caméra à la bbox. @returns {boolean} true si clamp appliqué */
+OrbitCamera.prototype._applyBoundingBox = function (v3) {
     if (!this._bboxEnabled()) return false;
-
     var clamped = false;
     var nx = pc.math.clamp(v3.x, this.Xmin, this.Xmax);
     var ny = pc.math.clamp(v3.y, this.Ymin, this.Ymax);
     var nz = pc.math.clamp(v3.z, this.Zmin, this.Zmax);
-
     if (nx !== v3.x || ny !== v3.y || nz !== v3.z) clamped = true;
-
     v3.x = nx; v3.y = ny; v3.z = nz;
     return clamped;
 };
@@ -368,15 +363,13 @@ OrbitCameraInputMouse.prototype.pan = function (screenPoint) {
 
     worldDiff.sub2(toWorldPoint, fromWorldPoint);
 
-    // Enforce minY via test sur la position caméra résultante
+    // minY via test sur la position caméra résultante
     var proposedPivot = this.orbitCamera.pivotPoint.clone().add(worldDiff);
-
-    // calcule Y caméra si on acceptait ce pivot (sans bbox ici)
     var camY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
+
     if (camY >= this.orbitCamera.minY - 1e-4) {
         this.orbitCamera.pivotPoint.copy(proposedPivot);
     } else {
-        // Essai horizontal-only
         worldDiff.y = 0;
         proposedPivot = this.orbitCamera.pivotPoint.clone().add(worldDiff);
         camY = this.orbitCamera.worldCameraYForPivot(proposedPivot);
@@ -406,8 +399,10 @@ OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
     if (this.lookButtonDown) {
         var sens = this.orbitSensitivity;
 
-        var deltaPitch = event.dy * sens; // mouse up (dy < 0) raises pitch
+        // Souris : droite => orbite à droite ; gauche => orbite à gauche
         var deltaYaw   = event.dx * sens;
+        // Pitch : dy<0 (monte) => pitch augmente (look up)
+        var deltaPitch = event.dy * sens;
 
         var currPitch = this.orbitCamera.pitch;
         var currYaw   = this.orbitCamera.yaw;
@@ -420,22 +415,26 @@ OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
         camQuat.transformVector(pc.Vec3.FORWARD, forward);
         var preY = currPivot.y + (-forward.y) * currDist;
 
+        // Conventions:
+        // - Yaw: +deltaYaw = tourner gauche (CCW). On veut "drag droite => tourner droite (CW)" -> yaw -= deltaYaw
+        // - Pitch: "drag haut (dy<0) => look up" -> pitch -= deltaPitch (car deltaPitch<0)
         var proposedPitch = currPitch - deltaPitch;
-        var testQuat = new pc.Quat();
-        testQuat.setFromEulerAngles(proposedPitch, currYaw, 0);
-        var testForward = new pc.Vec3();
-        testQuat.transformVector(pc.Vec3.FORWARD, testForward);
+        var proposedYaw   = currYaw   - deltaYaw;
+
+        // Vérif minY pour pitch uniquement (comme avant)
+        var testQuat = new pc.Quat().setFromEulerAngles(proposedPitch, currYaw, 0);
+        var testForward = new pc.Vec3(); testQuat.transformVector(pc.Vec3.FORWARD, testForward);
         var proposedY = currPivot.y + (-testForward.y) * currDist;
 
         var minY = this.orbitCamera.minY;
         var wouldGoBelow = proposedY < minY - 1e-4;
 
-        if (wouldGoBelow && (proposedY < preY)) {
-            this.orbitCamera.yaw = currYaw - deltaYaw;
-        } else {
+        if (!(wouldGoBelow && (proposedY < preY))) {
             this.orbitCamera.pitch = proposedPitch;
-            this.orbitCamera.yaw   = currYaw - deltaYaw;
         }
+        // Yaw toujours libre
+        this.orbitCamera.yaw = proposedYaw;
+
     } else if (this.panButtonDown) {
         this.pan(new pc.Vec2(event.x, event.y));
     }
@@ -549,36 +548,33 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
         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 deltaPitch = (touch.y - this.lastTouchPoint.y) * sens;
 
         var currPitch = this.orbitCamera.pitch;
         var currYaw   = this.orbitCamera.yaw;
         var currDist  = this.orbitCamera.distance;
         var currPivot = this.orbitCamera.pivotPoint.clone();
 
-        var camQuat = new pc.Quat();
-        camQuat.setFromEulerAngles(currPitch, currYaw, 0);
-        var forward = new pc.Vec3();
-        camQuat.transformVector(pc.Vec3.FORWARD, forward);
+        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;
 
+        // mêmes conventions que souris
         var proposedPitch = currPitch - deltaPitch;
-        var testQuat = new pc.Quat();
-        testQuat.setFromEulerAngles(proposedPitch, currYaw, 0);
-        var testForward = new pc.Vec3();
-        testQuat.transformVector(pc.Vec3.FORWARD, testForward);
+        var proposedYaw   = currYaw   - deltaYaw;
+
+        var testQuat = new pc.Quat().setFromEulerAngles(proposedPitch, currYaw, 0);
+        var testForward = new pc.Vec3(); testQuat.transformVector(pc.Vec3.FORWARD, testForward);
         var proposedY = currPivot.y + (-testForward.y) * currDist;
 
         var minY = this.orbitCamera.minY;
         var wouldGoBelow = proposedY < minY - 1e-4;
 
-        if (wouldGoBelow && (proposedY < preY)) {
-            this.orbitCamera.yaw = currYaw - deltaYaw;
-        } else {
+        if (!(wouldGoBelow && (proposedY < preY))) {
             this.orbitCamera.pitch = proposedPitch;
-            this.orbitCamera.yaw   = currYaw - deltaYaw;
         }
+        this.orbitCamera.yaw = proposedYaw;
 
         this.lastTouchPoint.set(touch.x, touch.y);
     } else if (touches.length === 2) {
@@ -596,7 +592,7 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
 
 // =================== Orbit Camera Input Keyboard ========================
 // Flèches : déplacement avant/arrière & droite/gauche (repère caméra, 3D)
-// Ctrl+flèches : orbiter autour du pivot (avec test minY)
+// Ctrl+flèches : orbiter autour du pivot (sens conforme ← CCW / → CW)
 // Maj+flèches : rotation libre sur place (pas de limites yaw/pitch)
 var OrbitCameraInputKeyboard = pc.createScript('orbitCameraInputKeyboard');
 
@@ -628,14 +624,15 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     // -------- Ctrl + flèches : ORBIT autour du pivot --------
     if (ctrl && (up || dn || lt || rt)) {
-        var yawDir   = (rt ? 1 : 0) - (lt ? 1 : 0);
-        var pitchDir = (up ? 1 : 0) - (dn ? 1 : 0);
+        // Convention : ← = CCW => yaw augmente ; → = CW => yaw diminue
+        var yawDirLeftRight = (lt ? 1 : 0) - (rt ? 1 : 0); // ← +1, → -1
+        var pitchDirUpDown  = (up ? 1 : 0) - (dn ? 1 : 0); // ↑ +1, ↓ -1
 
-        if (yawDir !== 0) {
-            this.orbitCamera.yaw = this.orbitCamera.yaw + yawDir * this.orbitYawSpeedDeg * dt;
+        if (yawDirLeftRight !== 0) {
+            this.orbitCamera.yaw = this.orbitCamera.yaw + yawDirLeftRight * this.orbitYawSpeedDeg * dt;
         }
 
-        if (pitchDir !== 0) {
+        if (pitchDirUpDown !== 0) {
             var currPitch = this.orbitCamera.pitch;
             var currYaw   = this.orbitCamera.yaw;
             var currDist  = this.orbitCamera.distance;
@@ -645,7 +642,7 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
             var forward = new pc.Vec3(); camQuat.transformVector(pc.Vec3.FORWARD, forward);
             var preY = currPivot.y + (-forward.y) * currDist;
 
-            var testPitch = currPitch + pitchDir * this.orbitPitchSpeedDeg * dt;
+            var testPitch = currPitch + pitchDirUpDown * this.orbitPitchSpeedDeg * dt;
             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;
@@ -662,8 +659,8 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     // -------- 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);
+        var yawDirR   = (lt ? 1 : 0) - (rt ? 1 : 0); // ← +1 (CCW), → -1 (CW)
+        var pitchDirR = (up ? 1 : 0) - (dn ? 1 : 0); // ↑ +1, ↓ -1
 
         var camPos = this.entity.getPosition().clone();
         var dist   = this.orbitCamera._distance;