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

ConcentricWGapFill: better gapfill

Browse Source 
- new "outter" gapfill
 - reduce gapfill to no_overlap_expolygons
This commit is contained in:
supermerill 2020-09-05 22:52:44 +02:00
parent f48ed5091c
commit 82d83eb851
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libslic3r/Fill/FillConcentric.cpp
View File

@ -104,6 +104,7 @@ FillConcentricWGapFill::fill_surface_extrusion(
ExPolygons gaps; ExPolygons gaps;
Polygons loops = (Polygons)expolygon; Polygons loops = (Polygons)expolygon;
Polygons last = loops; Polygons last = loops;
bool first = true;
while (!last.empty()) { while (!last.empty()) {
Polygons next_onion = offset2(last, -(distance + scale_(this->spacing) / 2), +scale_(this->spacing) / 2); Polygons next_onion = offset2(last, -(distance + scale_(this->spacing) / 2), +scale_(this->spacing) / 2);
loops.insert(loops.end(), next_onion.begin(), next_onion.end()); loops.insert(loops.end(), next_onion.begin(), next_onion.end());
@ -111,6 +112,10 @@ FillConcentricWGapFill::fill_surface_extrusion(
offset(last, -0.5f * distance), offset(last, -0.5f * distance),
offset(next_onion, 0.5f * distance + 10))); // safety offset offset(next_onion, 0.5f * distance + 10))); // safety offset
last = next_onion; last = next_onion;
if (first && !this->no_overlap_expolygons.empty()) {
gaps = intersection_ex(gaps, this->no_overlap_expolygons);
}
first = false;
} }
// generate paths from the outermost to the innermost, to avoid // generate paths from the outermost to the innermost, to avoid
@ -164,6 +169,24 @@ FillConcentricWGapFill::fill_surface_extrusion(
out.push_back(coll_nosort); out.push_back(coll_nosort);
else delete coll_nosort; else delete coll_nosort;
} }
// external gapfill
ExPolygons gapfill_areas = diff_ex({ surface->expolygon }, offset_ex(expp, double(scale_(0.5 * this->spacing))));
gapfill_areas = union_ex(gapfill_areas, true);
if (gapfill_areas.size() > 0) {
const double minarea = scale_(params.config->gap_fill_min_area.get_abs_value(params.flow->width)) * params.flow->scaled_width();
for (int i = 0; i < gapfill_areas.size(); i++) {
if (gapfill_areas[i].area() < minarea) {
gapfill_areas.erase(gapfill_areas.begin() + i);
i--;
}
}
FillParams params2{ params };
params2.role = erGapFill;
do_gap_fill(intersection_ex(gapfill_areas, no_overlap_expolygons), params2, out);
}
} }
} // namespace Slic3r } // namespace Slic3r