Fix skin support with multiple meshes

CURA-12361

Author: wawanbreton

include/LayerPlan.h

@@ -167,7 +167,7 @@ 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.
 
-    MixedLinesSet infill_lines_; //!< Infill lines generated for this layer
+    std::map<const SliceMeshStorage*, MixedLinesSet> infill_lines_; //!< Infill lines generated for this layer
 
     const std::vector<FanSpeedLayerTimeSettings> fan_speed_layer_time_settings_per_extruder_;
 
@@ -419,9 +419,9 @@ class LayerPlan : public NoCopy
      */
     void planPrime(double prime_blob_wipe_length = 10.0);
 
-    void setGeneratedInfillLines(const MixedLinesSet& infill_lines);
+    void setGeneratedInfillLines(const SliceMeshStorage* mesh, const MixedLinesSet& infill_lines);
 
-    const MixedLinesSet& getGeneratedInfillLines() const;
+    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.

src/FffGcodeWriter.cpp

@@ -2547,7 +2547,7 @@ bool FffGcodeWriter::processSingleLayerInfill(
         MixedLinesSet all_infill_lines;
         all_infill_lines.push_back(std::move(infill_lines));
         all_infill_lines.push_back(std::move(infill_polygons));
-        gcode_layer.setGeneratedInfillLines(all_infill_lines);
+        gcode_layer.setGeneratedInfillLines(&mesh, all_infill_lines);
     }
 
     return added_something;

src/LayerPlan.cpp

@@ -541,14 +541,19 @@ void LayerPlan::planPrime(double prime_blob_wipe_length)
     forceNewPathStart();
 }
 
-void LayerPlan::setGeneratedInfillLines(const MixedLinesSet& infill_lines)
+void LayerPlan::setGeneratedInfillLines(const SliceMeshStorage* mesh, const MixedLinesSet& infill_lines)
 {
-    infill_lines_ = infill_lines;
+    infill_lines_[mesh].push_back(infill_lines);
 }
 
-const MixedLinesSet& LayerPlan::getGeneratedInfillLines() const
+const MixedLinesSet LayerPlan::getGeneratedInfillLines(const SliceMeshStorage* mesh) const
 {
-    return infill_lines_;
+    auto iterator = infill_lines_.find(mesh);
+    if (iterator != infill_lines_.end())
+    {
+        return iterator->second;
+    }
+    return MixedLinesSet();
 }
 
 void LayerPlan::addExtrusionMove(

src/bridge.cpp

@@ -926,7 +926,7 @@ std::tuple<Shape, AngleDegrees> makeBridgeOverInfillPrintable(
 
     // We will expand the bridging area following the lines direction
     const AngleDegrees expansion_angle = bridge_angle + 90;
-    const MixedLinesSet& infill_lines_below = completed_layer_plan_below->getGeneratedInfillLines();
+    const MixedLinesSet infill_lines_below = completed_layer_plan_below->getGeneratedInfillLines(&mesh);
     TransformedShape filtered_infill_lines_below;
 
     // Rotate all the infill lines below so that they are in a space where the under skin area should be expanded horizontally
@@ -978,6 +978,11 @@ std::tuple<Shape, AngleDegrees> makeBridgeOverInfillPrintable(
     // Perform a morphological closing to remove overlapping lines
     transformed_expanded_infill_below_skin_area = transformed_expanded_infill_below_skin_area.offset(EPSILON).offset(-EPSILON).intersection(infill_contour);
 
+    SVG svg(fmt::format("/tmp/skin_support.svg"), AABB(transformed_expanded_infill_below_skin_area));
+    svg.write(infill_below_skin_area, { .surface = { SVG::Color::BLUE } });
+    svg.write(infill_lines_below, { .line = { SVG::Color::MAGENTA, 0.4 } });
+    svg.write(transformed_expanded_infill_below_skin_area, { .surface = { SVG::Color::RED, 0.3 } });
+
     return { transformed_expanded_infill_below_skin_area, bridge_angle };
 }