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

Fix commit 4e6753: use ExPolygon instead of polygon (so don't holes as contour) for "too thin bridge" detection.

Browse Source
This commit is contained in:
supermerill 2022-01-31 00:32:03 +01:00
parent 396b30285b
commit 234b161550
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libslic3r/PrintObject.cpp
View File

@ -2212,16 +2212,17 @@ namespace Slic3r {
{ {
to_bridge.clear(); to_bridge.clear();
//choose betweent two offset the one that split the less the surface. //choose between two offsets the one that split the less the surface.
float min_width = float(bridge_flow.scaled_width()) * 3.f; float min_width = float(bridge_flow.scaled_width()) * 3.f;
for (Polygon& poly_to_check_for_thin : to_bridge_pp) { ExPolygons to_bridgeOK = offset2_ex(to_bridge_pp, -min_width, +min_width);
ExPolygons collapsed = offset2_ex({ poly_to_check_for_thin }, -min_width, +min_width * 1.25f); for (ExPolygon& poly_to_check_for_thin : union_ex(to_bridge_pp)) {
ExPolygons collapsed = offset2_ex(ExPolygons{ poly_to_check_for_thin }, -min_width, +min_width * 1.25f);
ExPolygons bridge = intersection_ex(collapsed, { ExPolygon{ poly_to_check_for_thin } }); ExPolygons bridge = intersection_ex(collapsed, { ExPolygon{ poly_to_check_for_thin } });
ExPolygons not_bridge = diff_ex({ ExPolygon{ poly_to_check_for_thin } }, collapsed); ExPolygons not_bridge = diff_ex({ ExPolygon{ poly_to_check_for_thin } }, collapsed);
int try1_count = bridge.size() + not_bridge.size(); int try1_count = bridge.size() + not_bridge.size();
if (try1_count > 1) { if (try1_count > 1) {
min_width = float(bridge_flow.scaled_width()) * 1.5f; min_width = float(bridge_flow.scaled_width()) * 1.5f;
collapsed = offset2_ex({ poly_to_check_for_thin }, -min_width, +min_width * 1.5f); collapsed = offset2_ex(ExPolygons{ poly_to_check_for_thin }, -min_width, +min_width * 1.5f);
ExPolygons bridge2 = intersection_ex(collapsed, { ExPolygon{ poly_to_check_for_thin } }); ExPolygons bridge2 = intersection_ex(collapsed, { ExPolygon{ poly_to_check_for_thin } });
not_bridge = diff_ex({ ExPolygon{ poly_to_check_for_thin } }, collapsed); not_bridge = diff_ex({ ExPolygon{ poly_to_check_for_thin } }, collapsed);
int try2_count = bridge2.size() + not_bridge.size(); int try2_count = bridge2.size() + not_bridge.size();
@ -2229,14 +2230,15 @@ namespace Slic3r {
to_bridge.insert(to_bridge.begin(), bridge2.begin(), bridge2.end()); to_bridge.insert(to_bridge.begin(), bridge2.begin(), bridge2.end());
else else
to_bridge.insert(to_bridge.begin(), bridge.begin(), bridge.end()); to_bridge.insert(to_bridge.begin(), bridge.begin(), bridge.end());
} else if (!bridge.empty()) } else {
to_bridge.push_back(bridge.front()); to_bridge.insert(to_bridge.begin(), bridge.begin(), bridge.end());
}
} }
} }
if (to_bridge.empty()) continue; if (to_bridge.empty()) continue;
// union // union not needed as we already did one for polygon->expoly conversion, and there was only collapse (no grow) after that.
to_bridge = union_ex(to_bridge); //to_bridge = union_ex(to_bridge);
} }
#ifdef SLIC3R_DEBUG #ifdef SLIC3R_DEBUG
printf("Bridging %zu internal areas at layer %zu\n", to_bridge.size(), layer->id()); printf("Bridging %zu internal areas at layer %zu\n", to_bridge.size(), layer->id());