From 7f6c1187b8adfb476643eb78757a70345b08bf3b Mon Sep 17 00:00:00 2001
From: EmeraldBlock <69981203+EmeraldBlock@users.noreply.github.com>
Date: Tue, 29 Sep 2020 09:48:41 -0500
Subject: [PATCH] Make zoom in and zoom out equal (#704)

* Make zoom in and zoom out equal

Makes zooming out zoom an amount equal to zooming in.

* format things better

* Made zoom keys also equal

Made zoom out equal to zoom in

* Actually made arrow keys equal

hope this actually works
---
 src/js/game/camera.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/js/game/camera.js b/src/js/game/camera.js
index 66d7efa8..37db1432 100644
--- a/src/js/game/camera.js
+++ b/src/js/game/camera.js
@@ -353,7 +353,7 @@ export class Camera extends BasicSerializableObject {
             .add(() => (this.desiredZoom = this.zoomLevel * 1.2));
         mapper
             .getBinding(KEYMAPPINGS.navigation.mapZoomOut)
-            .add(() => (this.desiredZoom = this.zoomLevel * 0.8));
+            .add(() => (this.desiredZoom = this.zoomLevel / 1.2));
 
         mapper.getBinding(KEYMAPPINGS.navigation.centerMap).add(() => this.centerOnMap());
     }
@@ -502,10 +502,10 @@ export class Camera extends BasicSerializableObject {
         }
         const prevZoom = this.zoomLevel;
 
-        const delta = Math.sign(event.deltaY) * -0.15 * this.root.app.settings.getScrollWheelSensitivity();
+        const scale = 1 + 0.15 * this.root.app.settings.getScrollWheelSensitivity();
         assert(Number.isFinite(delta), "Got invalid delta in mouse wheel event: " + event.deltaY);
         assert(Number.isFinite(this.zoomLevel), "Got invalid zoom level *before* wheel: " + this.zoomLevel);
-        this.zoomLevel *= 1 + delta;
+        this.zoomLevel *= event.deltaY < 0 ? scale : 1 / scale;
         assert(Number.isFinite(this.zoomLevel), "Got invalid zoom level *after* wheel: " + this.zoomLevel);
 
         this.clampZoomLevel();
@@ -939,6 +939,7 @@ export class Camera extends BasicSerializableObject {
                 this.zoomLevel = this.zoomLevel * fade + this.desiredZoom * (1 - fade);
                 assert(Number.isFinite(this.zoomLevel), "Zoom level is NaN after fade: " + this.zoomLevel);
             } else {
+                this.zoomLevel = this.desiredZoom;
                 this.desiredZoom = null;
             }
         }