GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-20 23:24:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow gyroid pattern rotation over Z

Browse Source
This commit is contained in:
Yuri D'Elia 2019-07-16 01:15:00 +02:00 committed by supermerill
parent 02b0bd757a
commit d8732ecfcd
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libslic3r/Fill/FillGyroid.cpp
View File

@ -152,7 +152,8 @@ void FillGyroid::_fill_surface_single(
ExPolygon &expolygon, ExPolygon &expolygon,
Polylines &polylines_out) Polylines &polylines_out)
{ {
// no rotation is supported for this infill pattern (yet) expolygon.rotate(-this->angle);
BoundingBox bb = expolygon.contour.bounding_box(); BoundingBox bb = expolygon.contour.bounding_box();
// Density adjusted to have a good %of weight. // Density adjusted to have a good %of weight.
double density_adjusted = std::max(0., params.density * 2.44); double density_adjusted = std::max(0., params.density * 2.44);
@ -160,7 +161,7 @@ void FillGyroid::_fill_surface_single(
coord_t distance = coord_t(scale_(this->spacing) / density_adjusted); coord_t distance = coord_t(scale_(this->spacing) / density_adjusted);
// align bounding box to a multiple of our grid module // align bounding box to a multiple of our grid module
bb.merge(_align_to_grid(bb.min, Point(2.*M_PI*distance, 2.*M_PI*distance))); bb.merge(_align_to_grid(bb.min, Point(2*M_PI*distance, 2*M_PI*distance)));
// generate pattern // generate pattern
Polylines polylines_square = make_gyroid_waves( Polylines polylines_square = make_gyroid_waves(
@ -170,15 +171,14 @@ void FillGyroid::_fill_surface_single(
ceil(bb.size()(0) / distance) + 1., ceil(bb.size()(0) / distance) + 1.,
ceil(bb.size()(1) / distance) + 1.); ceil(bb.size()(1) / distance) + 1.);
// move pattern in place
for (Polyline &polyline : polylines_square)
polyline.translate(bb.min(0), bb.min(1));
// clip pattern to boundaries, keeping the polyline order & ordering the fragment to be able to join them easily // clip pattern to boundaries, keeping the polyline order & ordering the fragment to be able to join them easily
//Polylines polylines = intersection_pl(polylines_square, (Polygons)expolygon);
Polylines polylines_chained; Polylines polylines_chained;
for (size_t idx_polyline = 0; idx_polyline < polylines_square.size(); ++idx_polyline) { for (size_t idx_polyline = 0; idx_polyline < polylines_square.size(); ++idx_polyline) {
// shift the polyline to the grid origin
Polyline &poly_to_cut = polylines_square[idx_polyline]; Polyline &poly_to_cut = polylines_square[idx_polyline];
poly_to_cut.translate(bb.min);
// intersect
Polylines polylines_to_sort = intersection_pl(Polylines() = { poly_to_cut }, (Polygons)expolygon); Polylines polylines_to_sort = intersection_pl(Polylines() = { poly_to_cut }, (Polygons)expolygon);
for (Polyline &polyline : polylines_to_sort) { for (Polyline &polyline : polylines_to_sort) {
//TODO: replace by closest_index_point() //TODO: replace by closest_index_point()
@ -226,6 +226,12 @@ void FillGyroid::_fill_surface_single(
idx--; idx--;
} }
} }
// new paths must be rotated back
for (Polylines::iterator it = polylines_out.begin() + polylines_out_first_idx;
it != polylines_out.end(); ++it) {
it->rotate(this->angle);
}
} }
} // namespace Slic3r } // namespace Slic3r