Better tree support for pointy overhangs: Cradle Generation

CMakeLists.txt

@@ -174,6 +174,7 @@ set(engine_SRCS # Except main.cpp.
         src/geometry/Polyline.cpp
         src/geometry/ClosedPolyline.cpp
         src/geometry/MixedLinesSet.cpp
+        src/SupportCradle.cpp
 )
 
 add_library(_CuraEngine STATIC ${engine_SRCS} ${engine_PB_SRCS})

conandata.yml

@@ -1,4 +1,4 @@
-version: "5.10.0-beta.1"
+version: "5.10.0"
 commit: "unknown"
 requirements:
   - "scripta/[>=1.1.0]@ultimaker/testing"
@@ -7,4 +7,4 @@ requirements_arcus:
 requirements_plugins:
   - "curaengine_grpc_definitions/0.3.1"
 requirements_cura_resources:
-  - "cura_resources/5.10.0-beta.1"
+  - "cura_resources/5.10.0"

conanfile.py

@@ -23,7 +23,7 @@ class CuraEngineConan(ConanFile):
     exports = "LICENSE*"
     settings = "os", "compiler", "build_type", "arch"
     package_type = "application"
-    python_requires = "sentrylibrary/1.0.0", "npmpackage/[>=1.0.0]@ultimaker/np_637"
+    python_requires = "sentrylibrary/1.0.0", "npmpackage/[>=1.0.0]"
     python_requires_extend = "sentrylibrary.SentryLibrary"
 
     options = {
@@ -108,8 +108,6 @@ def validate(self):
 
     def build_requirements(self):
         self.test_requires("standardprojectsettings/[>=0.2.0]")
-        if self.options.enable_arcus or self.options.enable_plugins:
-            self.tool_requires("protobuf/3.21.12")
         if not self.conf.get("tools.build:skip_test", False, check_type=bool):
             self.test_requires("gtest/1.14.0")
         if self.options.enable_benchmarks:
@@ -126,16 +124,13 @@ def requirements(self):
                 self.requires(req)
         if self.options.enable_plugins:
             self.requires("neargye-semver/0.3.0")
-            self.requires("asio-grpc/2.9.2")
             for req in self.conan_data["requirements_plugins"]:
                 self.requires(req)
         if self.options.with_cura_resources:
             for req in self.conan_data["requirements_cura_resources"]:
                 self.requires(req)
-        if self.options.enable_arcus or self.options.enable_plugins:
-            self.requires("protobuf/3.21.12")
         self.requires("clipper/6.4.2@ultimaker/stable")
-        self.requires("boost/1.83.0")
+        self.requires("boost/1.86.0")
         self.requires("rapidjson/cci.20230929")
         self.requires("stb/cci.20230920")
         self.requires("spdlog/1.12.0")

include/FffGcodeWriter.h

@@ -11,6 +11,7 @@
 #include "FanSpeedLayerTime.h"
 #include "GCodePathConfig.h"
 #include "LayerPlanBuffer.h"
+#include "SupportInfillPart.h"
 #include "gcodeExport.h"
 #include "utils/LayerVector.h"
 #include "utils/NoCopy.h"
@@ -377,7 +378,7 @@ class FffGcodeWriter : public NoCopy
         const SliceMeshStorage& mesh,
         const size_t extruder_nr,
         const MeshPathConfigs& mesh_config,
-        const SliceLayerPart& part,
+        SliceLayerPart& part,
         LayerPlan& gcode_layer) const;
 
     /*!
@@ -448,7 +449,7 @@ class FffGcodeWriter : public NoCopy
         const SliceMeshStorage& mesh,
         const size_t extruder_nr,
         const MeshPathConfigs& mesh_config,
-        const SliceLayerPart& part) const;
+        SliceLayerPart& part) const;
 
     /*!
      * Generate the a spiralized wall for a given layer part.
@@ -649,12 +650,11 @@ class FffGcodeWriter : public NoCopy
      * layer.
      *
      * \param[in] storage Where the slice data is stored.
-     * \param[in] support_roof_outlines which polygons to generate roofs for.
-     * \param[in] current_roof_config config to be used.
+     * \param[in] support_roof_outlines Collection of polygons to generate roofs for.
      * \param gcodeLayer The initial planning of the g-code of the layer.
      * \return Whether any support skin was added to the layer plan.
      */
-    bool addSupportRoofsToGCode(const SliceDataStorage& storage, const Shape& support_roof_outlines, const GCodePathConfig& current_roof_config, LayerPlan& gcode_layer) const;
+    bool addSupportRoofsToGCode(const SliceDataStorage& storage, const std::vector<SupportInfillPart>& support_roof_outlines, LayerPlan& gcode_layer) const;
 
     /*!
      * Add the support bottoms to the layer plan \p gcodeLayer of the current

include/PathOrderOptimizer.h

@@ -229,6 +229,7 @@ class PathOrderOptimizer
 
         // For some Z seam types the start position can be pre-computed.
         // This is faster since we don't need to re-compute the start position at each step then.
+        precompute_start &= seam_config_.type_ == EZSeamType::RANDOM || seam_config_.type_ == EZSeamType::USER_SPECIFIED || seam_config_.type_ == EZSeamType::INTERNAL_SPECIFIED || seam_config_.type_ == EZSeamType::SHARPEST_CORNER;
         if (precompute_start)
         {
             for (auto& path : paths_)
@@ -622,7 +623,7 @@ class PathOrderOptimizer
             }
 
             const bool precompute_start = path->seam_config_.type_ == EZSeamType::RANDOM || path->seam_config_.type_ == EZSeamType::USER_SPECIFIED
-                                       || path->seam_config_.type_ == EZSeamType::SHARPEST_CORNER;
+                                       || path->seam_config_.type_ == EZSeamType::INTERNAL_SPECIFIED || seam_config_.type_ == EZSeamType::SHARPEST_CORNER;
             if (! path->is_closed_ || ! precompute_start) // Find the start location unless we've already precomputed it.
             {
                 path->start_vertex_ = findStartLocation(*path, start_position);
@@ -714,6 +715,14 @@ class PathOrderOptimizer
     {
         if (! path.is_closed_)
         {
+            if (seam_config_.type_ == EZSeamType::INTERNAL_SPECIFIED)
+            {
+                if(getDirectDistance(path.converted_->back(), seam_config_.pos_) < getDirectDistance(path.converted_->front(), seam_config_.pos_))
+                {
+                    return path.converted_->size() - 1; // Back end is closer.
+                }
+                return 0;
+            }
             // For polylines, the seam settings are not applicable. Simply choose the position closest to target_pos then.
             const coord_t back_distance
                 = (combing_boundary_ == nullptr) ? getDirectDistance(path.converted_->back(), target_pos) : getCombingDistance(path.converted_->back(), target_pos);

include/SkeletalTrapezoidationEdge.h

@@ -4,6 +4,7 @@
 #ifndef SKELETAL_TRAPEZOIDATION_EDGE_H
 #define SKELETAL_TRAPEZOIDATION_EDGE_H
 
+#include <cassert>
 #include <list>
 #include <memory> // smart pointers
 #include <vector>