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

fix disjointed fill surface

Browse Source 
also gapfill "star" are now even more restricted in min branch length.
supermerill/SuperSlicer#2038
This commit is contained in:
supermerill 2021-12-11 21:01:59 +01:00
parent 4f5e801ecf
commit 5a5ea52a6e
2 changed files with 72 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Fill/Fill.cpp
View File

@ -486,6 +486,8 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
surface_fill.params.flow = Flow::new_from_spacing((float)f->get_spacing(), surface_fill.params.flow.nozzle_diameter, (float)surface_fill.params.flow.height, overlap, surface_fill.params.flow.bridge); surface_fill.params.flow = Flow::new_from_spacing((float)f->get_spacing(), surface_fill.params.flow.nozzle_diameter, (float)surface_fill.params.flow.height, overlap, surface_fill.params.flow.bridge);
} }
//union with safety offset to avoid separation from the appends of different surface with same settings.
surface_fill.expolygons = union_ex(surface_fill.expolygons, true);
for (ExPolygon &expoly : surface_fill.expolygons) { for (ExPolygon &expoly : surface_fill.expolygons) {
//set overlap polygons //set overlap polygons

76
src/libslic3r/MedialAxis.cpp
View File

@ -1395,6 +1395,65 @@ MedialAxis::remove_too_thin_points(ThickPolylines& pp)
void void
MedialAxis::remove_too_short_polylines(ThickPolylines& pp, const coord_t min_size) MedialAxis::remove_too_short_polylines(ThickPolylines& pp, const coord_t min_size)
{ {
// reduce the flow at the intersection ( + ) points
//FIXME: TODO: note that crossings are unnafected right now. they may need a different codepath directly in their method
//TODO: unit tests for that.
//TODO: never triggered. ther's only the sections passed by crossing fusion that aren't edge-case and it's not treated by this. => comment for now
//for each not-endpoint point
//std::vector<bool> endpoint_not_used(pp.size() * 2, true);
//for (size_t idx_endpoint = 0; idx_endpoint < endpoint_not_used.size(); idx_endpoint++) {
// ThickPolyline& polyline = pp[idx_endpoint / 2];
// //update endpoint_not_used if not seen before
// if (idx_endpoint % 2 == 0 && endpoint_not_used[idx_endpoint]) {
// //update
// endpoint_not_used[(idx_endpoint / 2)] = !polyline.endpoints.first;
// endpoint_not_used[(idx_endpoint / 2) + 1] = endpoint_not_used[(idx_endpoint / 2) + 1] && !polyline.endpoints.second;
// }
// if (endpoint_not_used[idx_endpoint]) {
// int nb_endpoints;
// Point pt = idx_endpoint % 2 == 0 ? polyline.first_point() : polyline.last_point();
// if (idx_endpoint % 2 == 0 && pt.coincides_with(polyline.last_point())) {
// nb_endpoints++;
// endpoint_not_used[(idx_endpoint / 2) + 1] = false;
// }
// //good, now find other points
// for (size_t idx_other_pp = (idx_endpoint / 2) + 1; idx_other_pp < pp.size(); idx_other_pp++) {
// ThickPolyline& other = pp[idx_other_pp];
// if (pt.coincides_with(other.first_point())) {
// nb_endpoints++;
// endpoint_not_used[idx_other_pp * 2] = false;
// }
// if (pt.coincides_with(other.last_point())) {
// nb_endpoints++;
// endpoint_not_used[idx_other_pp * 2 + 1] = false;
// }
// }
// if (nb_endpoints < 3)
// continue;
// // reduce width accordingly
// float reduction = 2.f / nb_endpoints;
// std::cout << "reduce " << reduction << " points!\n";
// if (idx_endpoint % 2 == 0 ) {
// polyline.width.front() *= reduction;
// if(pt.coincides_with(polyline.last_point()))
// polyline.width.back() *= reduction;
// } else {
// polyline.width.back() *= reduction;
// }
// //good, now find other points
// for (size_t idx_other_pp = (idx_endpoint / 2) + 1; idx_other_pp < pp.size(); idx_other_pp++) {
// ThickPolyline& other = pp[idx_other_pp];
// if (pt.coincides_with(other.first_point())) {
// other.width.front() *= reduction;
// }
// if (pt.coincides_with(other.last_point())) {
// other.width.back() *= reduction;
// }
// }
// //TODO: restore good width at width dist, or reduce other points up to width dist
// }
//}
//remove too short polyline //remove too short polyline
bool changes = true; bool changes = true;
while (changes) { while (changes) {
@ -1408,11 +1467,16 @@ MedialAxis::remove_too_short_polylines(ThickPolylines& pp, const coord_t min_siz
// (we can't do this check before endpoints extension and clipping because we don't // (we can't do this check before endpoints extension and clipping because we don't
// know how long will the endpoints be extended since it depends on polygon thickness // know how long will the endpoints be extended since it depends on polygon thickness
// which is variable - extension will be <= max_width/2 on each side) // which is variable - extension will be <= max_width/2 on each side)
if ((polyline.endpoints.first || polyline.endpoints.second) if ((polyline.endpoints.first || polyline.endpoints.second)) {
&& polyline.length() < max_width / 2) { coordf_t max_width = max_width / 2;
if (shortest_size > polyline.length()) { for (coordf_t w : polyline.width)
shortest_size = polyline.length(); max_width = std::max(max_width, w);
shortest_idx = i; if(polyline.length() < max_width) {
if (shortest_size > polyline.length()) {
shortest_size = polyline.length();
shortest_idx = i;
}
} }
} }
@ -1857,6 +1921,7 @@ MedialAxis::build(ThickPolylines &polylines_out)
// svg.draw(pp); // svg.draw(pp);
// svg.Close(); // svg.Close();
//} //}
//TODO: reduce the flow at the intersection ( + ) points on crossing?
concatenate_polylines_with_crossing(pp); concatenate_polylines_with_crossing(pp);
//{ //{
// std::stringstream stri; // std::stringstream stri;
@ -1879,7 +1944,6 @@ MedialAxis::build(ThickPolylines &polylines_out)
// svg.Close(); // svg.Close();
//} //}
//TODO: reduce the flow at the intersection ( + ) points ?
ensure_not_overextrude(pp); ensure_not_overextrude(pp);
//{ //{
// std::stringstream stri; // std::stringstream stri;