GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 05:15:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only extrude gapfill between perimeters.

Browse Source
This commit is contained in:
supermerill 2019-02-12 16:39:11 +01:00
parent d7fb3ea14f
commit 2fbccad771
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libslic3r/PerimeterGenerator.cpp
View File

@ -306,7 +306,7 @@ void PerimeterGenerator::process()
} else { } else {
//FIXME Is this offset correct if the line width of the inner perimeters differs //FIXME Is this offset correct if the line width of the inner perimeters differs
// from the line width of the infill? // from the line width of the infill?
coord_t distance = (i == 1) ? ext_perimeter_spacing2 : perimeter_spacing; coord_t good_spacing = (i == 1) ? ext_perimeter_spacing2 : perimeter_spacing;
if (this->config->thin_walls){ if (this->config->thin_walls){
// This path will ensure, that the perimeters do not overfill, as in // This path will ensure, that the perimeters do not overfill, as in
// prusa3d/Slic3r GH #32, but with the cost of rounding the perimeters // prusa3d/Slic3r GH #32, but with the cost of rounding the perimeters
@ -315,21 +315,23 @@ void PerimeterGenerator::process()
// Also the offset2(perimeter, -x, x) may sometimes lead to a perimeter, which is larger than // Also the offset2(perimeter, -x, x) may sometimes lead to a perimeter, which is larger than
// the original. // the original.
next_onion = offset2_ex(last, next_onion = offset2_ex(last,
-(float)(distance + min_spacing / 2 - 1), -(float)(good_spacing + min_spacing / 2 - 1),
+(float)(min_spacing / 2 - 1)); +(float)(min_spacing / 2 - 1));
} else { } else {
// If "detect thin walls" is not enabled, this paths will be entered, which // If "detect thin walls" is not enabled, this paths will be entered, which
// leads to overflows, as in prusa3d/Slic3r GH #32 // leads to overflows, as in prusa3d/Slic3r GH #32
next_onion = offset_ex(last, -(float)(distance)); next_onion = offset_ex(last, -(float)(good_spacing));
} }
// look for gaps // look for gaps
if (this->config->gap_fill_speed.value > 0 && this->config->gap_fill) if (this->config->gap_fill_speed.value > 0 && this->config->gap_fill
//check if we are going to have an other perimeter
&& (i <= loop_number || has_overhang || next_onion.empty()))
// not using safety offset here would "detect" very narrow gaps // not using safety offset here would "detect" very narrow gaps
// (but still long enough to escape the area threshold) that gap fill // (but still long enough to escape the area threshold) that gap fill
// won't be able to fill but we'd still remove from infill area // won't be able to fill but we'd still remove from infill area
append(gaps, diff_ex( append(gaps, diff_ex(
offset(last, -0.5f*distance), offset(last, -0.5f*good_spacing),
offset(next_onion, 0.5f * distance + 10))); // safety offset offset(next_onion, 0.5f * good_spacing + 10))); // safety offset
} }
if (next_onion.empty()) { if (next_onion.empty()) {
@ -516,22 +518,22 @@ void PerimeterGenerator::process()
overlap = scale_(this->config->get_abs_value("infill_overlap", unscale<coordf_t>(inset + solid_infill_spacing / 2))); overlap = scale_(this->config->get_abs_value("infill_overlap", unscale<coordf_t>(inset + solid_infill_spacing / 2)));
} }
// simplify infill contours according to resolution // simplify infill contours according to resolution
Polygons pp; Polygons not_filled_p;
for (ExPolygon &ex : last) for (ExPolygon &ex : last)
ex.simplify_p(SCALED_RESOLUTION, &pp); ex.simplify_p(SCALED_RESOLUTION, &not_filled_p);
ExPolygons not_filled_exp = union_ex(not_filled_p);
// collapse too narrow infill areas // collapse too narrow infill areas
coord_t min_perimeter_infill_spacing = (coord_t)( solid_infill_spacing * (1. - INSET_OVERLAP_TOLERANCE) ); coord_t min_perimeter_infill_spacing = (coord_t)( solid_infill_spacing * (1. - INSET_OVERLAP_TOLERANCE) );
// append infill areas to fill_surfaces // append infill areas to fill_surfaces
//auto it_surf = this->fill_surfaces->surfaces.end(); //auto it_surf = this->fill_surfaces->surfaces.end();
this->fill_surfaces->append( ExPolygons infill_exp = offset2_ex(not_filled_exp,
offset2_ex( -inset - min_perimeter_infill_spacing / 2 + overlap,
union_ex(pp), (float)min_perimeter_infill_spacing / 2);
-inset - min_perimeter_infill_spacing / 2 + overlap, this->fill_surfaces->append(infill_exp, stInternal);
(float) min_perimeter_infill_spacing / 2),
stInternal);
if (overlap != 0) { if (overlap != 0) {
ExPolygons polyWithoutOverlap = offset2_ex( ExPolygons polyWithoutOverlap = offset2_ex(
union_ex(pp), not_filled_exp,
-inset - min_perimeter_infill_spacing / 2, -inset - min_perimeter_infill_spacing / 2,
(float) min_perimeter_infill_spacing / 2); (float) min_perimeter_infill_spacing / 2);
this->fill_no_overlap.insert(this->fill_no_overlap.end(), polyWithoutOverlap.begin(), polyWithoutOverlap.end()); this->fill_no_overlap.insert(this->fill_no_overlap.end(), polyWithoutOverlap.begin(), polyWithoutOverlap.end());