Update orbit-camera.js

orbit-camera.js

@@ -108,18 +108,24 @@ 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 {
@@ -128,6 +134,7 @@ OrbitCamera.prototype.initialize = function () {
         this._distance = this._clampDistance(distanceBetween.length());
     }
     this._targetDistance = this._distance;
+
     this.on('attr:distanceMin', function (value, prev) { this._distance = this._clampDistance(this._distance); });
     this.on('attr:distanceMax', function (value, prev) { this._distance = this._clampDistance(this._distance); });
     this.on('attr:pitchAngleMin', function (value, prev) { this._pitch = this._clampPitchAngle(this._pitch); });
@@ -139,7 +146,10 @@ OrbitCamera.prototype.initialize = function () {
     this.on('attr:frameOnStart', function (value, prev) {
         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);
+    });
 };
 
 OrbitCamera.prototype.update = function (dt) {
@@ -157,8 +167,10 @@ OrbitCamera.prototype._updatePosition = function () {
     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);
 };
 
@@ -176,6 +188,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];
@@ -183,6 +196,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];
@@ -190,6 +204,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];
@@ -198,6 +213,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);
@@ -234,10 +250,13 @@ OrbitCamera.yawOffset = new pc.Quat();
 OrbitCamera.prototype._calcPitch = function (quat, yaw) {
     var quatWithoutYaw = OrbitCamera.quatWithoutYaw;
     var yawOffset = OrbitCamera.yawOffset;
+
     yawOffset.setFromEulerAngles(0, -yaw, 0);
     quatWithoutYaw.mul2(yawOffset, quat);
+
     var transformedForward = new pc.Vec3();
     quatWithoutYaw.transformVector(pc.Vec3.FORWARD, transformedForward);
+
     return Math.atan2(-transformedForward.y, -transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
@@ -249,14 +268,18 @@ OrbitCameraInputMouse.attributes.add('distanceSensitivity',{ type: 'number', def
 
 OrbitCameraInputMouse.prototype.initialize = function () {
     this.orbitCamera = this.entity.script.orbitCamera;
+
     if (this.orbitCamera) {
         var self = this;
         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_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);
@@ -265,9 +288,12 @@ OrbitCameraInputMouse.prototype.initialize = function () {
             window.removeEventListener('mouseout', onMouseOut, false);
         });
     }
+
     this.app.mouse.disableContextMenu();
+
     this.lookButtonDown = false;
     this.panButtonDown = false;
+
     this.lastPoint = new pc.Vec2();
 };
 OrbitCameraInputMouse.fromWorldPoint = new pc.Vec3();
@@ -278,10 +304,13 @@ 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
@@ -343,6 +372,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 {
@@ -352,6 +382,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);
 };
 
@@ -372,16 +403,20 @@ OrbitCameraInputMouse.prototype.onMouseOut = function (event) {
 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);
@@ -413,14 +448,18 @@ OrbitCameraInputTouch.prototype.onTouchStartEndCancel = function (event) {
 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);
@@ -444,8 +483,10 @@ 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;
@@ -470,20 +511,161 @@ 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 ========================
+var OrbitCameraInputKeyboard = pc.createScript('orbitCameraInputKeyboard');
+
+/**
+ * Réglages :
+ * - orbitDegreesPerSecond : vitesse d’orbite (deg/s) pour yaw/pitch
+ * - zoomFactorPerSecond   : agressivité du zoom (facteur/s, proportionnel à la distance/orthoHeight)
+ * - panUnitsPerSecond     : vitesse de pan (en fraction de la distance/s)
+ */
+OrbitCameraInputKeyboard.attributes.add('orbitDegreesPerSecond', { type: 'number', default: 90,  title: 'Orbit Degrees / s' });
+OrbitCameraInputKeyboard.attributes.add('zoomFactorPerSecond',   { type: 'number', default: 1.6, title: 'Zoom Factor / s' });
+OrbitCameraInputKeyboard.attributes.add('panUnitsPerSecond',     { type: 'number', default: 0.8, title: 'Pan (distance frac) / s' });
+
+OrbitCameraInputKeyboard.prototype.initialize = function () {
+    this.orbitCamera = this.entity.script.orbitCamera;
+
+    var self = this;
+    this._preventDefault = function (e) {
+        var tag = (e.target && e.target.tagName) ? e.target.tagName.toUpperCase() : '';
+        if (tag === 'INPUT' || tag === 'TEXTAREA' || e.isContentEditable) return;
+
+        var code = e.key || '';
+        if (code === 'ArrowUp' || code === 'ArrowDown' || code === 'ArrowLeft' || code === 'ArrowRight') {
+            e.preventDefault();
+        }
+    };
+    window.addEventListener('keydown', this._preventDefault, { passive: false });
+
+    this.on('destroy', function () {
+        window.removeEventListener('keydown', self._preventDefault, { passive: false });
+    });
+};
+
+// Teste si un pitch proposé ferait passer la caméra sous minY (même logique que souris/touch)
+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 };
+};
+
+// Pan latéral (droite/gauche) avec respect de minY
+OrbitCameraInputKeyboard.prototype._panSideways = function (delta) {
+    var cam = this.orbitCamera;
+
+    var quat = new pc.Quat();
+    quat.setFromEulerAngles(cam.pitch, cam.yaw, 0);
+
+    var right = new pc.Vec3();
+    quat.transformVector(pc.Vec3.RIGHT, right);
+
+    var worldDiff = right.scale(delta);
+
+    var minY = cam.minY;
+    var proposedPivot = cam.pivotPoint.clone().add(worldDiff);
+    var resultingY = cam.worldCameraYForPivot(proposedPivot);
+
+    if (resultingY >= minY - 1e-4) {
+        cam.pivotPoint.add(worldDiff);
+    } else {
+        worldDiff.y = 0;
+        proposedPivot = cam.pivotPoint.clone().add(worldDiff);
+        resultingY = cam.worldCameraYForPivot(proposedPivot);
+        if (resultingY >= minY - 1e-4) cam.pivotPoint.add(worldDiff);
+    }
+};
+
+OrbitCameraInputKeyboard.prototype.update = function (dt) {
+    if (!this.orbitCamera || !this.app.keyboard) return;
+
+    var kb = this.app.keyboard;
+    var shift = kb.isPressed(pc.KEY_SHIFT);
+    var cam = this.orbitCamera;
+
+    // --------- Avec SHIFT : zoom & pan latéral ----------
+    if (shift) {
+        // Zoom (⇧+↑ / ⇧+↓)
+        if (kb.isPressed(pc.KEY_UP) || kb.isPressed(pc.KEY_DOWN)) {
+            var k = this.zoomFactorPerSecond;
+
+            if (this.entity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
+                var amount = k * dt * (cam.distance * 0.8);
+                if (kb.isPressed(pc.KEY_UP))   cam.distance = cam.distance - amount;
+                if (kb.isPressed(pc.KEY_DOWN)) cam.distance = cam.distance + amount;
+            } else {
+                var amountO = k * dt * (this.entity.camera.orthoHeight * 0.8);
+                if (kb.isPressed(pc.KEY_UP))   this.entity.camera.orthoHeight -= amountO;
+                if (kb.isPressed(pc.KEY_DOWN)) this.entity.camera.orthoHeight += amountO;
+            }
+        }
+
+        // Pan latéral (⇧+← / ⇧+→)
+        if (kb.isPressed(pc.KEY_LEFT) || kb.isPressed(pc.KEY_RIGHT)) {
+            var speed = this.panUnitsPerSecond * cam.distance; // unités/s
+            var delta = speed * dt * (kb.isPressed(pc.KEY_LEFT) ? -1 : 1);
+            this._panSideways(delta);
+        }
+
+        return; // pas d’orbite quand SHIFT est enfoncé
+    }
+
+    // --------- Sans SHIFT : orbite yaw/pitch ----------
+    var orbitRate = this.orbitDegreesPerSecond * dt;
+
+    // Pitch (↑/↓) — protège minY
+    if (kb.isPressed(pc.KEY_UP) || kb.isPressed(pc.KEY_DOWN)) {
+        var dir = kb.isPressed(pc.KEY_UP) ? -1 : 1; // ↑ = diminuer le pitch (monter l’orbite)
+        var proposedPitch = cam.pitch + dir * orbitRate;
+
+        var test = this._wouldGoBelowMinYWithPitch(proposedPitch);
+
+        if (!(test.wouldGoBelow && (test.proposedY < test.preY))) {
+            cam.pitch = proposedPitch;
+        }
+    }
+
+    // Yaw (←/→) — orbite horizontale
+    if (kb.isPressed(pc.KEY_LEFT))  cam.yaw = cam.yaw + orbitRate;  // vers la gauche
+    if (kb.isPressed(pc.KEY_RIGHT)) cam.yaw = cam.yaw - orbitRate;  // vers la droite
+};