Merge remote-tracking branch 'origin/5.9'

CMakeLists.txt

@@ -189,6 +189,7 @@ target_compile_definitions(_CuraEngine
         $<$<AND:$<BOOL:${ENABLE_PLUGINS}>,$<BOOL:${ENABLE_REMOTE_PLUGINS}>>:ENABLE_REMOTE_PLUGINS>
         $<$<BOOL:${OLDER_APPLE_CLANG}>:OLDER_APPLE_CLANG>
         CURA_ENGINE_VERSION=\"${CURA_ENGINE_VERSION}\"
+        CURA_ENGINE_HASH=\"${CURA_ENGINE_HASH}\"
         $<$<BOOL:${ENABLE_TESTING}>:BUILD_TESTS>
         PRIVATE
         $<$<BOOL:${WIN32}>:NOMINMAX>

conandata.yml

@@ -1,9 +1,10 @@
-version: "5.9.0-alpha.0"
+version: "5.9.0-beta.1"
+commit: "unknown"
 requirements:
   - "scripta/0.1.0@ultimaker/testing"
 requirements_arcus:
   - "arcus/5.4.1"
 requirements_plugins:
   - "curaengine_grpc_definitions/0.2.1"
 requirements_cura_resources:
-  - "cura_resources/(latest)@ultimaker/testing"
+  - "cura_resources/5.9.0-beta.1"

conanfile.py

@@ -140,6 +140,7 @@ def generate(self):
 
         tc = CMakeToolchain(self)
         tc.variables["CURA_ENGINE_VERSION"] = self.version
+        tc.variables["CURA_ENGINE_HASH"] = self.conan_data["commit"]
         tc.variables["ENABLE_ARCUS"] = self.options.enable_arcus
         tc.variables["ENABLE_TESTING"] = not self.conf.get("tools.build:skip_test", False, check_type=bool)
         tc.variables["ENABLE_BENCHMARKS"] = self.options.enable_benchmarks

include/InsetOrderOptimizer.h

@@ -59,7 +59,8 @@ class InsetOrderOptimizer
         const Point2LL& model_center_point,
         const Shape& disallowed_areas_for_seams = {},
         const bool scarf_seam = false,
-        const bool smooth_speed = false);
+        const bool smooth_speed = false,
+        const Shape& overhang_areas = Shape());
 
     /*!
      * Adds the insets to the given layer plan.
@@ -114,6 +115,7 @@ class InsetOrderOptimizer
     Shape disallowed_areas_for_seams_;
     const bool scarf_seam_;
     const bool smooth_speed_;
+    Shape overhang_areas_;
 
     std::vector<std::vector<const Polygon*>> inset_polys_; // vector of vectors holding the inset polygons
     Shape retraction_region_; // After printing an outer wall, move into this region so that retractions do not leave visible blobs. Calculated lazily if needed (see
@@ -128,7 +130,7 @@ class InsetOrderOptimizer
      *
      * \param closed_line The polygon to insert the seam point in. (It's assumed to be closed at least.)
      *
-     * \return The index of the inserted seam point, or std::nullopt if no seam point was inserted.
+     * \return The index of the inserted seam point, or the index of the closest point if an existing one can be used.
      */
     std::optional<size_t> insertSeamPoint(ExtrusionLine& closed_line);
 

include/LayerPlan.h

@@ -298,6 +298,11 @@ class LayerPlan : public NoCopy
      */
     void setSeamOverhangMask(const Shape& polys);
 
+    /*!
+     * Get the seam overhang mask, which contains the areas where we don't want to place the seam because they are overhanding
+     */
+    const Shape& getSeamOverhangMask() const;
+
     /*!
      * Set roofing_mask.
      *
@@ -677,50 +682,6 @@ class LayerPlan : public NoCopy
         const bool is_top_layer,
         const bool is_bottom_layer);
 
-
-    /*!
-     * Given a wall polygon and a start vertex index, return the index of the first vertex that is supported (is not above air)
-     *
-     * Uses bridge_wall_mask and overhang_mask to determine where there is air below
-     *
-     * \param wall The wall polygon
-     * \param start_idx The index of the starting vertex of \p wall
-     * \return The index of the first supported vertex - if no vertices are supported, start_idx is returned
-     */
-    template<typename T>
-    size_t locateFirstSupportedVertex(const T& wall, const size_t start_idx) const
-    {
-        if (bridge_wall_mask_.empty() && seam_overhang_mask_.empty())
-        {
-            return start_idx;
-        }
-
-        const auto air_below = bridge_wall_mask_.unionPolygons(seam_overhang_mask_);
-
-        size_t curr_idx = start_idx;
-
-        while (true)
-        {
-            const Point2LL& vertex = cura::make_point(wall[curr_idx]);
-            if (! air_below.inside(vertex, true))
-            {
-                // vertex isn't above air so it's OK to use
-                return curr_idx;
-            }
-
-            if (++curr_idx >= wall.size())
-            {
-                curr_idx = 0;
-            }
-
-            if (curr_idx == start_idx)
-            {
-                // no vertices are supported so just return the original index
-                return start_idx;
-            }
-        }
-    }
-
     /*!
      * Write the planned paths to gcode
      *
@@ -942,6 +903,13 @@ class LayerPlan : public NoCopy
      * \return The distance from the start of the current wall line to the first bridge segment
      */
     coord_t computeDistanceToBridgeStart(const ExtrusionLine& wall, const size_t current_index, const coord_t min_bridge_line_len) const;
+
+    /*!
+     * \brief Calculates whether the given segment is to be treated as overhanging
+     * \param p0 The start point of the segment
+     * \param p1 The end point of the segment
+     */
+    bool segmentIsOnOverhang(const Point3LL& p0, const Point3LL& p1) const;
 };
 
 } // namespace cura