Camera: Don't associate zoom in/out with wasd_controls

RyanGrieb · Nov 20, 2023 · a6fce89 · a6fce89
1 parent 7a94451
commit a6fce89
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/client/src/Game.ts b/client/src/Game.ts
@@ -182,10 +182,14 @@ export class Game {
           this.currentScene.redraw();
         }
         this.canvasContext.fillStyle = options.canvasColor ?? "white";
-        this.canvasContext.fillRect(0, 0, this.canvas.width, this.canvas.height);
+        this.canvasContext.fillRect(
+          0,
+          0,
+          this.canvas.width,
+          this.canvas.height
+        );
         this.canvasContext.font = "12px Times new Roman";
         this.canvasContext.imageSmoothingEnabled = false;
-
       }, 300);
     });
 

diff --git a/client/src/scene/Camera.ts b/client/src/scene/Camera.ts
@@ -52,16 +52,15 @@ export class Camera {
     this.locked = false;
 
     const scene = Game.getCurrentScene();
-    if (options.wasd_controls) {
-      scene.on("keydown", (options) => {
-        if (this.keysHeld.includes(options.key) || this.locked) {
-          return;
-        }
+    scene.on("keydown", (options) => {
+      if (this.keysHeld.includes(options.key) || this.locked) {
+        return;
+      }
 
+      if (this.wasdControls) {
         this.keysHeld.push(options.key);
 
         if (options.key == "a" || options.key == "A") {
-          console.log("a");
           scene.getCamera().addVel(5, 0);
         }
         if (options.key == "d" || options.key == "D") {
@@ -73,25 +72,23 @@ export class Camera {
         if (options.key == "s" || options.key == "S") {
           scene.getCamera().addVel(0, -5);
         }
-        if (options.key == "=") {
-          scene
-            .getCamera()
-            .zoom(Game.getWidth() / 2, Game.getHeight() / 2, 1.2);
-        }
-        if (options.key == "-") {
-          scene
-            .getCamera()
-            .zoom(Game.getWidth() / 2, Game.getHeight() / 2, 0.8);
-        }
-      });
+      }
+
+      if (options.key == "=") {
+        scene.getCamera().zoom(Game.getWidth() / 2, Game.getHeight() / 2, 1.2);
+      }
+      if (options.key == "-") {
+        scene.getCamera().zoom(Game.getWidth() / 2, Game.getHeight() / 2, 0.8);
+      }
+    });
 
-      scene.on("keyup", (options) => {
+    scene.on("keyup", (options) => {
+      if (this.wasdControls) {
         this.keysHeld = this.keysHeld.filter(
           (element) => element !== options.key
         ); // Remove key from held lits
 
         if (options.key == "a" || options.key == "A") {
-          console.log("no a ");
           scene.getCamera().addVel(-5, 0);
         }
         if (options.key == "d" || options.key == "D") {
@@ -104,8 +101,8 @@ export class Camera {
         if (options.key == "s" || options.key == "S") {
           scene.getCamera().addVel(0, 5);
         }
-      });
-    }
+      }
+    });
 
     if (options.mouse_controls) {
       scene.on("mousedown", (options) => {

diff --git a/client/src/scene/type/InGameScene.ts b/client/src/scene/type/InGameScene.ts
@@ -26,7 +26,7 @@ export class InGameScene extends Scene {
     this.players = [];
     if (this.firstLoad) {
       const camera = new Camera({
-        wasd_controls: false,
+        wasd_controls: true,
         mouse_controls: true,
         //initial_position: [1, 1],
       });