Merge branch 'main' into dev/bbl-network-upd

src/libslic3r/Fill/FillLine.cpp

@@ -23,7 +23,7 @@ void FillLine::_fill_surface_single(
     this->_diagonal_distance = this->_line_spacing * 2;
     this->_line_oscillation = this->_line_spacing - this->_min_spacing; // only for Line infill
     BoundingBox bounding_box = expolygon.contour.bounding_box();
-    
+
     // define flow spacing according to requested density
     if (params.density > 0.9999f && !params.dont_adjust) {
         this->_line_spacing = this->_adjust_solid_spacing(bounding_box.size()(0), this->_line_spacing);
@@ -32,8 +32,8 @@ void FillLine::_fill_surface_single(
         // extend bounding box so that our pattern will be aligned with other layers
         // Transform the reference point to the rotated coordinate system.
         bounding_box.merge(align_to_grid(
-            bounding_box.min, 
-            Point(this->_line_spacing, this->_line_spacing), 
+            bounding_box.min,
+            Point(this->_line_spacing, this->_line_spacing),
             direction.second.rotated(- direction.first)));
     }
 
@@ -46,7 +46,7 @@ void FillLine::_fill_surface_single(
     // clip paths against a slightly larger expolygon, so that the first and last paths
     // are kept even if the expolygon has vertical sides
     // the minimum offset for preventing edge lines from being clipped is SCALED_EPSILON;
-    // however we use a larger offset to support expolygons with slightly skewed sides and 
+    // however we use a larger offset to support expolygons with slightly skewed sides and
     // not perfectly straight
     //FIXME Vojtech: Update the intersecton function to work directly with lines.
     Polylines polylines_src;
@@ -76,7 +76,7 @@ void FillLine::_fill_surface_single(
     size_t n_polylines_out_old = polylines_out.size();
 
     // connect lines
-    if (! params.dont_connect() && ! polylines.empty()) { // prevent calling leftmost_point() on empty collections
+    if (! polylines.empty()) { // prevent calling leftmost_point() on empty collections
         // offset the expolygon by max(min_spacing/2, extra)
         ExPolygon expolygon_off;
         {
@@ -96,9 +96,9 @@ void FillLine::_fill_surface_single(
                 const Point &last_point = pts_end.back();
                 // Distance in X, Y.
                 const Vector distance = last_point - first_point;
-                // TODO: we should also check that both points are on a fill_boundary to avoid 
+                // TODO: we should also check that both points are on a fill_boundary to avoid
                 // connecting paths on the boundaries of internal regions
-                if (this->_can_connect(std::abs(distance(0)), std::abs(distance(1))) && 
+                if (this->_can_connect(std::abs(distance(0)), std::abs(distance(1))) &&
                     expolygon_off.contains(Line(last_point, first_point))) {
                     // Append the polyline.
                     pts_end.insert(pts_end.end(), polyline.points.begin(), polyline.points.end());

src/libslic3r/Print.cpp

@@ -548,19 +548,11 @@ std::vector<size_t> Print::layers_sorted_for_object(float start, float end, std:
 StringObjectException Print::sequential_print_clearance_valid(const Print &print, Polygons *polygons, std::vector<std::pair<Polygon, float>>* height_polygons)
 {
     StringObjectException single_object_exception;
-    auto print_config = print.config();
-    Pointfs excluse_area_points = print_config.bed_exclude_area.values;
-    Polygons exclude_polys;
-    Polygon exclude_poly;
+    const auto& print_config = print.config();
+    Polygons exclude_polys = get_bed_excluded_area(print_config);
     const Vec3d print_origin = print.get_plate_origin();
-    for (int i = 0; i < excluse_area_points.size(); i++) {
-        auto pt = excluse_area_points[i];
-        exclude_poly.points.emplace_back(scale_(pt.x() + print_origin.x()), scale_(pt.y() + print_origin.y()));
-        if (i % 4 == 3) {  // exclude areas are always rectangle
-            exclude_polys.push_back(exclude_poly);
-            exclude_poly.points.clear();
-        }
-    }
+    std::for_each(exclude_polys.begin(), exclude_polys.end(),
+                  [&print_origin](Polygon& p) { p.translate(scale_(print_origin.x()), scale_(print_origin.y())); });
 
     std::map<ObjectID, Polygon> map_model_object_to_convex_hull;
     struct print_instance_info
@@ -887,19 +879,11 @@ static StringObjectException layered_print_cleareance_valid(const Print &print,
     if (print_instances_ordered.size() < 1)
         return {};
 
-    auto print_config = print.config();
-    Pointfs excluse_area_points = print_config.bed_exclude_area.values;
-    Polygons exclude_polys;
-    Polygon exclude_poly;
+    const auto& print_config = print.config();
+    Polygons exclude_polys = get_bed_excluded_area(print_config);
     const Vec3d print_origin = print.get_plate_origin();
-    for (int i = 0; i < excluse_area_points.size(); i++) {
-        auto pt = excluse_area_points[i];
-        exclude_poly.points.emplace_back(scale_(pt.x() + print_origin.x()), scale_(pt.y() + print_origin.y()));
-        if (i % 4 == 3) {  // exclude areas are always rectangle
-            exclude_polys.push_back(exclude_poly);
-            exclude_poly.points.clear();
-        }
-    }
+    std::for_each(exclude_polys.begin(), exclude_polys.end(),
+                  [&print_origin](Polygon& p) { p.translate(scale_(print_origin.x()), scale_(print_origin.y())); });
 
     std::map<const PrintInstance*, Polygon> map_model_object_to_convex_hull;
     // sequential_print_horizontal_clearance_valid

src/libslic3r/PrintConfig.cpp

@@ -8154,22 +8154,27 @@ Points get_bed_shape(const PrintConfig &cfg)
 
 Points get_bed_shape(const SLAPrinterConfig &cfg) { return to_points(make_counter_clockwise(cfg.printable_area.values)); }
 
+Polygons get_bed_excluded_area(const PrintConfig& cfg)
+{
+    const Pointfs exclude_area_points = cfg.bed_exclude_area.values;
+
+    Polygon exclude_poly;
+    for (int i = 0; i < exclude_area_points.size(); i++) {
+        auto pt = exclude_area_points[i];
+        exclude_poly.points.emplace_back(scale_(pt.x()), scale_(pt.y()));
+    }
+
+    exclude_poly.make_counter_clockwise();
+
+    return {exclude_poly};
+}
+
 Polygon get_bed_shape_with_excluded_area(const PrintConfig& cfg)
 {
     Polygon bed_poly;
     bed_poly.points = get_bed_shape(cfg);
 
-    Points excluse_area_points = to_points(cfg.bed_exclude_area.values);
-    Polygons exclude_polys;
-    Polygon exclude_poly;
-    for (int i = 0; i < excluse_area_points.size(); i++) {
-        auto pt = excluse_area_points[i];
-        exclude_poly.points.emplace_back(pt);
-        if (i % 4 == 3) {  // exclude areas are always rectangle
-            exclude_polys.push_back(exclude_poly);
-            exclude_poly.points.clear();
-        }
-    }
+    Polygons exclude_polys = get_bed_excluded_area(cfg);
     auto tmp = diff({ bed_poly }, exclude_polys);
     if (!tmp.empty()) bed_poly = tmp[0];
     return bed_poly;

src/libslic3r/PrintConfig.hpp

@@ -1751,6 +1751,7 @@ bool is_XL_printer(const PrintConfig &cfg);
 Points get_bed_shape(const DynamicPrintConfig &cfg);
 Points get_bed_shape(const PrintConfig &cfg);
 Points get_bed_shape(const SLAPrinterConfig &cfg);
+Slic3r::Polygons get_bed_excluded_area(const PrintConfig& cfg);
 Slic3r::Polygon get_bed_shape_with_excluded_area(const PrintConfig& cfg);
 bool has_skirt(const DynamicPrintConfig& cfg);
 float get_real_skirt_dist(const DynamicPrintConfig& cfg);