Merge branch 'main' into CURA-12814

Author: HellAholic

CMakeLists.txt

@@ -43,7 +43,6 @@ endif ()
 
 set(engine_SRCS # Except main.cpp.
         src/Application.cpp
-        src/bridge.cpp
         src/ConicalOverhang.cpp
         src/ExtruderPlan.cpp
         src/ExtruderTrain.cpp
@@ -65,6 +64,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
@@ -98,6 +98,12 @@ set(engine_SRCS # Except main.cpp.
         src/BeadingStrategy/WideningBeadingStrategy.cpp
         src/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp
 
+        src/bridge/bridge.cpp
+        src/bridge/ExpansionRange.cpp
+        src/bridge/SegmentOverlappingData.cpp
+        src/bridge/TransformedSegment.cpp
+        src/bridge/TransformedShape.cpp
+
         src/communication/ArcusCommunication.cpp
         src/communication/ArcusCommunicationPrivate.cpp
         src/communication/CommandLine.cpp
@@ -177,6 +183,7 @@ 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

doc/bridging_skin_support.svg

@@ -42,7 +42,7 @@ class ExtruderPlan
     FRIEND_TEST(ExtruderPlanPathsParameterizedTest, BackPressureCompensationFull);
     FRIEND_TEST(ExtruderPlanPathsParameterizedTest, BackPressureCompensationHalf);
     FRIEND_TEST(ExtruderPlanTest, BackPressureCompensationEmptyPlan);
-    friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
+    friend class DISABLED_FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
 #endif
 public:
     size_t extruder_nr_{ 0 }; //!< The extruder used for this paths in the current plan.

include/ExtruderPlan.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"
@@ -38,7 +39,7 @@ struct MeshPathConfigs;
 class FffGcodeWriter : public NoCopy
 {
     friend class FffProcessor; // Because FffProcessor exposes finalize (TODO)
-    friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
+    friend class DISABLED_FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
 
 private:
     coord_t max_object_height; //!< The maximal height of all previously sliced meshgroups, used to avoid collision when moving to the next meshgroup to print.
@@ -591,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,
@@ -603,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
@@ -746,9 +749,8 @@ class FffGcodeWriter : public NoCopy
      * \param mesh the mesh containing the layer of interest
      * \param part \param part The part for which to create gcode
      * \param infill_line_width line width of the infill
-     * \return true if there needs to be a skin edge support wall in this layer, otherwise false
      */
-    static bool partitionInfillBySkinAbove(
+    static void partitionInfillBySkinAbove(
         Shape& infill_below_skin,
         Shape& infill_not_below_skin,
         const LayerPlan& gcode_layer,

include/FffGcodeWriter.h

@@ -57,7 +57,7 @@ class LayerPlan : public NoCopy
     friend class LayerPlanBuffer;
 #ifdef BUILD_TESTS
     friend class AddTravelTest;
-    friend class FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
+    friend class DISABLED_FffGcodeWriterTest_SurfaceGetsExtraInfillLinesUnderIt_Test;
     friend class AntiOozeAmountsTest;
     FRIEND_TEST(AntiOozeAmountsTest, ComputeAntiOozeAmounts);
 #endif
@@ -167,6 +167,8 @@ class LayerPlan : public NoCopy
 
     bool min_layer_time_used = false; //!< Wether or not the minimum layer time (cool_min_layer_time) was actually used in this layerplan.
 
+    std::map<const SliceMeshStorage*, MixedLinesSet> infill_lines_; //!< Infill lines generated for this layer
+
     const std::vector<FanSpeedLayerTimeSettings> fan_speed_layer_time_settings_per_extruder_;
 
     enum CombBoundary
@@ -417,6 +419,10 @@ class LayerPlan : public NoCopy
      */
     void planPrime(double prime_blob_wipe_length = 10.0);
 
+    void setGeneratedInfillLines(const SliceMeshStorage* mesh, const MixedLinesSet& infill_lines);
+
+    const MixedLinesSet getGeneratedInfillLines(const SliceMeshStorage* mesh) const;
+
     /*!
      * Add an extrusion move to a certain point, optionally with a different flow than the one in the \p config.
      *
@@ -785,7 +791,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.

include/LayerPlan.h

@@ -4,6 +4,7 @@
 #ifndef LAYER_PLAN_BUFFER_H
 #define LAYER_PLAN_BUFFER_H
 
+#include <condition_variable>
 #include <list>
 #include <vector>
 
@@ -17,6 +18,7 @@ namespace cura
 class LayerPlan;
 class ExtruderPlan;
 class GCodeExport;
+struct LayerIndex;
 
 /*!
  * Class for buffering multiple layer plans (\ref LayerPlan) / extruder plans within those layer plans, so that temperature commands can be inserted in earlier layer plans.
@@ -57,6 +59,9 @@ class LayerPlanBuffer
      */
     std::list<LayerPlan*> buffer_;
 
+    std::mutex buffer_mutex_;
+    std::condition_variable buffer_condition_variable_;
+
 public:
     LayerPlanBuffer(GCodeExport& gcode)
         : gcode_(gcode)
@@ -66,11 +71,6 @@ class LayerPlanBuffer
 
     void setPreheatConfig();
 
-    /*!
-     * Push a new layer plan into the buffer
-     */
-    void push(LayerPlan& layer_plan);
-
     /*!
      * Push a new layer onto the buffer and handle the buffer.
      * Write a layer to gcode if it is popped out of the buffer.
@@ -85,6 +85,15 @@ class LayerPlanBuffer
      */
     void flush();
 
+    /*!
+     * Gets the layer plan for the given layer, once it has been completed. It will wait for completion if necessary
+     * @param layer_nr The layer number to get the plan for
+     * @return The completed layer plan
+     * @warning Make sure you always ask for a layer plan below the one that is being processed. Since the layers processing is started bottom to top and the engine can be run
+     *          mono-threaded, asking for a layer above could lead to a deadlock because the processing of this layer will never start.
+     */
+    const LayerPlan* getCompletedLayerPlan(const LayerIndex& layer_nr) const;
+
 private:
     /*!
      * Process all layers in the buffer

include/LayerPlanBuffer.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