Fix portrait mode

erikdubbelboer · Oct 22, 2023 · 2e6678e · 2e6678e
1 parent 2dcd93c
commit 2e6678e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/game.js b/src/game.js
@@ -319,7 +319,7 @@ export class Game extends EventEmitter {
 
         this.setWorldScale(this.worldScale);
 
-        if ((window.isMobile || window.isTablet) && ratio < 1) {
+        if (ratio < 1) {
             this.worldContainer.rotation = Math.PI / 2;
             this.halfScreenWidth = this.screenHeight / 2;
             this.halfScreenHeight = this.screenWidth / 2;

diff --git a/src/ship.js b/src/ship.js
@@ -166,6 +166,13 @@ export class Ship extends PIXI.Container {
 
                 this.joystickMove = { x, y };
 
+                if (game.portrait) {
+                    // In portrait mode, the ship is rotated 90 degrees.
+                    const tmp = this.joystickMove.x;
+                    this.joystickMove.x = this.joystickMove.y;
+                    this.joystickMove.y = -tmp;
+                }
+
                 this.pointerRotation = Math.atan2(this.joystickMove.y, this.joystickMove.x) + PI05;
                 this.pointerMove = false;
             } else {
@@ -189,7 +196,7 @@ export class Ship extends PIXI.Container {
         this.pointerY = y;
     }
 
-    update(delta) {
+    update(delta, game) {
         let dx = 0;
         let dy = 0;
         const d = 0.01;
@@ -207,6 +214,13 @@ export class Ship extends PIXI.Container {
             dy = delta * this.speed * d;
         }
 
+        if (game.portrait) {
+            // In portrait mode, the ship is rotated 90 degrees.
+            const tmp = dx;
+            dx = dy;
+            dy = -tmp;
+        }
+
         if (this.joystickMove) {
             dx = delta * this.speed * ((d / maxPointerMovement) * this.joystickMove.x);
             dy = delta * this.speed * ((d / maxPointerMovement) * this.joystickMove.y);
@@ -254,6 +268,11 @@ export class Ship extends PIXI.Container {
             this.wantRotation = 180 * (PI / 180);
         }
 
+        if (game.portrait) {
+            // In portrait mode, the ship is rotated 90 degrees.
+            this.wantRotation -= PI05;
+        }
+
         // We ain for the player cursor, unless the player hasn't moved
         // the cursor in a while, then we aim in the direction of movement.
         if (this.cancelPointerMoveAfter < performance.now()) {