GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 16:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crashes.

Browse Source 
Set common bridging angle to touching surfaces, otherwise bad stuff happens.
This commit is contained in:
PavelMikus 2023-02-24 11:56:24 +01:00
parent afe782f6fc
commit 5656d4ea6d
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libslic3r/PrintObject.cpp
View File

@ -1671,7 +1671,7 @@ void PrintObject::bridge_over_infill()
} }
} }
for (const std::pair<const LayerSlice *, SurfacesPtr> candidates : bridging_surface_candidates) { for (std::pair<const LayerSlice *, SurfacesPtr> candidates : bridging_surface_candidates) {
if (candidates.second.empty()) { if (candidates.second.empty()) {
continue; continue;
}; };
@ -1733,6 +1733,7 @@ void PrintObject::bridge_over_infill()
} }
} }
current_links = next_links; current_links = next_links;
next_links.clear();
} }
lower_layers_sparse_infill = intersection(lower_layers_sparse_infill, lower_layers_sparse_infill = intersection(lower_layers_sparse_infill,
@ -1764,6 +1765,18 @@ void PrintObject::bridge_over_infill()
expand_area.insert(expand_area.end(), a.begin(), a.end()); expand_area.insert(expand_area.end(), a.begin(), a.end());
} }
// Presort the candidate polygons. This will help choose the same angle for neighbournig surfaces, that would otherwise
// compete over anchoring sparse infill lines, leaving one area unachored
std::sort(candidates.second.begin(), candidates.second.end(), [](const Surface* left, const Surface* right){
auto a = get_extents(left->expolygon);
auto b = get_extents(right->expolygon);
if (a.min.x() == b.min.x()) {
return a.min.y() < b.min.y();
};
return a.min.x() < b.min.x();
});
// Lower layers sparse infill sections gathered // Lower layers sparse infill sections gathered
// now we can intersected them with bridging surface candidates to get actual areas that need and can accumulate // now we can intersected them with bridging surface candidates to get actual areas that need and can accumulate
// bridging. These areas we then expand (within the surrounding sparse infill only!) // bridging. These areas we then expand (within the surrounding sparse infill only!)
@ -1807,7 +1820,14 @@ void PrintObject::bridge_over_infill()
#endif #endif
double bridging_angle = 0; double bridging_angle = 0;
{ Polygons tmp_expanded_area = expand(bridged_area, 3.0 * flow.scaled_spacing());
for (const ModifiedSurface& s : bridging_surfaces[candidates.first]) {
if (!intersection(s.new_polys, tmp_expanded_area).empty()) {
bridging_angle = s.bridge_angle;
break;
}
}
if (bridging_angle == 0) {
AABBTreeLines::LinesDistancer<Line> lines_tree{anchors.empty() ? anchors_and_walls : to_lines(anchors)}; AABBTreeLines::LinesDistancer<Line> lines_tree{anchors.empty() ? anchors_and_walls : to_lines(anchors)};
std::map<double, int> counted_directions; std::map<double, int> counted_directions;