Update progress bar during simplex map smoothing operations

OpenLoco · Apr 10, 2024 · 3455f8c · 3455f8c
1 parent 630dbf8
commit 3455f8c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/OpenLoco/src/Map/MapGenerator/MapGenerator.cpp b/src/OpenLoco/src/Map/MapGenerator/MapGenerator.cpp
@@ -834,23 +834,23 @@ namespace OpenLoco::World::MapGenerator
             HeightMap heightMap(512, 512, 512);
 
             generateHeightMap(options, heightMap);
-            updateProgress(17);
+            updateProgress(25);
 
             generateLand(heightMap);
-            updateProgress(17);
+            updateProgress(35);
 
             generateWater(heightMap);
-            updateProgress(25);
+            updateProgress(45);
 
             generateTerrain(heightMap);
-            updateProgress(35);
+            updateProgress(55);
         }
 
         generateSurfaceVariation();
-        updateProgress(40);
+        updateProgress(65);
 
         generateTrees();
-        updateProgress(45);
+        updateProgress(75);
 
         generateTowns();
         updateProgress(225);

diff --git a/src/OpenLoco/src/Map/MapGenerator/SimplexTerrainGenerator.cpp b/src/OpenLoco/src/Map/MapGenerator/SimplexTerrainGenerator.cpp
@@ -1,5 +1,6 @@
 #include "SimplexTerrainGenerator.h"
 #include "S5/S5.h"
+#include "Ui/ProgressBar.h"
 #include <algorithm>
 
 using namespace OpenLoco::S5;
@@ -60,6 +61,8 @@ namespace OpenLoco::World::MapGenerator
     void SimplexTerrainGenerator::generate(const SimplexSettings& settings, HeightMapRange heightMap)
     {
         generateSimplex(settings, heightMap);
+        Ui::ProgressBar::setProgress(15);
+
         smooth(settings.smooth, heightMap);
     }
 
@@ -82,6 +85,12 @@ namespace OpenLoco::World::MapGenerator
 
     void SimplexTerrainGenerator::smooth(int32_t iterations, HeightMapRange heightMap)
     {
+        if (iterations == 0)
+            return;
+
+        const auto progressSteps = (25 - 15) / iterations;
+        auto currentProgress = 15;
+
         for (int32_t i = 0; i < iterations; i++)
         {
             auto copyHeight = heightMap;
@@ -100,6 +109,9 @@ namespace OpenLoco::World::MapGenerator
                     heightMap[{ x, y }] = total / 9;
                 }
             }
+
+            currentProgress += progressSteps;
+            Ui::ProgressBar::setProgress(currentProgress);
         }
     }