Merge branch '5.10' into NP-732-for-neoprep-staging

Author: saumyaj3

conandata.yml

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

conanfile.py

@@ -23,7 +23,7 @@ class CuraEngineConan(ConanFile):
     exports = "LICENSE*"
     settings = "os", "compiler", "build_type", "arch"
     package_type = "application"
-    python_requires = "sentrylibrary/1.0.0", "npmpackage/[>=1.0.0]@ultimaker/stable"
+    python_requires = "sentrylibrary/1.0.0", "npmpackage/[>=1.0.0]"
     python_requires_extend = "sentrylibrary.SentryLibrary"
 
     options = {
@@ -108,8 +108,6 @@ def validate(self):
 
     def build_requirements(self):
         self.test_requires("standardprojectsettings/[>=0.2.0]")
-        if self.options.enable_arcus or self.options.enable_plugins:
-            self.tool_requires("protobuf/3.21.12")
         if not self.conf.get("tools.build:skip_test", False, check_type=bool):
             self.test_requires("gtest/1.14.0")
         if self.options.enable_benchmarks:
@@ -126,16 +124,13 @@ def requirements(self):
                 self.requires(req)
         if self.options.enable_plugins:
             self.requires("neargye-semver/0.3.0")
-            self.requires("asio-grpc/2.9.2")
             for req in self.conan_data["requirements_plugins"]:
                 self.requires(req)
         if self.options.with_cura_resources:
             for req in self.conan_data["requirements_cura_resources"]:
                 self.requires(req)
-        if self.options.enable_arcus or self.options.enable_plugins:
-            self.requires("protobuf/3.21.12")
         self.requires("clipper/6.4.2@ultimaker/stable")
-        self.requires("boost/1.83.0")
+        self.requires("boost/1.86.0")
         self.requires("rapidjson/cci.20230929")
         self.requires("stb/cci.20230920")
         self.requires("spdlog/1.12.0")

include/FffGcodeWriter.h

@@ -377,7 +377,7 @@ class FffGcodeWriter : public NoCopy
         const SliceMeshStorage& mesh,
         const size_t extruder_nr,
         const MeshPathConfigs& mesh_config,
-        const SliceLayerPart& part,
+        SliceLayerPart& part,
         LayerPlan& gcode_layer) const;
 
     /*!
@@ -448,7 +448,7 @@ class FffGcodeWriter : public NoCopy
         const SliceMeshStorage& mesh,
         const size_t extruder_nr,
         const MeshPathConfigs& mesh_config,
-        const SliceLayerPart& part) const;
+        SliceLayerPart& part) const;
 
     /*!
      * Generate the a spiralized wall for a given layer part.

include/utils/SVG.h

@@ -147,7 +147,7 @@ class SVG : NoCopy
 
     void writePolygons(const Shape& polys, const ColorObject color = Color::BLACK, const double stroke_width = 1.0, const bool flush = true) const;
 
-    void writePolygon(Polygon poly, const ColorObject color = Color::BLACK, const double stroke_width = 1.0, const bool flush = true) const;
+    void writePolygon(const Polygon& poly, const ColorObject color = Color::BLACK, const double stroke_width = 1.0, const bool flush = true) const;
 
     void writePolylines(const Shape& polys, const ColorObject color = Color::BLACK, const double stroke_width = 1.0, const bool flush = true) const;
 

src/FffGcodeWriter.cpp

@@ -1790,7 +1790,7 @@ void FffGcodeWriter::addMeshLayerToGCode(
     const MeshPathConfigs& mesh_config,
     LayerPlan& gcode_layer) const
 {
-    const auto& mesh = *mesh_ptr;
+    auto& mesh = *mesh_ptr;
     if (gcode_layer.getLayerNr() > mesh.layer_nr_max_filled_layer)
     {
         return;
@@ -1801,7 +1801,7 @@ void FffGcodeWriter::addMeshLayerToGCode(
         return;
     }
 
-    const SliceLayer& layer = mesh.layers[gcode_layer.getLayerNr()];
+    SliceLayer& layer = mesh.layers[gcode_layer.getLayerNr()];
 
     if (layer.parts.empty())
     {
@@ -1819,8 +1819,8 @@ void FffGcodeWriter::addMeshLayerToGCode(
             mesh.settings.get<EZSeamCornerPrefType>("z_seam_corner"),
             mesh.settings.get<coord_t>("wall_line_width_0") * 2);
     }
-    PathOrderOptimizer<const SliceLayerPart*> part_order_optimizer(gcode_layer.getLastPlannedPositionOrStartingPosition(), z_seam_config);
-    for (const SliceLayerPart& part : layer.parts)
+    PathOrderOptimizer<SliceLayerPart*> part_order_optimizer(gcode_layer.getLastPlannedPositionOrStartingPosition(), z_seam_config);
+    for (SliceLayerPart& part : layer.parts)
     {
         if (part.outline.empty())
         {
@@ -1831,7 +1831,7 @@ void FffGcodeWriter::addMeshLayerToGCode(
 
     part_order_optimizer.optimize(false);
 
-    for (const PathOrdering<const SliceLayerPart*>& path : part_order_optimizer.paths_)
+    for (const PathOrdering<SliceLayerPart*>& path : part_order_optimizer.paths_)
     {
         addMeshPartToGCode(storage, mesh, extruder_nr, mesh_config, *path.vertices_, gcode_layer);
     }
@@ -1853,7 +1853,7 @@ void FffGcodeWriter::addMeshPartToGCode(
     const SliceMeshStorage& mesh,
     const size_t extruder_nr,
     const MeshPathConfigs& mesh_config,
-    const SliceLayerPart& part,
+    SliceLayerPart& part,
     LayerPlan& gcode_layer) const
 {
     const Settings& mesh_group_settings = Application::getInstance().current_slice_->scene.current_mesh_group->settings;
@@ -2976,7 +2976,7 @@ bool FffGcodeWriter::processInsets(
     const SliceMeshStorage& mesh,
     const size_t extruder_nr,
     const MeshPathConfigs& mesh_config,
-    const SliceLayerPart& part) const
+    SliceLayerPart& part) const
 {
     bool added_something = false;
     if (extruder_nr != mesh.settings.get<ExtruderTrain&>("wall_0_extruder_nr").extruder_nr_ && extruder_nr != mesh.settings.get<ExtruderTrain&>("wall_x_extruder_nr").extruder_nr_)
@@ -3099,7 +3099,16 @@ bool FffGcodeWriter::processInsets(
             // which is required because when the walls are being generated, the vertices do not fall on the part's outline
             // but, instead, are 1/2 a line width inset from the outline
 
-            gcode_layer.setBridgeWallMask(compressed_air.offset(max_air_gap + half_outer_wall_width));
+            Shape bridge_mask = compressed_air.offset(max_air_gap + half_outer_wall_width);
+            gcode_layer.setBridgeWallMask(bridge_mask);
+
+            // Override flooring/skin areas to register bridging areas to be treated as normal skin
+            for (SkinPart& skin_part : part.skin_parts)
+            {
+                Shape moved_area = skin_part.flooring_fill.intersection(bridge_mask).offset(10);
+                skin_part.flooring_fill = skin_part.flooring_fill.difference(moved_area);
+                skin_part.skin_fill = skin_part.skin_fill.unionPolygons(moved_area);
+            }
         }
         else
         {

src/geometry/Shape.cpp

@@ -262,7 +262,7 @@ size_t Shape::findInside(const Point2LL& p, bool border_result) const
 {
     if (empty())
     {
-        return 0;
+        return NO_INDEX;
     }
 
     // NOTE: Keep these vectors fixed-size, they replace an (non-standard, sized at runtime) arrays.

src/path_ordering.cpp

@@ -28,6 +28,12 @@ const PointsSet& PathOrdering<const SliceLayerPart*>::getVertexData()
     return vertices_->outline.outerPolygon();
 }
 
+template<>
+const PointsSet& PathOrdering<SliceLayerPart*>::getVertexData()
+{
+    return vertices_->outline.outerPolygon();
+}
+
 template<>
 const PointsSet& PathOrdering<const SupportInfillPart*>::getVertexData()
 {

src/support.cpp

@@ -8,6 +8,7 @@
 #include <fstream> // ifstream.good()
 #include <utility> // pair
 
+#include <range/v3/algorithm/all_of.hpp>
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/drop.hpp>
 #include <range/v3/view/drop_last.hpp>
@@ -1013,6 +1014,23 @@ void AreaSupport::generateSupportAreasForMesh(
         return;
     }
 
+    if (ranges::all_of(
+            mesh.overhang_areas,
+            [](const Shape& overhang_area)
+            {
+                return overhang_area.empty();
+            })
+        && ranges::all_of(
+            mesh.full_overhang_areas,
+            [](const Shape& overhang_area)
+            {
+                return overhang_area.empty();
+            }))
+    {
+        // Mesh has no overhang, skip support generation
+        return;
+    }
+
     // Compute the areas that are disallowed by the X/Y distance.
     std::vector<Shape> xy_disallowed_per_layer;
     xy_disallowed_per_layer.resize(layer_count);

src/utils/SVG.cpp

@@ -69,14 +69,13 @@ void SVG::handleFlush(const bool flush) const
 
 
 SVG::SVG(std::string filename, AABB aabb, Point2LL canvas_size, ColorObject background)
-    : SVG(
-        filename,
-        aabb,
-        std::min(
-            static_cast<double>(canvas_size.X - canvas_size.X / 5 * 2) / static_cast<double>(aabb.max_.X - aabb.min_.X),
-            static_cast<double>(canvas_size.Y - canvas_size.Y / 5) / static_cast<double>(aabb.max_.Y - aabb.min_.Y)),
-        canvas_size,
-        background)
+    : SVG(filename,
+          aabb,
+          std::min(
+              static_cast<double>(canvas_size.X - canvas_size.X / 5 * 2) / static_cast<double>(aabb.max_.X - aabb.min_.X),
+              static_cast<double>(canvas_size.Y - canvas_size.Y / 5) / static_cast<double>(aabb.max_.Y - aabb.min_.Y)),
+          canvas_size,
+          background)
 {
 }
 
@@ -355,7 +354,7 @@ void SVG::writePolygons(const Shape& polys, const ColorObject color, const doubl
     handleFlush(flush);
 }
 
-void SVG::writePolygon(const Polygon poly, const ColorObject color, const double stroke_width, const bool flush) const
+void SVG::writePolygon(const Polygon& poly, const ColorObject color, const double stroke_width, const bool flush) const
 {
     if (poly.size() == 0)
     {
@@ -364,7 +363,7 @@ void SVG::writePolygon(const Polygon poly, const ColorObject color, const double
     int size = static_cast<int>(poly.size());
     Point2LL p0 = poly.back();
     int i = 0;
-    for (Point2LL p1 : poly)
+    for (const Point2LL& p1 : poly)
     {
         if (color.color_ == Color::RAINBOW)
         {
@@ -382,7 +381,7 @@ void SVG::writePolygon(const Polygon poly, const ColorObject color, const double
         }
         else
         {
-            writeLine(p0, p1, color, stroke_width);
+            writeLine(p0, p1, color, stroke_width, false);
         }
         p0 = p1;
         i++;