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

Author: rburema

CMakeLists.txt

@@ -279,7 +279,7 @@ if (ENABLE_THREADING)
     use_threads(CuraEngine)
 endif ()
 
-if (CMAKE_CXX_PLATFORM_ID STREQUAL "emscripten")
+if (EMSCRIPTEN)
     message(STATUS "Building for Emscripten")
     target_link_options(_CuraEngine
             PUBLIC
@@ -301,7 +301,7 @@ if (CMAKE_CXX_PLATFORM_ID STREQUAL "emscripten")
             $<$<CONFIG:Debug>:SHELL:-g3>
             $<$<CONFIG:Debug>:SHELL:-gsource-map>
             "SHELL:-lembind"
-            "SHELL:--embind-emit-tsd CuraEngine.d.ts"
+            "SHELL:--emit-tsd CuraEngine.d.ts"
     )
 endif ()
 

conanfile.py

@@ -133,8 +133,8 @@ def requirements(self):
         self.requires("boost/1.86.0")
         self.requires("rapidjson/cci.20230929")
         self.requires("stb/cci.20230920")
-        self.requires("spdlog/1.12.0")
-        self.requires("fmt/10.2.1")
+        self.requires("spdlog/1.15.1")
+        self.requires("fmt/11.1.3")
         self.requires("range-v3/0.12.0")
         self.requires("zlib/1.3.1")
         self.requires("mapbox-wagyu/0.5.0@ultimaker/stable")
@@ -190,6 +190,11 @@ def layout(self):
         self.cpp.build.includedirs = ["."]  # To package the generated headers
         self.cpp.package.libs = ["_CuraEngine"]
 
+        if self.settings.os == "Emscripten":
+            self.cpp.build.bin = ["CuraEngine.js"]
+            self.cpp.package.bin = ["CuraEngine.js"]
+            self.cpp.build.bindirs += ["CuraEngine"]
+
     def build(self):
         cmake = CMake(self)
         cmake.configure()

include/plugins/types.h

@@ -19,7 +19,7 @@ template<>
 struct formatter<cura::plugins::v0::SlotID>
 {
     template<typename FormatContext>
-    auto format(cura::plugins::v0::SlotID slot_id, FormatContext& ctx)
+    auto format(cura::plugins::v0::SlotID slot_id, FormatContext& ctx) const
     {
         std::string slot_name;
 
@@ -67,7 +67,7 @@ struct formatter<grpc::string_ref>
     }
 
     template<typename FormatContext>
-    auto format(const grpc::string_ref& str, FormatContext& ctx)
+    auto format(const grpc::string_ref& str, FormatContext& ctx) const
     {
         return format_to(ctx.out(), "{}", std::string_view{ str.data(), str.size() });
     }

include/settings/types/Duration.h

@@ -71,7 +71,7 @@ struct Duration
     double value_ = 0;
 };
 
-constexpr Duration operator"" _s(const long double seconds)
+constexpr Duration operator""_s(const long double seconds)
 {
     return Duration(static_cast<double>(seconds));
 }

include/settings/types/Ratio.h

@@ -32,7 +32,7 @@ struct Ratio : public utils::NumericFacade<double>
         : base_type{ static_cast<value_type>(numerator) / static_cast<value_type>(divisor) } {};
 };
 
-constexpr Ratio operator"" _r(const long double ratio)
+constexpr Ratio operator""_r(const long double ratio)
 {
     return { ratio };
 }

include/utils/Coord_t.h

@@ -16,19 +16,19 @@ namespace cura
 
 using coord_t = ClipperLib::cInt;
 
-static inline coord_t operator"" _mu(unsigned long long i)
+static inline coord_t operator""_mu(unsigned long long i)
 {
     return static_cast<coord_t>(i);
 }
 
 #define INT2MM(n) (static_cast<double>(n) / 1000.0)
 #define INT2MM2(n) (static_cast<double>(n) / 1000000.0)
-#define MM2INT(n) (static_cast<coord_t>((n)*1000 + 0.5 * (((n) > 0) - ((n) < 0))))
-#define MM2_2INT(n) (static_cast<coord_t>((n)*1000000 + 0.5 * (((n) > 0) - ((n) < 0))))
-#define MM3_2INT(n) (static_cast<coord_t>((n)*1000000000 + 0.5 * (((n) > 0) - ((n) < 0))))
+#define MM2INT(n) (static_cast<coord_t>((n) * 1000 + 0.5 * (((n) > 0) - ((n) < 0))))
+#define MM2_2INT(n) (static_cast<coord_t>((n) * 1000000 + 0.5 * (((n) > 0) - ((n) < 0))))
+#define MM3_2INT(n) (static_cast<coord_t>((n) * 1000000000 + 0.5 * (((n) > 0) - ((n) < 0))))
 
 #define INT2MICRON(n) ((n) / 1)
-#define MICRON2INT(n) ((n)*1)
+#define MICRON2INT(n) ((n) * 1)
 
 template<utils::floating_point FactorType>
 [[nodiscard]] inline coord_t lerp(coord_t a, coord_t b, FactorType t)

include/utils/format/filesystem_path.h

@@ -30,7 +30,7 @@ struct formatter<std::filesystem::path> : formatter<string_view>
     }
 
     template<typename FormatContext>
-    auto format(const std::filesystem::path& path, FormatContext& ctx)
+    auto format(const std::filesystem::path& path, FormatContext& ctx) const
     {
         return formatter<string_view>::format(anonymizePath(path.generic_string()), ctx);
     }

include/utils/format/thread_id.h

@@ -4,19 +4,19 @@
 #ifndef UTILS_FORMAT_THREAD_ID_H
 #define UTILS_FORMAT_THREAD_ID_H
 
-#include <fmt/core.h>
-
 #include <sstream>
 #include <string_view>
 #include <thread>
 
+#include <fmt/core.h>
+
 namespace fmt
 {
 template<>
 struct formatter<std::thread::id> : formatter<string_view>
 {
     template<typename FormatContext>
-    auto format(std::thread::id thread_id, FormatContext& ctx)
+    auto format(std::thread::id thread_id, FormatContext& ctx) const
     {
         std::ostringstream oss;
         oss << thread_id;

src/TreeSupportTipGenerator.cpp

@@ -66,7 +66,7 @@ TreeSupportTipGenerator::TreeSupportTipGenerator(const SliceMeshStorage& mesh, T
 
     if (max_overhang_speed < 2)
     {
-        max_overhang_insert_lag_ = std::numeric_limits<coord_t>::max();
+        max_overhang_insert_lag_ = std::numeric_limits<size_t>::max();
     }
     else
     {

src/WallToolPaths.cpp

@@ -131,7 +131,7 @@ const std::vector<VariableWidthLines>& WallToolPaths::generate()
     const Ratio wall_add_middle_threshold = std::max(1.0, std::min(99.0, 100.0 * min_odd_wall_line_width / wall_line_width_x)) / 100.0;
 
     const int wall_distribution_count = settings_.get<int>("wall_distribution_count");
-    const size_t max_bead_count = (inset_count_ < std::numeric_limits<coord_t>::max() / 2) ? 2 * inset_count_ : std::numeric_limits<coord_t>::max();
+    const size_t max_bead_count = (inset_count_ < std::numeric_limits<size_t>::max() / 2) ? 2 * inset_count_ : std::numeric_limits<size_t>::max();
     const auto beading_strat = BeadingStrategyFactory::makeStrategy(
         bead_width_0_,
         bead_width_x_,