3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 15:44:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FillRectilinear2:

Browse source 
Fix of a degenerate case, where there is a vertical segment on this vertical line and the contour
follows from left to right or vice versa, leading to low,low or high,high intersections.
This commit is contained in:
bubnikv 2017-01-29 00:20:09 +01:00
parent 0ca230a197
commit 4e90ae9a28
1 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

51
xs/src/libslic3r/Fill/FillRectilinear2.cpp
View file

@ -1101,36 +1101,55 @@ bool FillRectilinear2::fill_surface_by_lines(const Surface *surface, const FillP
size_t iSegment = sil.intersections[i].iSegment; size_t iSegment = sil.intersections[i].iSegment;
size_t iPrev = ((iSegment == 0) ? contour.size() : iSegment) - 1; size_t iPrev = ((iSegment == 0) ? contour.size() : iSegment) - 1;
coord_t dir = contour[iSegment].x - contour[iPrev].x; coord_t dir = contour[iSegment].x - contour[iPrev].x;
// bool ccw = poly_with_offset.is_contour_ccw(iContour);
// bool low = (dir > 0) == ccw;
bool low = dir > 0; bool low = dir > 0;
sil.intersections[i].type = poly_with_offset.is_contour_outer(iContour) ? sil.intersections[i].type = poly_with_offset.is_contour_outer(iContour) ?
(low ? SegmentIntersection::OUTER_LOW : SegmentIntersection::OUTER_HIGH) : (low ? SegmentIntersection::OUTER_LOW : SegmentIntersection::OUTER_HIGH) :
(low ? SegmentIntersection::INNER_LOW : SegmentIntersection::INNER_HIGH); (low ? SegmentIntersection::INNER_LOW : SegmentIntersection::INNER_HIGH);
if (j > 0 && if (j > 0 && sil.intersections[i].iContour == sil.intersections[j-1].iContour) {
sil.intersections[i].pos() == sil.intersections[j-1].pos() && // Two successive intersection points on a vertical line with the same contour. This may be a special case.
sil.intersections[i].iContour == sil.intersections[j-1].iContour) { if (sil.intersections[i].pos() == sil.intersections[j-1].pos()) {
if (sil.intersections[i].type == sil.intersections[j-1].type) { // Two successive segments meet exactly at the vertical line.
// This has to be a corner point crossing the vertical line. #ifdef SLIC3R_DEBUG
// Remove the second intersection point. // Verify that the segments of sil.intersections[i] and sil.intersections[j-1] are adjoint.
#ifdef SLIC3R_DEBUG
size_t iSegment2 = sil.intersections[j-1].iSegment; size_t iSegment2 = sil.intersections[j-1].iSegment;
size_t iPrev2 = ((iSegment2 == 0) ? contour.size() : iSegment2) - 1; size_t iPrev2 = ((iSegment2 == 0) ? contour.size() : iSegment2) - 1;
myassert(iSegment == iPrev2 || iSegment2 == iPrev); myassert(iSegment == iPrev2 || iSegment2 == iPrev);
#endif /* SLIC3R_DEBUG */ #endif /* SLIC3R_DEBUG */
if (sil.intersections[i].type == sil.intersections[j-1].type) {
// Two successive segments of the same direction (both to the right or both to the left)
// meet exactly at the vertical line.
// Remove the second intersection point.
} else {
// This is a loop returning to the same point.
// It may as well be a vertex of a loop touching this vertical line.
// Remove both the lines.
-- j;
}
} else if (sil.intersections[i].type == sil.intersections[j-1].type) {
// Two non successive segments of the same direction (both to the right or both to the left)
// meet exactly at the vertical line. That means there is a Z shaped path, where the center segment
// of the Z shaped path is aligned with this vertical line.
// Remove one of the intersection points while maximizing the vertical segment length.
if (low) {
// Remove the second intersection point, keep the first intersection point.
} else {
// Remove the first intersection point, keep the second intersection point.
sil.intersections[j-1] = sil.intersections[i];
}
} else { } else {
// This is a loop returning to the same point. // Vertical line intersects a contour segment at a general position (not at one of its end points).
// It may as well be a vertex of a loop touching this vertical line. // or the contour just touches this vertical line with a vertical segment or a sequence of vertical segments.
// Remove both the lines. // Keep both intersection points.
-- j; if (j < i)
sil.intersections[j] = sil.intersections[i];
++ j;
} }
} else { } else {
// Vertical line intersects a contour segment at a general position (not at one of its end points).
if (j < i) if (j < i)
sil.intersections[j] = sil.intersections[i]; sil.intersections[j] = sil.intersections[i];
++ j; ++ j;
} }
//FIXME solve a degenerate case, where there is a vertical segment on this vertical line and the contour
// follows from left to right or vice versa, leading to low,low or high,high intersections.
} }
// Shrink the list of intersections, if any of the intersection was removed during the classification. // Shrink the list of intersections, if any of the intersection was removed during the classification.
if (j < sil.intersections.size()) if (j < sil.intersections.size())