Update orbit-camera.js

orbit-camera.js

@@ -538,7 +538,11 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
     }
 };
 
-// =================== Orbit Camera Input Keyboard (per-canvas) ========================
+// =================== Orbit Camera Input Keyboard ========================
+// Arrows:
+// - No modifier:   Up/Down = vertical pan; Left/Right = strafe
+// - With Shift:    Up/Down = orbit pitch; Left/Right = orbit yaw (inverted as requested)
+// - With Ctrl:     Up/Down = zoom in/out
 var OrbitCameraInputKeyboard = pc.createScript('orbitCameraInputKeyboard');
 
 OrbitCameraInputKeyboard.attributes.add('forwardSpeed', { type: 'number', default: 1.2, title: 'Vertical Speed (rel. to distance)' });
@@ -551,91 +555,31 @@ OrbitCameraInputKeyboard.attributes.add('zoomKeySensitivity', { type: 'number',
 
 OrbitCameraInputKeyboard.prototype.initialize = function () {
     this.orbitCamera = this.entity.script.orbitCamera;
-
-    // État clavier local à CE canvas
-    this._keys = Object.create(null);
-    this._active = false;
-
-    // Cible = canvas de l'app
-    var el = this.app.graphicsDevice.canvas;
-    if (!el.hasAttribute('tabindex')) el.setAttribute('tabindex', '0');
-
-    // Empêche le scroll de page pour les touches de navigation quand actif
-    var shouldBlock = function(ev) {
-        if (!ev) return false;
-        var k = ev.key;
-        return k === 'ArrowUp' || k === 'ArrowDown' || k === 'ArrowLeft' || k === 'ArrowRight' ||
-               k === 'PageUp'  || k === 'PageDown' || k === 'Home'      || k === 'End' ||
-               k === ' ' || k === 'Spacebar' || (ev.ctrlKey && (k === 'ArrowUp' || k === 'ArrowDown'));
-    };
-
-    this._onKeyDown = (ev) => {
-        if (!this._active) return;
-        this._keys[ev.key] = true;
-        if (shouldBlock(ev)) ev.preventDefault();
-    };
-
-    this._onKeyUp = (ev) => {
-        this._keys[ev.key] = false;
-    };
-
-    this._onBlur = () => {
-        this._keys = Object.create(null);
-    };
-
-    this._onEnter = () => {
-        this._active = true;
-        try { el.focus({ preventScroll: true }); } catch(e) { el.focus(); }
-    };
-
-    this._onLeave = () => {
-        this._active = false;
-        el.blur();
-        this._keys = Object.create(null);
-    };
-
-    el.addEventListener('keydown', this._onKeyDown);
-    el.addEventListener('keyup', this._onKeyUp);
-    el.addEventListener('blur', this._onBlur);
-    el.addEventListener('pointerenter', this._onEnter);
-    el.addEventListener('pointerleave', this._onLeave);
-
-    // Nettoyage
-    this.on('destroy', function () {
-        el.removeEventListener('keydown', this._onKeyDown);
-        el.removeEventListener('keyup', this._onKeyUp);
-        el.removeEventListener('blur', this._onBlur);
-        el.removeEventListener('pointerenter', this._onEnter);
-        el.removeEventListener('pointerleave', this._onLeave);
-    }, this);
-};
-
-OrbitCameraInputKeyboard.prototype._pressed = function(name) {
-    return !!(this._keys[name] || this._keys[name + 'Left'] || this._keys[name + 'Right']);
+    this.keyboard = this.app.keyboard || null;
 };
 
 OrbitCameraInputKeyboard.prototype.update = function (dt) {
-    if (!this.orbitCamera) return;
+    if (!this.orbitCamera || !this.keyboard) return;
 
-    var up = !!this._keys['ArrowUp'];
-    var dn = !!this._keys['ArrowDown'];
-    var lt = !!this._keys['ArrowLeft'];
-    var rt = !!this._keys['ArrowRight'];
+    var up = this.keyboard.isPressed(pc.KEY_UP);
+    var dn = this.keyboard.isPressed(pc.KEY_DOWN);
+    var lt = this.keyboard.isPressed(pc.KEY_LEFT);
+    var rt = this.keyboard.isPressed(pc.KEY_RIGHT);
 
-    var shift = this._pressed('Shift');
-    var ctrl  = this._pressed('Control');
+    var shift = this.keyboard.isPressed(pc.KEY_SHIFT);
+    var ctrl  = this.keyboard.isPressed(pc.KEY_CONTROL);
 
     // ---- SHIFT: Orbit (pitch / yaw) ----
     if (shift && (up || dn || lt || rt)) {
-        // Yaw (left/right) — Shift+Right => orbit vers la droite
-        var yawDir = (rt ? 1 : 0) - (lt ? 1 : 0);
+        // Yaw (left/right) — inverted per request: Shift+Right => orbit to the right
+        var yawDir = (rt ? 1 : 0) - (lt ? 1 : 0); // right=+1, left=-1
         if (yawDir !== 0) {
             var dYaw = yawDir * this.orbitYawSpeedDeg * dt;
-            this.orbitCamera.yaw = this.orbitCamera.yaw + dYaw;
+            this.orbitCamera.yaw = this.orbitCamera.yaw + dYaw; // NOTE: '+' (inversion)
         }
 
-        // Pitch (up/down)
-        var pitchDir = (up ? 1 : 0) - (dn ? 1 : 0);
+        // Pitch (up/down) — Shift+Up => orbit up, Shift+Down => down
+        var pitchDir = (up ? 1 : 0) - (dn ? 1 : 0); // up=+1, down=-1
         if (pitchDir !== 0) {
             var dPitch = pitchDir * this.orbitPitchSpeedDeg * dt;
 
@@ -657,7 +601,7 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
             var wouldGoBelow = proposedY < minY - 1e-4;
 
             if (!(wouldGoBelow && (proposedY < preY))) {
-                this.orbitCamera.pitch = testPitch;
+                this.orbitCamera.pitch = testPitch; // clamped by setter
             }
         }
         return;
@@ -665,21 +609,48 @@ OrbitCameraInputKeyboard.prototype.update = function (dt) {
 
     // ---- CTRL: Zoom (up/down) ----
     if (ctrl && (up || dn)) {
-        var zoomSign = (up ? 1 : 0) - (dn ? 1 : 0);
+        var zoomSign = (up ? 1 : 0) - (dn ? 1 : 0); // up=zoom in, down=zoom out
         if (zoomSign !== 0) {
             if (this.entity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
                 var dz = zoomSign * this.zoomKeySensitivity * (this.orbitCamera.distance * 0.5) * dt;
-                this.orbitCamera.distance -= dz;
+                this.orbitCamera.distance -= dz; // clamped
             } else {
                 var doh = zoomSign * this.zoomKeySensitivity * (this.orbitCamera.orthoHeight * 0.5) * dt;
-                this.orbitCamera.orthoHeight -= doh;
+                this.orbitCamera.orthoHeight -= doh; // clamped >= 0
             }
         }
         return;
     }
 
-    // ---- Sans modifieurs : translation (vertical + strafe) ----
-    var moveVert = (up ? 1 : 0) - (dn ? 1 : 0);
+    // ---- No modifier: translate (vertical + strafe) ----
+    var moveVert = (up ? 1 : 0) - (dn ? 1 : 0); // Up=+1 => go up
     var moveRight = (rt ? 1 : 0) - (lt ? 1 : 0);
 
-    i
+    if (moveVert === 0 && moveRight === 0) return;
+
+    // Base speeds relative to distance (consistent feel near/far)
+    var dist = Math.max(0.1, this.orbitCamera.distance);
+    var speedV = this.forwardSpeed * dist; // vertical speed
+    var speedR = this.strafeSpeed  * dist; // strafe speed
+
+    // Vertical move (pure Y), respect minY
+    var dy = moveVert * speedV * dt;
+    if (dy !== 0) {
+        var currentCamY = this.orbitCamera.worldCameraYForPivot(this.orbitCamera.pivotPoint);
+        var minY = this.orbitCamera.minY;
+        var proposedCamY = currentCamY + dy;
+        if (proposedCamY < minY) {
+            dy = Math.max(dy, minY - currentCamY);
+        }
+        if (dy !== 0) {
+            this.orbitCamera._pivotPoint.y += dy;
+        }
+    }
+
+    // Strafe on XZ
+    var right = this.entity.right.clone(); right.y = 0; if (right.lengthSq() > 1e-8) right.normalize();
+    var dx = moveRight * speedR * dt;
+    if (dx !== 0) {
+        this.orbitCamera._pivotPoint.add(right.mulScalar(dx));
+    }
+};