Merge remote-tracking branch 'origin/main' into CURA-12580_paint-on-support

Author: wawanbreton

CMakeLists.txt

@@ -65,6 +65,7 @@ set(engine_SRCS # Except main.cpp.
         src/multiVolumes.cpp
         src/path_ordering.cpp
         src/PathAdapter.cpp
+        src/PathOrderMonotonic.cpp
         src/Preheat.cpp
         src/PrimeTower/PrimeTower.cpp
         src/PrimeTower/PrimeTowerNormal.cpp
@@ -177,13 +178,16 @@ set(engine_SRCS # Except main.cpp.
         src/geometry/Point3LL.cpp
         src/geometry/Polygon.cpp
         src/geometry/Shape.cpp
+        src/geometry/PointMatrix.cpp
         src/geometry/PointsSet.cpp
         src/geometry/SingleShape.cpp
         src/geometry/PartsView.cpp
         src/geometry/LinesSet.cpp
         src/geometry/Polyline.cpp
         src/geometry/ClosedPolyline.cpp
         src/geometry/MixedLinesSet.cpp
+
+        src/geometry/conversions/Point2D_Point2LL.cpp
 )
 
 add_library(_CuraEngine STATIC ${engine_SRCS} ${engine_PB_SRCS})
@@ -235,9 +239,9 @@ find_package(fmt REQUIRED)
 find_package(range-v3 REQUIRED)
 find_package(scripta REQUIRED)
 find_package(PNG REQUIRED)
-if(NOT EMSCRIPTEN)
+if (NOT EMSCRIPTEN)
     find_package(TBB REQUIRED)
-endif()
+endif ()
 
 if (ENABLE_SENTRY)
     find_package(sentry REQUIRED)

conandata.yml

@@ -1,4 +1,4 @@
-version: "5.11.0"
+version: "5.12.0-alpha.0"
 commit: "unknown"
 requirements:
   - "scripta/[>=1.1.0]@ultimaker/testing"
@@ -9,4 +9,4 @@ requirements_arcus:
 requirements_plugins:
   - "curaengine_grpc_definitions/0.3.2"
 requirements_cura_resources:
-  - "cura_resources/5.11.0"
+  - "cura_resources/5.12.0-alpha.0"

include/FffGcodeWriter.h

@@ -11,6 +11,7 @@
 #include "FanSpeedLayerTime.h"
 #include "GCodePathConfig.h"
 #include "LayerPlanBuffer.h"
+#include "LinesOrderingMethod.h"
 #include "gcodeExport.h"
 #include "utils/LayerVector.h"
 #include "utils/NoCopy.h"
@@ -417,10 +418,18 @@ class FffGcodeWriter : public NoCopy
      * mesh which should be printed with this extruder.
      * \param mesh_config The line config with which to print a print feature.
      * \param part The part for which to create gcode.
+     * \param start_move_inwards_length The length of the extra inwards moves to be added at the start of each infill line
+     * \param end_move_inwards_length The length of the extra inwards moves to be added at the end of each infill line
      * \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 start_move_inwards_length = 0,
+        const coord_t end_move_inwards_length = 0) const;
 
     /*!
      * \brief Add normal sparse infill for a given part in a layer.
@@ -430,6 +439,8 @@ class FffGcodeWriter : public NoCopy
      * mesh which should be printed with this extruder
      * \param mesh_config The line config with which to print a print feature.
      * \param part The part for which to create gcode.
+     * \param start_move_inwards_length The length of the extra inwards moves to be added at the start of each infill line
+     * \param end_move_inwards_length The length of the extra inwards moves to be added at the end of each infill line
      * \return Whether this function added anything to the layer plan.
      */
     bool processSingleLayerInfill(
@@ -438,7 +449,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 start_move_inwards_length = 0,
+        const coord_t end_move_inwards_length = 0) const;
 
     /*!
      * Generate the insets for the walls of a given layer part.
@@ -579,6 +592,7 @@ class FffGcodeWriter : public NoCopy
      * minimise travel moves (``false``).
      * \param[out] added_something Whether this function added anything to the layer plan
      * \param fan_speed fan speed override for this skin area
+     * \param forced_small_area_width A specific value to be used for small_area_width when generating the infill, or nullopt to use the normal value
      */
     void processSkinPrintFeature(
         const SliceDataStorage& storage,
@@ -591,10 +605,11 @@ class FffGcodeWriter : public NoCopy
         const AngleDegrees skin_angle,
         const coord_t skin_overlap,
         const Ratio skin_density,
-        const bool monotonic,
+        const LinesOrderingMethod ordering,
         const bool is_roofing_flooring,
         bool& added_something,
-        double fan_speed = GCodePathConfig::FAN_SPEED_DEFAULT) const;
+        double fan_speed = GCodePathConfig::FAN_SPEED_DEFAULT,
+        std::optional<coord_t> forced_small_area_width = std::nullopt) const;
 
     /*!
      *  see if we can avoid printing a lines or zig zag style skin part in multiple segments by moving to

include/LayerPlan.h

@@ -37,6 +37,7 @@ namespace cura
 class Comb;
 class SliceDataStorage;
 class LayerPlanBuffer;
+class STHalfEdge;
 
 template<typename PathType>
 class PathAdapter;
@@ -511,6 +512,7 @@ class LayerPlan : public NoCopy
      * If unset, this causes it to start near the last planned location.
      * \param scarf_seam Indicates whether we may use a scarf seam for the path
      * \param smooth_speed Indicates whether we may use a speed gradient for the path
+     * \param texture_data_provider The texture provider to be used to place the seam
      */
     void addPolygonsByOptimizer(
         const Shape& polygons,
@@ -524,7 +526,29 @@ class LayerPlan : public NoCopy
         bool reverse_order = false,
         const std::optional<Point2LL> start_near_location = std::optional<Point2LL>(),
         bool scarf_seam = false,
-        bool smooth_acceleration = false);
+        bool smooth_speed = false,
+        const std::shared_ptr<TextureDataProvider>& texture_data_provider = nullptr);
+
+    /*!
+     * Adds infill polygons to the gcode with optimized order.
+     *
+     * In case we need to generate extra inwards moves for the infill, we cannot treat them as polygons anymore, since the lines will be un-closed. Thus, the resulting open
+     * polylines are returned in \p remaining_lines and should be re-added to the gcode, e.g. by using addLinesByOptimizer().
+     *
+     * @param polygons The infill polygons to be added
+     * @param[out] remaining_lines The list to be filled with generates open polylines. The given list may be non-empty, only new lines will be appended.     * @param config The
+     * config with which to print the polygon lines
+     * @param settings The current settings to retrieve values from
+     * @param add_extra_inwards_move Indicates whether extra start/end inwards extrusion moves will be generated
+     * @param near_start_location Optional: Location near where to add the first line. If not provided the last position is used.
+     */
+    void addInfillPolygonsByOptimizer(
+        const Shape& polygons,
+        OpenLinesSet& remaining_lines,
+        const GCodePathConfig& config,
+        const Settings& settings,
+        const bool add_extra_inwards_move = false,
+        const std::optional<Point2LL>& near_start_location = std::optional<Point2LL>());
 
     /*!
      * Add a single line that is part of a wall to the gcode.
@@ -685,6 +709,9 @@ class LayerPlan : public NoCopy
      * \param fan_speed optional fan speed override for this path
      * \param reverse_print_direction Whether to reverse the optimized order and their printing direction.
      * \param order_requirements Pairs where first needs to be printed before second. Pointers are pointing to elements of \p lines
+     * \param extra_inwards_start_move_length The length of the extra inwards moves to be added at the start of each infill line
+     * \param extra_inwards_end_move_length The length of the extra inwards moves to be added at the end of each infill line
+     * \param extra_inwards_move_contour The contour to be considered in order to add the inwards moves
      */
     template<class LineType>
     void addLinesByOptimizer(
@@ -697,7 +724,10 @@ class LayerPlan : public NoCopy
         const std::optional<Point2LL> near_start_location = std::optional<Point2LL>(),
         const double fan_speed = GCodePathConfig::FAN_SPEED_DEFAULT,
         const bool reverse_print_direction = false,
-        const std::unordered_multimap<const Polyline*, const Polyline*>& order_requirements = PathOrderOptimizer<const Polyline*>::no_order_requirements_);
+        const std::unordered_multimap<const Polyline*, const Polyline*>& order_requirements = PathOrderOptimizer<const Polyline*>::no_order_requirements_,
+        const coord_t extra_inwards_start_move_length = 0,
+        const coord_t extra_inwards_end_move_length = 0,
+        const Shape& extra_inwards_move_contour = Shape());
 
     /*!
      * Add lines to the gcode with optimized order.
@@ -755,7 +785,8 @@ class LayerPlan : public NoCopy
         const coord_t exclude_distance = 0,
         const coord_t wipe_dist = 0,
         const Ratio flow_ratio = 1.0_r,
-        const double fan_speed = GCodePathConfig::FAN_SPEED_DEFAULT);
+        const double fan_speed = GCodePathConfig::FAN_SPEED_DEFAULT,
+        const bool interlaced = false);
 
     /*!
      * Add a spiralized slice of wall that is interpolated in X/Y between \p last_wall and \p wall.
@@ -868,14 +899,55 @@ class LayerPlan : public NoCopy
      * \param wipe_dist (optional) the distance wiped without extruding after laying down a line.
      * \param flow_ratio The ratio with which to multiply the extrusion amount
      * \param fan_speed optional fan speed override for this path
+     * \param extra_inwards_start_move_length The length of the extra inwards moves to be added at the start of each infill line
+     * \param extra_inwards_end_move_length The length of the extra inwards moves to be added at the end of each infill line
+     * \param extra_inwards_move_contour The contour to be considered in order to add the inwards moves
      */
     void addLinesInGivenOrder(
         const std::vector<PathOrdering<const Polyline*>>& lines,
         const GCodePathConfig& config,
         const SpaceFillType space_fill_type,
         const coord_t wipe_dist,
         const Ratio flow_ratio,
-        const double fan_speed);
+        const double fan_speed,
+        const coord_t extra_inwards_start_move_length = 0,
+        const coord_t extra_inwards_end_move_length = 0,
+        const Shape& extra_inwards_move_contour = Shape());
+
+    /*!
+     * Add order optimized polygons to the gcode.
+     * Add polygons to the gcode with optimized order.
+     *
+     * \param polygons The polygons.
+     * \param config The config with which to print the polygon lines.
+     * for each given segment (optionally nullptr).
+     * \param settings The settings which should apply to these polygons added to the layer plan
+     * \param z_seam_config Optional configuration for z-seam.
+     * \param wall_0_wipe_dist The distance to travel along each polygon after
+     * it has been laid down, in order to wipe the start and end of the wall
+     * together.
+     * \param spiralize Whether to gradually increase the z height from the
+     * normal layer height to the height of the next layer over each polygon
+     * printed.
+     * \param flow_ratio The ratio with which to multiply the extrusion amount.
+     * \param always_retract Whether to force a retraction when moving to the
+     * start of the polygon (used for outer walls).
+     * \param reverse_order Adds polygons in reverse order.
+     * \param scarf_seam Indicates whether we may use a scarf seam for the path
+     * \param smooth_speed Indicates whether we may use a speed gradient for the path
+     */
+    void addPolygonsInGivenOrder(
+        const std::vector<PathOrdering<const Polygon*>>& polygons,
+        const GCodePathConfig& config,
+        const Settings& settings,
+        const ZSeamConfig& z_seam_config = ZSeamConfig(),
+        coord_t wall_0_wipe_dist = 0,
+        bool spiralize = false,
+        const Ratio flow_ratio = 1.0_r,
+        bool always_retract = false,
+        bool reverse_order = false,
+        bool scarf_seam = false,
+        bool smooth_speed = false);
 
     /*!
      *  @brief Send a GCodePath line to the communication object, applying proper Z offsets
@@ -1148,6 +1220,16 @@ class LayerPlan : public NoCopy
         const std::optional<TravelAntiOozing>& priming_amounts,
         const Velocity& speed,
         const size_t point_index);
+
+    /*!
+     * Generates an extrusion move that goes as inwards as possible given a skeletized contour, starting from the given point
+     * @param trapezoidal_edges The edges of the skeletal trapezoidation for the contour
+     * @param start_point The point to start generating the move from
+     * @param move_inwards_length The length of the move to be generated
+     * @return Extrusion path to be started from the given start point, going further inwards. It may be empty if not possible or if the start point is
+     *         already inwards the contour enough.
+     */
+    static OpenPolyline makeInwardsMove(const std::list<STHalfEdge>& trapezoidal_edges, const Point2LL& start_point, const coord_t move_inwards_length);
 };
 
 } // namespace cura

include/LinesOrderingMethod.h

@@ -0,0 +1,20 @@
+// Copyright (c) 2025 UltiMaker
+// CuraEngine is released under the terms of the AGPLv3 or higher
+
+#ifndef LINES_ORDERING_METHOD_H
+#define LINES_ORDERING_METHOD_H
+
+
+namespace cura
+{
+
+enum class LinesOrderingMethod
+{
+    Basic, // Lines are ordered by shortest distance
+    Monotonic, // Lines are ordered so that they will always form a continuous print along a direction
+    Interlaced, // Similar to monotonic, but with 2 passes so that adjacent lines will not be printed just after each other
+};
+
+} // namespace cura
+
+#endif

include/MeshMaterialSplitter.h

@@ -15,10 +15,9 @@ namespace MeshMaterialSplitter
 
 /*!
  * Generate a modifier mesh for every extruder other than 0, that has some user-painted texture data
- * @param mesh The mesh being sliced
- * @param meshgroup The group to add the modifier meshes to
+ * @param meshgroup The group to take the sliced meshes from and add the modifier meshes to
  */
-void makePaintingModifierMeshes(const Mesh& mesh, MeshGroup* meshgroup);
+void makePaintingModifierMeshes(MeshGroup* meshgroup);
 
 } // namespace MeshMaterialSplitter