fix bad support grid

(introduced by fill_aligned_z, caa4a0)
#4306

src/libslic3r/Fill/Fill3DHoneycomb.cpp

@@ -170,7 +170,7 @@ void Fill3DHoneycomb::_fill_surface_single(
  if (params.connection == icNotConnected || polylines.size() <= 1)
  append(polylines_out, chain_polylines(std::move(polylines)));
  else
- this->connect_infill(std::move(polylines), expolygon, polylines_out, this->get_spacing(), params);
+ this->connect_infill(std::move(polylines), expolygon, polylines_out, scale_t(this->get_spacing()), params);
 }
 
 } // namespace Slic3r

src/libslic3r/Fill/FillAdaptive.cpp

@@ -1405,7 +1405,7 @@ void Filler::_fill_surface_single(
  if (params.connection == InfillConnection::icNotConnected || all_polylines_with_hooks.size() <= 1)
  append(polylines_out, chain_polylines(std::move(all_polylines_with_hooks)));
  else
- connect_infill(std::move(all_polylines_with_hooks), expolygon, polylines_out, this->get_spacing(), params);
+ connect_infill(std::move(all_polylines_with_hooks), expolygon, polylines_out, scale_t(this->get_spacing()), params);
 
 #ifdef ADAPTIVE_CUBIC_INFILL_DEBUG_OUTPUT
  {

src/libslic3r/Fill/FillBase.hpp

@@ -215,26 +215,26 @@ class Fill
  }
 
 public:
- static void connect_infill(Polylines&& infill_ordered, const ExPolygon& boundary, Polylines& polylines_out, const double spacing, const FillParams& params);
+ static void connect_infill(Polylines&& infill_ordered, const ExPolygon& boundary, Polylines& polylines_out, const coord_t spacing, const FillParams& params);
  //for rectilinear
- static void connect_infill(Polylines&& infill_ordered, const ExPolygon& boundary, const Polygons& polygons_src, Polylines& polylines_out, const double spacing, const FillParams& params);
+ static void connect_infill(Polylines&& infill_ordered, const ExPolygon& boundary, const Polygons& polygons_src, Polylines& polylines_out, const coord_t spacing, const FillParams& params);
 
- static void connect_base_support(Polylines &&infill_ordered, const std::vector<const Polygon*> &boundary_src, const BoundingBox &bbox, Polylines &polylines_out, const double spacing, const FillParams &params);
- static void connect_base_support(Polylines &&infill_ordered, const Polygons &boundary_src, const BoundingBox &bbox, Polylines &polylines_out, const double spacing, const FillParams &params);
+ static void connect_base_support(Polylines &&infill_ordered, const std::vector<const Polygon*> &boundary_src, const BoundingBox &bbox, Polylines &polylines_out, const coord_t line_spacing, const FillParams &params);
+ static void connect_base_support(Polylines &&infill_ordered, const Polygons &boundary_src, const BoundingBox &bbox, Polylines &polylines_out, const coord_t line_spacing, const FillParams &params);
 
  static coord_t _adjust_solid_spacing(const coord_t width, const coord_t distance, const double factor_max = 1.2);
 };
 
 namespace FakePerimeterConnect {
- void connect_infill(Polylines&& infill_ordered, const ExPolygon& boundary, Polylines& polylines_out, const double spacing, const FillParams& params);
- void connect_infill(Polylines&& infill_ordered, const Polygons& boundary, const BoundingBox& bbox, Polylines& polylines_out, const double spacing, const FillParams& params);
- void connect_infill(Polylines&& infill_ordered, const std::vector<const Polygon*>& boundary, const BoundingBox& bbox, Polylines& polylines_out, double spacing, const FillParams& params);
+ void connect_infill(Polylines&& infill_ordered, const ExPolygon& boundary, Polylines& polylines_out, const coord_t spacing, const FillParams& params);
+ void connect_infill(Polylines&& infill_ordered, const Polygons& boundary, const BoundingBox& bbox, Polylines& polylines_out, const coord_t spacing, const FillParams& params);
+ void connect_infill(Polylines&& infill_ordered, const std::vector<const Polygon*>& boundary, const BoundingBox& bbox, Polylines& polylines_out, coord_t spacing, const FillParams& params);
 }
 namespace PrusaSimpleConnect {
- void connect_infill(Polylines& infill_ordered, const ExPolygon& boundary, Polylines& polylines_out, const double spacing, const FillParams& params);
+ void connect_infill(Polylines& infill_ordered, const ExPolygon& boundary, Polylines& polylines_out, const coord_t spacing, const FillParams& params);
 }
 namespace NaiveConnect {
- void connect_infill(Polylines&& infill_ordered, const ExPolygon& boundary, Polylines& polylines_out, const double spacing, const FillParams& params);
+ void connect_infill(Polylines&& infill_ordered, const ExPolygon& boundary, Polylines& polylines_out, const coord_t spacing, const FillParams& params);
 }
 
 // composite filler

src/libslic3r/Fill/FillGyroid.cpp

@@ -192,7 +192,7 @@ void FillGyroid::_fill_surface_single(
  if (params.connection == icNotConnected){
  append(polylines_out, chain_polylines(polylines));
  } else {
- this->connect_infill(chain_polylines(polylines), expolygon, polylines_out, this->get_spacing(), params);
+ this->connect_infill(chain_polylines(polylines), expolygon, polylines_out, scale_t(this->get_spacing()), params);
  }
  // new paths must be rotated back
  if (std::abs(infill_angle) >= EPSILON) {

src/libslic3r/Fill/FillHoneycomb.cpp

@@ -82,7 +82,7 @@ void FillHoneycomb::_fill_surface_single(
  if (params.connection == icNotConnected || all_polylines.size() <= 1)
  append(polylines_out, chain_polylines(std::move(all_polylines)));
  else
- connect_infill(std::move(all_polylines), expolygon, polylines_out, this->get_spacing(), params);
+ connect_infill(std::move(all_polylines), expolygon, polylines_out, scale_t(this->get_spacing()), params);
 }
 
 } // namespace Slic3r

src/libslic3r/Fill/FillLightning.cpp

@@ -19,7 +19,7 @@ void Filler::_fill_surface_single(
  if (params.dont_connect() || fill_lines.size() <= 1) {
  append(polylines_out, chain_polylines(std::move(fill_lines)));
  } else
- connect_infill(std::move(fill_lines), expolygon, polylines_out, this->get_spacing(), params);
+ connect_infill(std::move(fill_lines), expolygon, polylines_out, scale_t(this->get_spacing()), params);
 }
 
 void GeneratorDeleter::operator()(Generator *p) {

src/libslic3r/Fill/FillPlanePath.cpp

@@ -67,7 +67,7 @@ void FillPlanePath::_fill_surface_single(
  if (params.dont_connect() || params.density > 0.5 || all_poly.size() <= 1)
  chained = chain_polylines(std::move(all_poly));
  else
- connect_infill(std::move(all_poly), expolygon, chained, this->get_spacing(), params);
+ connect_infill(std::move(all_poly), expolygon, chained, scale_t(this->get_spacing()), params);
  // paths must be repositioned and rotated back
  for (Polyline &pl : chained) {
  pl.translate(double(shift.x()), double(shift.y()));

src/libslic3r/Fill/FillRectilinear.cpp

@@ -3162,7 +3162,7 @@ bool FillRectilinear::fill_surface_by_multilines(const Surface *surface, FillPar
  fill_lines = chain_polylines(std::move(fill_lines));
  append(polylines_out, std::move(fill_lines));
  } else
- connect_infill(std::move(fill_lines), surface->expolygon, poly_with_offset_base.polygons_outer, polylines_out, this->get_spacing(), params);
+ connect_infill(std::move(fill_lines), surface->expolygon, poly_with_offset_base.polygons_outer, polylines_out, scale_t(this->get_spacing()), params);
 
  return true;
 }
@@ -3242,8 +3242,9 @@ Polylines FillSupportBase::fill_surface(const Surface *surface, const FillParams
  coord_t line_spacing = _line_spacing_for_density(params);
  // Create infill lines, keep them vertical.
  make_fill_lines(poly_with_offset, rotate_vector.second.rotated(- rotate_vector.first), 0, 0, line_spacing, 0, fill_lines, params);
+
  // Both the poly_with_offset and polylines_out are rotated, so the infill lines are strictly vertical.
- connect_base_support(std::move(fill_lines), poly_with_offset.polygons_outer, poly_with_offset.bounding_box_outer(), polylines_out, this->get_spacing(), params);
+ connect_base_support(std::move(fill_lines), poly_with_offset.polygons_outer, poly_with_offset.bounding_box_outer(), polylines_out,  _line_spacing_for_density(params), params);
  // Rotate back by rotate_vector.first
  const double cos_a = cos(rotate_vector.first);
  const double sin_a = sin(rotate_vector.first);

src/libslic3r/Print.hpp

@@ -439,8 +439,7 @@ class PrintObject : public PrintObjectBaseWithState<Print, PrintObjectStep, posC
  bool m_typed_slices = false;
 
  //this setting allow fill_aligned_z to get the max sparse spacing spacing.
- coord_t m_max_sparse_spacing;
-
+ coord_t m_max_sparse_spacing = 0;
 
 };