Split SEGMENTSIZE_XY and add an autosize config

Config.cpp

@@ -1,3 +1,4 @@
+#include <cmath>
 #include <iostream>
 #include <fstream>
 #include <string>
@@ -83,26 +84,59 @@ namespace {
             string result = parseStrFromLine("WINDOWED", line);
             ssConfig.Fullscreen = (result == "NO");
         }
+        int autoSegForXY = (int)std::ceil(std::sqrt(2) * (ssState.ScreenW + ssState.ScreenH) / TILEWIDTH);
         if (line.find("[SEGMENTSIZE_XY") != string::npos) {
-            int value = parseIntFromLine("SEGMENTSIZE_XY", line);
-            if (value < 1) {
-                value = DEFAULT_SIZE;
+            bool autosize = (parseStrFromLine("SEGMENTSIZE_XY", line) == "AUTO");
+            int value = DEFAULT_SEGSIZE_XY;
+            if (autosize) {
+                value = autoSegForXY;
+            } else {
+                value = parseIntFromLine("SEGMENTSIZE_XY", line);
+                value = ((value < MIN_SEGSIZE) ? DEFAULT_SEGSIZE_XY : value);
+                value = ((value > MAX_SEGSIZE) ? MAX_SEGSIZE : value);
             }
-            if (value > 100) {
-                value = 100;
+            //plus 2 to allow edge readings
+            value += 2;
+            ssState.Size.x = value;
+            ssState.Size.y = value;
+        }
+        if (line.find("[SEGMENTSIZE_X") != string::npos) {
+            bool autosize = (parseStrFromLine("SEGMENTSIZE_X", line) == "AUTO");
+            int value = DEFAULT_SEGSIZE_XY;
+            if (autosize) {
+                value = autoSegForXY;
+            }
+            else {
+                value = parseIntFromLine("SEGMENTSIZE_X", line);
+                value = ((value < MIN_SEGSIZE) ? DEFAULT_SEGSIZE_XY : value);
+                value = ((value > MAX_SEGSIZE) ? MAX_SEGSIZE : value);
             }
             //plus 2 to allow edge readings
-            ssState.Size.x = value + 2;
-            ssState.Size.y = value + 2;
+            value += 2;
+            ssState.Size.x = value;
+        }
+        if (line.find("[SEGMENTSIZE_Y") != string::npos) {
+            bool autosize = (parseStrFromLine("SEGMENTSIZE_Y", line) == "AUTO");
+            int value = DEFAULT_SEGSIZE_XY;
+            if (autosize) {
+                value = autoSegForXY;
+            }
+            else {
+                value = parseIntFromLine("SEGMENTSIZE_Y", line);
+                value = ((value < MIN_SEGSIZE) ? DEFAULT_SEGSIZE_XY : value);
+                value = ((value > MAX_SEGSIZE) ? MAX_SEGSIZE : value);
+            }
+            //plus 2 to allow edge readings
+            value += 2;
+            ssState.Size.y = value;
         }
         if (line.find("[SEGMENTSIZE_Z") != string::npos) {
             int value = parseIntFromLine("SEGMENTSIZE_Z", line);
             if (value < 1) {
-                value = DEFAULT_SIZE_Z;
+                value = DEFAULT_SEGSIZE_Z;
             }
             ssState.Size.z = value;
         }
-
         if (line.find("[ALLCREATURES") != string::npos) {
             string result = parseStrFromLine("ALLCREATURES", line);
             ssConfig.show_all_creatures = (result == "YES");

common.h

@@ -88,8 +88,10 @@ constexpr auto SPRITEWIDTH = TILEWIDTH;
 constexpr auto SPRITEHEIGHT = (TILETOPHEIGHT + WALLHEIGHT);
 constexpr auto WALL_CUTOFF_HEIGHT = 15;
 
-constexpr auto DEFAULT_SIZE = 20;
-constexpr auto DEFAULT_SIZE_Z = 6;
+constexpr auto MIN_SEGSIZE = 1;
+constexpr auto MAX_SEGSIZE = 100;;
+constexpr auto DEFAULT_SEGSIZE_XY = 20;
+constexpr auto DEFAULT_SEGSIZE_Z = 6;
 constexpr auto MAPNAVIGATIONSTEP = 1;
 constexpr auto MAPNAVIGATIONSTEPBIG = 10;
 

commonTypes.h

@@ -143,6 +143,7 @@ class dfColors
 
 struct GameConfiguration {
     bool overlay_mode;
+    bool autosize_segment;
     bool show_zones;
     bool show_stockpiles;
     bool show_designations;

configs/init.txt

@@ -12,9 +12,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:70]
+[SEGMENTSIZE_Y:70]
 [SEGMENTSIZE_Z:4]
 
 Change this to off to skip the intro.

main.cpp

@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <cmath>
 #include <vector>
 #include <list>
 
@@ -340,6 +341,11 @@ static void main_loop(ALLEGRO_DISPLAY * display, ALLEGRO_EVENT_QUEUE *queue, ALL
             case ALLEGRO_EVENT_DISPLAY_RESIZE:
                 if (ssConfig.overlay_mode) {
                     break;
+
+                }
+                if (ssConfig.autosize_segment) {
+                    ssState.Size.x = (int)std::ceil(std::sqrt(2) * (ssState.ScreenW + ssState.ScreenH) / TILEWIDTH);
+                    ssState.Size.y = (int)std::ceil(std::sqrt(2) * (ssState.ScreenW + ssState.ScreenH) / TILEWIDTH);
                 }
                 timeToReloadSegment = true;
                 redraw = true;
@@ -400,15 +406,16 @@ static void * stonesense_thread(ALLEGRO_THREAD * main_thread, void * parms)
     ssConfig.shade_hidden_tiles = true;
     ssConfig.load_ground_materials = true;
     ssConfig.automatic_reload_time = 0;
+    ssConfig.autosize_segment = false;
     ssConfig.automatic_reload_step = 500;
     ssConfig.lift_segment_offscreen_x = 0;
     ssConfig.lift_segment_offscreen_y = 0;
     ssConfig.Fullscreen = FULLSCREEN;
     ssState.ScreenH = RESOLUTION_HEIGHT;
     ssState.ScreenW = RESOLUTION_WIDTH;
-    ssState.Size.x = DEFAULT_SIZE;
-    ssState.Size.y = DEFAULT_SIZE;
-    ssState.Size.z = DEFAULT_SIZE_Z;
+    ssState.Size.x = DEFAULT_SEGSIZE_XY;
+    ssState.Size.y = DEFAULT_SEGSIZE_XY;
+    ssState.Size.z = DEFAULT_SEGSIZE_Z;
     ssConfig.show_creature_names = false;
     ssConfig.show_osd = true;
     ssConfig.show_designations = true;