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

fix _shrink_contour_holes (xy_inner_size_compensation) when a hole collapse into hole & contours

Browse Source 
supermerill/SuperSlicer#2339
This commit is contained in:
remi durand 2022-02-10 14:24:13 +01:00 committed by supermerill
parent 2f85825131
commit 35d334eb1c
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libslic3r/PrintObject.cpp
View File

@ -2934,7 +2934,7 @@ namespace Slic3r {
double max_hole_area = scale_d(scale_d(m_config.hole_size_threshold.value)); double max_hole_area = scale_d(scale_d(m_config.hole_size_threshold.value));
for (const ExPolygon& ex_poly : polys) { for (const ExPolygon& ex_poly : polys) {
Polygons contours; Polygons contours;
Polygons holes; ExPolygons holes;
for (const Polygon& hole : ex_poly.holes) { for (const Polygon& hole : ex_poly.holes) {
//check if convex to reduce it //check if convex to reduce it
// check whether first point forms a convex angle // check whether first point forms a convex angle
@ -2964,27 +2964,29 @@ namespace Slic3r {
convex_delta_adapted = convex_delta * percent + (1 - percent) * not_convex_delta; convex_delta_adapted = convex_delta * percent + (1 - percent) * not_convex_delta;
} }
if (convex_delta_adapted != 0) { if (convex_delta_adapted != 0) {
for (Polygon& newHole : offset(hole, -convex_delta_adapted)) { Polygon hole_as_contour = hole;
newHole.make_counter_clockwise(); hole_as_contour.make_counter_clockwise();
holes.emplace_back(std::move(newHole)); for (ExPolygon& newHole : offset_ex(hole_as_contour, convex_delta_adapted)) {
holes.push_back(std::move(newHole));
} }
} else { } else {
holes.push_back(hole); holes.push_back(ExPolygon{ hole });
holes.back().make_counter_clockwise(); holes.back().contour.make_counter_clockwise();
} }
} else { } else {
holes.push_back(hole); holes.push_back(ExPolygon{ hole });
holes.back().make_counter_clockwise(); holes.back().contour.make_counter_clockwise();
} }
} else { } else {
if (not_convex_delta != 0) { if (not_convex_delta != 0) {
for (Polygon& newHole : offset(hole, -not_convex_delta)) { Polygon hole_as_contour = hole;
newHole.make_counter_clockwise(); hole_as_contour.make_counter_clockwise();
holes.emplace_back(std::move(newHole)); for (ExPolygon& newHole : offset_ex(hole_as_contour, not_convex_delta)) {
holes.push_back(std::move(newHole));
} }
} else { } else {
holes.push_back(hole); holes.push_back(ExPolygon{ hole });
holes.back().make_counter_clockwise(); holes.back().contour.make_counter_clockwise();
} }
} }
} }
@ -2997,7 +2999,7 @@ namespace Slic3r {
} else { } else {
contours.push_back(ex_poly.contour); contours.push_back(ex_poly.contour);
} }
ExPolygons temp = diff_ex(union_(contours), union_(holes)); ExPolygons temp = diff_ex(union_ex(contours), union_ex(holes));
new_ex_polys.insert(new_ex_polys.end(), std::make_move_iterator(temp.begin()), std::make_move_iterator(temp.end())); new_ex_polys.insert(new_ex_polys.end(), std::make_move_iterator(temp.begin()), std::make_move_iterator(temp.end()));
} }
return union_ex(new_ex_polys); return union_ex(new_ex_polys);