Split SEGMENTSIZE_XY and add an autosize config

Config.cpp

@@ -56,6 +56,26 @@ std::optional<std::string> trim_line(std::string line)
     return std::optional{ line };
 }
 
+    int getSegmentSizeConfig(string setting, string line) {
+        bool autosize = (parseStrFromLine(setting, line) == "AUTO");
+        int value = DEFAULT_SEGSIZE_XY;
+        if (autosize) {
+            value = 1; // will get overwritten when the window comes up
+            if (setting.ends_with("XY") || setting.ends_with("X")) {
+                stonesenseState.ssConfig.autosize_segmentX = true;
+            }
+            if (setting.ends_with("Y")) {
+                stonesenseState.ssConfig.autosize_segmentY = true;
+            }
+        } else {
+            value = parseIntFromLine(setting, line);
+            value = ((value < MIN_SEGSIZE) ? DEFAULT_SEGSIZE_XY : value);
+        }
+        //plus 2 to allow edge readings
+        value += 2;
+        return value;
+    }
+
 namespace {
     void parseConfigLine(Config& config, string line)
     {
@@ -81,21 +101,20 @@ namespace {
             config.Fullscreen = (result == "NO");
         }
         if (line.find("[SEGMENTSIZE_XY") != string::npos) {
-            int value = parseIntFromLine("SEGMENTSIZE_XY", line);
-            if (value < 1) {
-                value = DEFAULT_SIZE;
-            }
-            if (value > 100) {
-                value = 100;
-            }
-            //plus 2 to allow edge readings
-            config.defaultSegmentSize.x = value;
-            config.defaultSegmentSize.y = value;
+            config.defaultSegmentSize.x = getSegmentSizeConfig("SEGMENTSIZE_XY", line);
+            config.defaultSegmentSize.y = config.defaultSegmentSize.x;
+        }
+        if (line.find("[SEGMENTSIZE_X") != string::npos) {
+            config.defaultSegmentSize.x = getSegmentSizeConfig("SEGMENTSIZE_X", line);
+        }
+        if (line.find("[SEGMENTSIZE_Y") != string::npos) {
+            config.defaultSegmentSize.y = getSegmentSizeConfig("SEGMENTSIZE_Y", line);
+
         }
         if (line.find("[SEGMENTSIZE_Z") != string::npos) {
             int value = parseIntFromLine("SEGMENTSIZE_Z", line);
             if (value < 1) {
-                value = DEFAULT_SIZE_Z;
+                value = DEFAULT_SEGSIZE_Z;
             }
             config.defaultSegmentSize.z = value;
         }

GameConfiguration.h

@@ -22,6 +22,12 @@ struct GameConfiguration {
     bool show_hidden_tiles = false;
     bool load_ground_materials = false;
     bool hide_outer_tiles = false;
+    bool debug_mode = false;
+    bool autosize_segmentX = false;
+    bool autosize_segmentY = false;
+    int lift_segment_offscreen_x = 0;
+    int lift_segment_offscreen_y = 0;
+
     uint8_t truncate_walls;
     bool track_screen_center = true;
 

common.h

@@ -84,6 +84,9 @@ constexpr auto SPRITEWIDTH = TILEWIDTH;
 constexpr auto SPRITEHEIGHT = (TILETOPHEIGHT + WALLHEIGHT);
 constexpr auto WALL_CUTOFF_HEIGHT = 15;
 
+constexpr auto MIN_SEGSIZE = 1;
+constexpr auto DEFAULT_SEGSIZE_XY = 70;
+constexpr auto DEFAULT_SEGSIZE_Z = 6;
 constexpr auto MAPNAVIGATIONSTEP = 1;
 constexpr auto MAPNAVIGATIONSTEPBIG = 10;
 

configs/init.txt

@@ -16,9 +16,11 @@ using WIDTH and HEIGHT for resolution. Try and use resolutions compatible
 with your drivers, or the program will still load in window mode.
 [WINDOWED:YES]
 
-These two options set how large the cube loaded from Dwarf Fortress is.
+These three options set how large the cube loaded from Dwarf Fortress is.
 Each entry expects the number of tiles to load.
-[SEGMENTSIZE_XY:70]
+SEGMENTSIZE_X and SEGMENTSIZE_Y allow using "AUTO" (for example "[SEGMENTSIZE_X:AUTO]").
+[SEGMENTSIZE_X:AUTO]
+[SEGMENTSIZE_Y:AUTO]
 [SEGMENTSIZE_Z:4]
 
 Change this to off to skip the intro.

configs/keybinds.txt

@@ -39,6 +39,10 @@ KEYBINDINGS:
 [RESET_VIEW_OFFSET:KEY_Z]
 [DECR_SEGMENT_Z:KEY_1]
 [INCR_SEGMENT_Z:KEY_2]
+[DECR_SEGMENT_X:KEYPAD_4]
+[INCR_SEGMENT_X:KEYPAD_6]
+[DECR_SEGMENT_Y:KEYPAD_2]
+[INCR_SEGMENT_Y:KEYPAD_8]
 [TOGGLE_SINGLE_LAYER:KEY_S]
 [TOGGLE_SHADE_HIDDEN_TILES:KEY_B]
 [TOGGLE_SHOW_HIDDEN_TILES:KEY_H]

docs/changelog.txt

@@ -38,6 +38,8 @@ Template for new versions:
 # Future
 
 ## New Features
+- `stonesense`: added ``AUTO`` as an option for the now-split ``SEGMENTSIZE_X`` and ``SEGMENTSIZE_Y``
+- `stonesense`: added new hotkeys for resizing the segmentsize
 - `stonesense`: stonesense now offsets the view when you are following a unit in DF, to better center the camera on the unit in stonesense
 
 ## Fixes

main.cpp

@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <cmath>
 #include <vector>
 #include <list>
 
@@ -208,6 +209,10 @@ void drawcredits()
     // Make the backbuffer visible
 }
 
+int getAutoSegmentSize() {
+    return (int)std::ceil(std::sqrt(2) * (stonesenseState.ssState.ScreenW + stonesenseState.ssState.ScreenH) / TILEWIDTH);
+}
+
 /* main_loop:
 *  The main loop of the program.  Here we wait for events to come in from
 *  any one of the event sources and react to each one accordingly.  While
@@ -306,6 +311,12 @@ static void main_loop(ALLEGRO_DISPLAY * display, ALLEGRO_EVENT_QUEUE *queue, ALL
                 if (ssConfig.overlay_mode) {
                     break;
                 }
+                if (ssConfig.autosize_segmentX) {
+                    stonesenseState.ssState.Size.x = getAutoSegmentSize();
+                }
+                if (ssConfig.autosize_segmentY){
+                    stonesenseState.ssState.Size.y = getAutoSegmentSize();
+                }
                 stonesenseState.timeToReloadSegment = true;
                 redraw = true;
                 stonesenseState.ssState.ScreenH = event.display.height;
@@ -368,7 +379,7 @@ static void* stonesense_thread(ALLEGRO_THREAD* main_thread, void* parms)
 
     stonesenseState.ssState.ScreenH = stonesenseState.ssConfig.config.defaultScreenHeight;
     stonesenseState.ssState.ScreenW = stonesenseState.ssConfig.config.defaultScreenWidth;
-    stonesenseState.ssState.Size = { DEFAULT_SIZE, DEFAULT_SIZE, DEFAULT_SIZE_Z };
+    stonesenseState.ssState.Size = { DEFAULT_SEGSIZE_XY, DEFAULT_SEGSIZE_XY, DEFAULT_SEGSIZE_Z };
     stonesenseState.timeToReloadConfig = true;
     stonesenseState.contentLoader = std::make_unique<ContentLoader>();
 
@@ -496,6 +507,12 @@ static void* stonesense_thread(ALLEGRO_THREAD* main_thread, void* parms)
     // init map segment wrapper and its lock, start the reload thread.
     initAutoReload();
 
+    if (ssConfig.autosize_segmentX) {
+        stonesenseState.ssState.Size.x = getAutoSegmentSize();
+    }
+    if (ssConfig.autosize_segmentY) {
+        stonesenseState.ssState.Size.y = getAutoSegmentSize();
+    }
     stonesenseState.timeToReloadSegment = false;
     // enter event loop here:
     main_loop(display, queue, main_thread, out);