Generate inwards moves according to the settings

CURA-12822

Author: wawanbreton

include/FffGcodeWriter.h

@@ -419,8 +419,14 @@ class FffGcodeWriter : public NoCopy
      * \param part The part for which to create gcode.
      * \return Whether this function added anything to the layer plan.
      */
-    bool processMultiLayerInfill(LayerPlan& gcodeLayer, const SliceMeshStorage& mesh, const size_t extruder_nr, const MeshPathConfigs& mesh_config, const SliceLayerPart& part)
-        const;
+    bool processMultiLayerInfill(
+        LayerPlan& gcodeLayer,
+        const SliceMeshStorage& mesh,
+        const size_t extruder_nr,
+        const MeshPathConfigs& mesh_config,
+        const SliceLayerPart& part,
+        const coord_t move_inwards_start,
+        const coord_t move_inwards_end) const;
 
     /*!
      * \brief Add normal sparse infill for a given part in a layer.
@@ -438,7 +444,9 @@ class FffGcodeWriter : public NoCopy
         const SliceMeshStorage& mesh,
         const size_t extruder_nr,
         const MeshPathConfigs& mesh_config,
-        const SliceLayerPart& part) const;
+        const SliceLayerPart& part,
+        const coord_t move_inwards_start,
+        const coord_t move_inwards_end) const;
 
     /*!
      * Generate the insets for the walls of a given layer part.

include/infill.h

@@ -59,6 +59,8 @@ class Infill
     size_t zag_skip_count_{}; //!< (ZigZag) To skip one zag in every N if skip some zags is enabled
     coord_t pocket_size_{}; //!< The size of the pockets at the intersections of the fractal in the cross 3d pattern
     bool mirror_offset_{}; //!< Indication in which offset direction the extra infill lines are made
+    coord_t move_inwards_start_{ 0 }; //!< Length of the inwards extrusion move to be added at infill start
+    coord_t move_inwards_end_{ 0 }; //!< Length of the inwards extrusion move to be added at infill end
 
     static constexpr auto one_over_sqrt_2 = 1.0 / std::numbers::sqrt2;
 
@@ -163,7 +165,9 @@ class Infill
         bool use_endpieces,
         bool skip_some_zags,
         size_t zag_skip_count,
-        coord_t pocket_size) noexcept
+        coord_t pocket_size,
+        const coord_t move_inwards_start = 0,
+        const coord_t move_inwards_end = 0) noexcept
         : pattern_{ pattern }
         , zig_zaggify_{ zig_zaggify }
         , connect_polygons_{ connect_polygons }
@@ -188,6 +192,8 @@ class Infill
         , zag_skip_count_{ zag_skip_count }
         , pocket_size_{ pocket_size }
         , mirror_offset_{ zig_zaggify }
+        , move_inwards_start_(move_inwards_start)
+        , move_inwards_end_(move_inwards_end)
     {
     }
 

src/FffGcodeWriter.cpp

@@ -1917,8 +1917,12 @@ bool FffGcodeWriter::processInfill(
     {
         return false;
     }
-    bool added_something = processMultiLayerInfill(gcode_layer, mesh, extruder_nr, mesh_config, part);
-    added_something = added_something | processSingleLayerInfill(storage, gcode_layer, mesh, extruder_nr, mesh_config, part);
+
+    const coord_t infill_move_inwards_start = mesh.settings.get<coord_t>("infill_move_inwards_start");
+    const coord_t infill_move_inwards_end = mesh.settings.get<coord_t>("infill_move_inwards_end");
+
+    bool added_something = processMultiLayerInfill(gcode_layer, mesh, extruder_nr, mesh_config, part, infill_move_inwards_start, infill_move_inwards_end);
+    added_something = added_something | processSingleLayerInfill(storage, gcode_layer, mesh, extruder_nr, mesh_config, part, infill_move_inwards_start, infill_move_inwards_end);
     return added_something;
 }
 
@@ -1927,7 +1931,9 @@ bool FffGcodeWriter::processMultiLayerInfill(
     const SliceMeshStorage& mesh,
     const size_t extruder_nr,
     const MeshPathConfigs& mesh_config,
-    const SliceLayerPart& part) const
+    const SliceLayerPart& part,
+    const coord_t move_inwards_start,
+    const coord_t move_inwards_end) const
 {
     if (extruder_nr != mesh.settings.get<ExtruderTrain&>("infill_extruder_nr").extruder_nr_)
     {
@@ -2010,7 +2016,9 @@ bool FffGcodeWriter::processMultiLayerInfill(
                 use_endpieces,
                 skip_some_zags,
                 zag_skip_count,
-                mesh.settings.get<coord_t>("cross_infill_pocket_size"));
+                mesh.settings.get<coord_t>("cross_infill_pocket_size"),
+                move_inwards_start,
+                move_inwards_end);
             infill_comp.generate(
                 infill_paths,
                 infill_polygons,
@@ -2457,7 +2465,9 @@ bool FffGcodeWriter::processSingleLayerInfill(
     const SliceMeshStorage& mesh,
     const size_t extruder_nr,
     const MeshPathConfigs& mesh_config,
-    const SliceLayerPart& part) const
+    const SliceLayerPart& part,
+    const coord_t move_inwards_start,
+    const coord_t move_inwards_end) const
 {
     if (extruder_nr != mesh.settings.get<ExtruderTrain&>("infill_extruder_nr").extruder_nr_)
     {
@@ -2609,7 +2619,9 @@ bool FffGcodeWriter::processSingleLayerInfill(
                 use_endpieces,
                 skip_some_zags,
                 zag_skip_count,
-                pocket_size);
+                pocket_size,
+                move_inwards_start,
+                move_inwards_end);
             infill_comp.generate(
                 wall_tool_paths.back(),
                 infill_polygons,
@@ -2674,7 +2686,9 @@ bool FffGcodeWriter::processSingleLayerInfill(
             use_endpieces,
             skip_some_zags,
             zag_skip_count,
-            pocket_size);
+            pocket_size,
+            move_inwards_start,
+            move_inwards_end);
         infill_comp.generate(
             wall_tool_paths.back(),
             infill_polygons,

src/infill.cpp

@@ -343,19 +343,36 @@ void Infill::_generate(
         connectLines(result_lines);
     }
 
-    for (OpenPolyline& infill_line : result_lines)
+    if (move_inwards_start_ != 0 || move_inwards_end_ != 0)
     {
-        auto inner_contour_offset = inner_contour_.offset(-infill_line_width_ * 2);
-
-        auto last_point = infill_line.back();
-        const auto last_point_polygon = PolygonUtils::moveInside2(inner_contour_offset, last_point);
-
-        infill_line.push_back(last_point_polygon.location_);
+        // Add the start/end inwards moves
+        const Shape offsetted_contour_start = move_inwards_start_ != 0 ? inner_contour_.offset(-move_inwards_start_) : Shape();
+        Shape offsetted_contour_end;
+        if (move_inwards_end_ == move_inwards_start_)
+        {
+            offsetted_contour_end = offsetted_contour_start;
+        }
+        else if (move_inwards_end_ != 0)
+        {
+            offsetted_contour_end = inner_contour_.offset(-move_inwards_end_);
+        }
 
+        for (OpenPolyline& infill_line : result_lines)
+        {
+            if (! offsetted_contour_end.empty())
+            {
+                auto last_point = infill_line.back();
+                const auto last_point_polygon = PolygonUtils::moveInside2(offsetted_contour_end, last_point);
+                infill_line.push_back(last_point_polygon.location_);
+            }
 
-        auto first_point = infill_line.front();
-        const auto first_point_polygon = PolygonUtils::moveInside2(inner_contour_offset, first_point);
-        infill_line.insert(infill_line.begin(), first_point_polygon.location_);
+            if (! offsetted_contour_start.empty())
+            {
+                auto first_point = infill_line.front();
+                const auto first_point_polygon = PolygonUtils::moveInside2(offsetted_contour_start, first_point);
+                infill_line.insert(infill_line.begin(), first_point_polygon.location_);
+            }
+        }
     }
 
     Simplify simplifier(max_resolution_, max_deviation_, 0);