Merge pull request #156 from SquidCoderIndustries/squid-stonesense-zo…

…omtrack Make Stonesense zoom follow the DF window zoom
DFHack · Jan 21, 2025 · d92965b · d92965b
2 parents 9353a43 + b021bc6
commit d92965b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/MapLoading.cpp b/MapLoading.cpp
@@ -1,3 +1,5 @@
+#include <cmath>
+
 #include "common.h"
 #include "MapLoading.h"
 #include "GUI.h"
@@ -959,6 +961,8 @@ void read_segment( void *arg)
                 followCurrentDFFocus();
                 stonesenseState.ssConfig.follow_DFcursor = true;
             }
+            stonesenseState.ssConfig.zoom = (df::global::gps->viewport_zoom_factor - 64) / 16;
+            stonesenseState.ssConfig.scale = std::pow(SCALEZOOMFACTOR, stonesenseState.ssConfig.zoom);
         }
         segment = stonesenseState.map_segment.getRead();
         readMapSegment(segment, ssState);

diff --git a/UserInput.cpp b/UserInput.cpp
@@ -1,3 +1,5 @@
+#include <cmath>
+
 #include "common.h"
 #include "GUI.h"
 #include "BuildingConfiguration.h"
@@ -457,14 +459,14 @@ void action_incrzoom(uint32_t keymod)
 {
     auto& ssConfig = stonesenseState.ssConfig;
     ssConfig.zoom++;
-    ssConfig.scale = pow(1.1f, ssConfig.zoom);
+    ssConfig.scale = std::pow(SCALEZOOMFACTOR, ssConfig.zoom);
 }
 
 void action_decrzoom(uint32_t keymod)
 {
     auto& ssConfig = stonesenseState.ssConfig;
     ssConfig.zoom--;
-    ssConfig.scale = pow(1.1f, ssConfig.zoom);
+    ssConfig.scale = std::pow(SCALEZOOMFACTOR, ssConfig.zoom);
 }
 
 void action_screenshot(uint32_t keymod)

diff --git a/common.h b/common.h
@@ -232,3 +232,5 @@ constexpr auto FORM_BAR = 1;
 constexpr auto FORM_BLOCK = 2;
 constexpr auto FORM_BOULDER = 3;
 constexpr auto FORM_LOG = 4;
+
+constexpr auto SCALEZOOMFACTOR = 1.1f;
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -46,6 +46,7 @@ Template for new versions:
 - `stonesense`: added some missing artwork for bookcases, displays, and offering places
 - `stonesense`: reorganized the position of some existing art to be more intuitive
 - `stonesense`: added index numbers empty sprite slots to aid in making the xml files for the sprites
+- `stonesense`: zoom levels in stonesense now mirror the main game when in follow mode
 
 ## Removed