Merge branch 'main' into CURA-12474_set-fixed-0-gap-for-brim-support

Author: rburema

include/TreeSupportBaseCircle.h

@@ -18,37 +18,27 @@ class TreeSupportBaseCircle
 {
 protected:
     inline static Polygon base_circle;
-    inline static bool circle_generated = false;
+    inline static std::once_flag flag;
 
 public:
     inline static constexpr int64_t base_radius = 50;
 
     static Polygon getBaseCircle()
     {
-        if (circle_generated)
-        {
-            return base_circle;
-        }
-        else
-        {
-            std::mutex critical_sections;
-            std::lock_guard<std::mutex> critical_section_progress(critical_sections);
-            if (circle_generated)
+        std::call_once(
+            flag,
+            [&]()
             {
-                return base_circle;
-            }
-
-            constexpr auto support_tree_circle_resolution = 12; // The number of vertices in each circle.
-            Polygon circle;
-            for (const uint64_t i : ranges::views::iota(0, support_tree_circle_resolution))
-            {
-                const AngleRadians angle = static_cast<double>(i) / support_tree_circle_resolution * TAU;
-                circle.emplace_back(static_cast<coord_t>(std::cos(angle) * base_radius), static_cast<coord_t>(std::sin(angle) * base_radius));
-            }
-            base_circle = Polygon(circle);
-            circle_generated = true;
-            return base_circle;
-        }
+                constexpr auto support_tree_circle_resolution = 12; // The number of vertices in each circle.
+                Polygon circle;
+                for (const uint64_t i : ranges::views::iota(0, support_tree_circle_resolution))
+                {
+                    const AngleRadians angle = static_cast<double>(i) / support_tree_circle_resolution * TAU;
+                    circle.emplace_back(static_cast<coord_t>(std::cos(angle) * base_radius), static_cast<coord_t>(std::sin(angle) * base_radius));
+                }
+                base_circle = Polygon(circle);
+            });
+        return base_circle;
     }
 };
 

stress_benchmark/stress_benchmark.cpp

@@ -17,6 +17,7 @@
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/io/wkt/read.hpp>
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 #include <spdlog/spdlog.h>
 
 #include "WallsComputation.h"