3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yet another improvement in closing gaps in slices.

Browse Source 
Fixes #1256 and it finally fixes #1119 as well.
This commit is contained in:
bubnikv 2018-10-05 10:25:50 +02:00
parent abd22b31c9
commit 517b96eef8
4 changed files with 147 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xs/src/libslic3r/MultiPoint.hpp
View File

@ -105,6 +105,23 @@ extern BoundingBox get_extents(const MultiPoint &mp);
extern BoundingBox get_extents_rotated(const std::vector<Point> &points, double angle); extern BoundingBox get_extents_rotated(const std::vector<Point> &points, double angle);
extern BoundingBox get_extents_rotated(const MultiPoint &mp, double angle); extern BoundingBox get_extents_rotated(const MultiPoint &mp, double angle);
inline double length(const Points &pts) {
double total = 0;
if (! pts.empty()) {
auto it = pts.begin();
for (auto it_prev = it ++; it != pts.end(); ++ it, ++ it_prev)
total += it->distance_to(*it_prev);
}
return total;
}
inline double area(const Points &polygon) {
double area = 0.;
for (size_t i = 0, j = polygon.size() - 1; i < polygon.size(); j = i ++)
area += double(polygon[j].x + polygon[i].x) * double(polygon[i].y - polygon[j].y);
return area;
}
} // namespace Slic3r } // namespace Slic3r
#endif #endif

18
xs/src/libslic3r/Point.hpp
View File

@ -150,6 +150,24 @@ public:
m_map.emplace(std::make_pair(Point(pt->x>>m_grid_log2, pt->y>>m_grid_log2), std::move(value))); m_map.emplace(std::make_pair(Point(pt->x>>m_grid_log2, pt->y>>m_grid_log2), std::move(value)));
} }
// Erase a data point equal to value. (ValueType has to declare the operator==).
// Returns true if the data point equal to value was found and removed.
bool erase(const ValueType &value) {
const Point *pt = m_point_accessor(value);
if (pt != nullptr) {
// Range of fragment starts around grid_corner, close to pt.
auto range = m_map.equal_range(Point(pt->x>>m_grid_log2, pt->y>>m_grid_log2));
// Remove the first item.
for (auto it = range.first; it != range.second; ++ it) {
if (it->second == value) {
m_map.erase(it);
return true;
}
}
}
return false;
}
// Return a pair of <ValueType*, distance_squared> // Return a pair of <ValueType*, distance_squared>
std::pair<const ValueType*, double> find(const Point &pt) { std::pair<const ValueType*, double> find(const Point &pt) {
// Iterate over 4 closest grid cells around pt, // Iterate over 4 closest grid cells around pt,

4
xs/src/libslic3r/Polyline.hpp
View File

@ -81,8 +81,8 @@ extern BoundingBox get_extents(const Polylines &polylines);
inline double total_length(const Polylines &polylines) { inline double total_length(const Polylines &polylines) {
double total = 0; double total = 0;
for (Polylines::const_iterator it = polylines.begin(); it != polylines.end(); ++it) for (const Polyline &pl : polylines)
total += it->length(); total += pl.length();
return total; return total;
} }

216
xs/src/libslic3r/TriangleMesh.cpp
View File

@ -1397,101 +1397,80 @@ void TriangleMeshSlicer::make_loops(std::vector<IntersectionLine> &lines, Polygo
// Is it the start or end point? // Is it the start or end point?
bool start; bool start;
const IntersectionReference& ipref() const { return start ? polyline->start : polyline->end; } const IntersectionReference& ipref() const { return start ? polyline->start : polyline->end; }
int point_id() const { return ipref().point_id; } // Return a unique ID for the intersection point.
int edge_id () const { return ipref().edge_id; } // Return a positive id for a point, or a negative id for an edge.
int id() const { const IntersectionReference &r = ipref(); return (r.point_id >= 0) ? r.point_id : - r.edge_id; }
bool operator==(const OpenPolylineEnd &rhs) const { return this->polyline == rhs.polyline && this->start == rhs.start; }
}; };
auto by_edge_lower = [](const OpenPolylineEnd &ope1, const OpenPolylineEnd &ope2) { return ope1.edge_id() < ope2.edge_id(); }; auto by_id_lower = [](const OpenPolylineEnd &ope1, const OpenPolylineEnd &ope2) { return ope1.id() < ope2.id(); };
auto by_point_lower = [](const OpenPolylineEnd &ope1, const OpenPolylineEnd &ope2) { return ope1.point_id() < ope2.point_id(); }; std::vector<OpenPolylineEnd> by_id;
std::vector<OpenPolylineEnd> by_edge_id; by_id.reserve(2 * open_polylines.size());
std::vector<OpenPolylineEnd> by_point_id;
by_edge_id.reserve(2 * open_polylines.size());
by_point_id.reserve(2 * open_polylines.size());
for (OpenPolyline &opl : open_polylines) { for (OpenPolyline &opl : open_polylines) {
if (opl.start.edge_id != -1) if (opl.start.point_id != -1 || opl.start.edge_id != -1)
by_edge_id .emplace_back(OpenPolylineEnd(&opl, true)); by_id.emplace_back(OpenPolylineEnd(&opl, true));
if (try_connect_reversed) { if (try_connect_reversed && (opl.end.point_id != -1 || opl.end.edge_id != -1))
if (opl.end.edge_id != -1) by_id.emplace_back(OpenPolylineEnd(&opl, false));
by_edge_id .emplace_back(OpenPolylineEnd(&opl, false));
}
if (opl.start.point_id != -1)
by_point_id.emplace_back(OpenPolylineEnd(&opl, true));
if (try_connect_reversed) {
if (opl.end.point_id != -1)
by_point_id.emplace_back(OpenPolylineEnd(&opl, false));
}
} }
std::sort(by_edge_id .begin(), by_edge_id .end(), by_edge_lower); std::sort(by_id.begin(), by_id.end(), by_id_lower);
std::sort(by_point_id.begin(), by_point_id.end(), by_point_lower); // Find an iterator to by_id_lower for the particular end of OpenPolyline (by comparing the OpenPolyline pointer and the start attribute).
auto find_polyline_end = [&by_id, by_id_lower](const OpenPolylineEnd &end) -> std::vector<OpenPolylineEnd>::iterator {
for (auto it = std::lower_bound(by_id.begin(), by_id.end(), end, by_id_lower);
it != by_id.end() && it->id() == end.id(); ++ it)
if (*it == end)
return it;
return by_id.end();
};
// Try to connect the loops. // Try to connect the loops.
for (OpenPolyline &opl : open_polylines) { for (OpenPolyline &opl : open_polylines) {
if (opl.consumed) if (opl.consumed)
continue; continue;
opl.consumed = true; opl.consumed = true;
OpenPolylineEnd end(&opl, false); OpenPolylineEnd end(&opl, false);
for (;;) { for (;;) {
// find a line starting where last one finishes // find a line starting where last one finishes
OpenPolylineEnd* next_start = nullptr; auto it_next_start = std::lower_bound(by_id.begin(), by_id.end(), end, by_id_lower);
if (end.edge_id() != -1) { for (; it_next_start != by_id.end() && it_next_start->id() == end.id(); ++ it_next_start)
auto it_begin = std::lower_bound(by_edge_id.begin(), by_edge_id.end(), end, by_edge_lower); if (! it_next_start->polyline->consumed)
if (it_begin != by_edge_id.end()) { goto found;
auto it_end = std::upper_bound(it_begin, by_edge_id.end(), end, by_edge_lower); // The current loop could not be closed. Unmark the segment.
for (auto it_edge = it_begin; it_edge != it_end; ++ it_edge) opl.consumed = false;
if (! it_edge->polyline->consumed) { break;
next_start = &(*it_edge); found:
break;
}
}
}
if (next_start == nullptr && end.point_id() != -1) {
auto it_begin = std::lower_bound(by_point_id.begin(), by_point_id.end(), end, by_point_lower);
if (it_begin != by_point_id.end()) {
auto it_end = std::upper_bound(it_begin, by_point_id.end(), end, by_point_lower);
for (auto it_point = it_begin; it_point != it_end; ++ it_point)
if (! it_point->polyline->consumed) {
next_start = &(*it_point);
break;
}
}
}
if (next_start == nullptr) {
// The current loop could not be closed. Unmark the segment.
opl.consumed = false;
break;
}
// Attach this polyline to the end of the initial polyline. // Attach this polyline to the end of the initial polyline.
if (next_start->start) { if (it_next_start->start) {
auto it = next_start->polyline->points.begin(); auto it = it_next_start->polyline->points.begin();
std::copy(++ it, next_start->polyline->points.end(), back_inserter(opl.points)); std::copy(++ it, it_next_start->polyline->points.end(), back_inserter(opl.points));
} else { } else {
auto it = next_start->polyline->points.rbegin(); auto it = it_next_start->polyline->points.rbegin();
std::copy(++ it, next_start->polyline->points.rend(), back_inserter(opl.points)); std::copy(++ it, it_next_start->polyline->points.rend(), back_inserter(opl.points));
} }
end = *next_start; // Mark the next polyline as consumed.
end.start = !end.start; it_next_start->polyline->points.clear();
next_start->polyline->points.clear(); it_next_start->polyline->consumed = true;
next_start->polyline->consumed = true; if (try_connect_reversed) {
// Running in a mode, where the polylines may be connected by mixing their orientations.
// Update the end point lookup structure after the end point of the current polyline was extended.
auto it_end = find_polyline_end(end);
auto it_next_end = find_polyline_end(OpenPolylineEnd(it_next_start->polyline, !it_next_start->start));
// Swap the end points of the current and next polyline, but keep the polyline ptr and the start flag.
std::swap(opl.end, it_next_end->start ? it_next_end->polyline->start : it_next_end->polyline->end);
// Swap the positions of OpenPolylineEnd structures in the sorted array to match their respective end point positions.
std::swap(*it_end, *it_next_end);
}
// Check whether we closed this loop. // Check whether we closed this loop.
const IntersectionReference &ip1 = opl.start; if ((opl.start.edge_id != -1 && opl.start.edge_id == opl.end.edge_id) ||
const IntersectionReference &ip2 = end.ipref(); (opl.start.point_id != -1 && opl.start.point_id == opl.end.point_id)) {
if ((ip1.edge_id != -1 && ip1.edge_id == ip2.edge_id) ||
(ip1.point_id != -1 && ip1.point_id == ip2.point_id)) {
// The current loop is complete. Add it to the output. // The current loop is complete. Add it to the output.
//assert(opl.points.front().point_id == opl.points.back().point_id); //assert(opl.points.front().point_id == opl.points.back().point_id);
//assert(opl.points.front().edge_id == opl.points.back().edge_id); //assert(opl.points.front().edge_id == opl.points.back().edge_id);
// Remove the duplicate last point. // Remove the duplicate last point.
opl.points.pop_back(); opl.points.pop_back();
if (opl.points.size() >= 3) { if (opl.points.size() >= 3) {
if (try_connect_reversed) { if (try_connect_reversed && area(opl.points) < 0)
// The closed polygon is patched from pieces with messed up orientation, therefore // The closed polygon is patched from pieces with messed up orientation, therefore
// the orientation of the patched up polygon is not known. // the orientation of the patched up polygon is not known.
// Orient the patched up polygons CCW. This heuristic may close some holes and cavities. // Orient the patched up polygons CCW. This heuristic may close some holes and cavities.
double area = 0.; std::reverse(opl.points.begin(), opl.points.end());
for (size_t i = 0, j = opl.points.size() - 1; i < opl.points.size(); j = i ++)
area += double(opl.points[j].x + opl.points[i].x) * double(opl.points[i].y - opl.points[j].y);
if (area < 0)
std::reverse(opl.points.begin(), opl.points.end());
}
loops->emplace_back(std::move(opl.points)); loops->emplace_back(std::move(opl.points));
} }
opl.points.clear(); opl.points.clear();
@ -1531,6 +1510,7 @@ void TriangleMeshSlicer::make_loops(std::vector<IntersectionLine> &lines, Polygo
// Is it the start or end point? // Is it the start or end point?
bool start; bool start;
const Point& point() const { return start ? polyline->points.front() : polyline->points.back(); } const Point& point() const { return start ? polyline->points.front() : polyline->points.back(); }
bool operator==(const OpenPolylineEnd &rhs) const { return this->polyline == rhs.polyline && this->start == rhs.start; }
}; };
struct OpenPolylineEndAccessor { struct OpenPolylineEndAccessor {
const Point* operator()(const OpenPolylineEnd &pt) const { return pt.polyline->consumed ? nullptr : &pt.point(); } const Point* operator()(const OpenPolylineEnd &pt) const { return pt.polyline->consumed ? nullptr : &pt.point(); }
@ -1546,57 +1526,76 @@ void TriangleMeshSlicer::make_loops(std::vector<IntersectionLine> &lines, Polygo
for (OpenPolyline &opl : open_polylines) { for (OpenPolyline &opl : open_polylines) {
if (opl.consumed) if (opl.consumed)
continue; continue;
opl.consumed = true;
OpenPolylineEnd end(&opl, false); OpenPolylineEnd end(&opl, false);
if (try_connect_reversed)
// The end point of this polyline will be modified, thus the following entry will become invalid. Remove it.
closest_end_point_lookup.erase(end);
opl.consumed = true;
size_t n_segments_joined = 1; size_t n_segments_joined = 1;
for (;;) { for (;;) {
// Find a line starting where last one finishes, only return non-consumed open polylines (OpenPolylineEndAccessor returns null for consumed). // Find a line starting where last one finishes, only return non-consumed open polylines (OpenPolylineEndAccessor returns null for consumed).
std::pair<const OpenPolylineEnd*, double> next_start_and_dist = closest_end_point_lookup.find(end.point()); std::pair<const OpenPolylineEnd*, double> next_start_and_dist = closest_end_point_lookup.find(end.point());
const OpenPolylineEnd *next_start = next_start_and_dist.first; const OpenPolylineEnd *next_start = next_start_and_dist.first;
// Check whether we closed this loop. // Check whether we closed this loop.
double current_loop_closing_distance2 = opl.points.front().distance_to_sq(opl.points.back()); double current_loop_closing_distance2 = opl.points.front().distance_to_sq(opl.points.back());
if (next_start == nullptr || current_loop_closing_distance2 < next_start_and_dist.second) { bool loop_closed = current_loop_closing_distance2 < coordf_t(max_gap_scaled) * coordf_t(max_gap_scaled);
if (current_loop_closing_distance2 < coordf_t(max_gap_scaled) * coordf_t(max_gap_scaled)) { if (next_start != nullptr && loop_closed && current_loop_closing_distance2 < next_start_and_dist.second) {
if (current_loop_closing_distance2 == 0.) { // Heuristics to decide, whether to close the loop, or connect another polyline.
// Remove the duplicate last point. // One should avoid closing loops shorter than max_gap_scaled.
opl.points.pop_back(); loop_closed = sqrt(current_loop_closing_distance2) < 0.3 * length(opl.points);
} else { }
// The end points are different, keep both of them. if (loop_closed) {
} // Remove the start point of the current polyline from the lookup.
if (opl.points.size() >= 3) { // Mark the current segment as not consumed, otherwise the closest_end_point_lookup.erase() would fail.
if (try_connect_reversed && n_segments_joined > 1) { opl.consumed = false;
// The closed polygon is patched from pieces with messed up orientation, therefore closest_end_point_lookup.erase(OpenPolylineEnd(&opl, true));
// the orientation of the patched up polygon is not known. if (current_loop_closing_distance2 == 0.) {
// Orient the patched up polygons CCW. This heuristic may close some holes and cavities. // Remove the duplicate last point.
double area = 0.; opl.points.pop_back();
for (size_t i = 0, j = opl.points.size() - 1; i < opl.points.size(); j = i ++) } else {
area += double(opl.points[j].x + opl.points[i].x) * double(opl.points[i].y - opl.points[j].y); // The end points are different, keep both of them.
if (area < 0)
std::reverse(opl.points.begin(), opl.points.end());
}
loops->emplace_back(std::move(opl.points));
}
opl.points.clear();
break;
} }
if (opl.points.size() >= 3) {
if (try_connect_reversed && n_segments_joined > 1 && area(opl.points) < 0)
// The closed polygon is patched from pieces with messed up orientation, therefore
// the orientation of the patched up polygon is not known.
// Orient the patched up polygons CCW. This heuristic may close some holes and cavities.
std::reverse(opl.points.begin(), opl.points.end());
loops->emplace_back(std::move(opl.points));
}
opl.points.clear();
opl.consumed = true;
break;
}
if (next_start == nullptr) {
// The current loop could not be closed. Unmark the segment. // The current loop could not be closed. Unmark the segment.
opl.consumed = false; opl.consumed = false;
if (try_connect_reversed)
// Re-insert the end point.
closest_end_point_lookup.insert(OpenPolylineEnd(&opl, false));
break; break;
} }
// Attach this polyline to the end of the initial polyline. // Attach this polyline to the end of the initial polyline.
if (next_start->start) { if (next_start->start) {
auto it = next_start->polyline->points.begin(); auto it = next_start->polyline->points.begin();
std::copy(++ it, next_start->polyline->points.end(), back_inserter(opl.points)); if (*it == opl.points.back())
++ it;
std::copy(it, next_start->polyline->points.end(), back_inserter(opl.points));
} else { } else {
auto it = next_start->polyline->points.rbegin(); auto it = next_start->polyline->points.rbegin();
std::copy(++ it, next_start->polyline->points.rend(), back_inserter(opl.points)); if (*it == opl.points.back())
++ it;
std::copy(it, next_start->polyline->points.rend(), back_inserter(opl.points));
} }
++ n_segments_joined; ++ n_segments_joined;
end = *next_start; // Remove the end points of the consumed polyline segment from the lookup.
end.start = !end.start; OpenPolyline *opl2 = next_start->polyline;
next_start->polyline->points.clear(); closest_end_point_lookup.erase(OpenPolylineEnd(opl2, true));
next_start->polyline->consumed = true; if (try_connect_reversed)
// Continue with the current loop. closest_end_point_lookup.erase(OpenPolylineEnd(opl2, false));
opl2->points.clear();
opl2->consumed = true;
// Continue with the current loop.
} }
} }
} }
@ -1606,8 +1605,13 @@ void TriangleMeshSlicer::make_loops(std::vector<IntersectionLine> &lines, Polygo
static int iRun = 0; static int iRun = 0;
SVG svg(debug_out_path("TriangleMeshSlicer_make_loops-polylines-final-%d.svg", iRun++).c_str(), bbox_svg); SVG svg(debug_out_path("TriangleMeshSlicer_make_loops-polylines-final-%d.svg", iRun++).c_str(), bbox_svg);
svg.draw(union_ex(*loops)); svg.draw(union_ex(*loops));
for (const OpenPolyline &pl : open_polylines) for (const OpenPolyline &pl : open_polylines) {
svg.draw(Polyline(pl.points), "red"); if (pl.points.empty())
continue;
svg.draw(Polyline(pl.points), "red");
svg.draw(pl.points.front(), "blue");
svg.draw(pl.points.back(), "blue");
}
svg.Close(); svg.Close();
} }
#endif /* SLIC3R_DEBUG_SLICE_PROCESSING */ #endif /* SLIC3R_DEBUG_SLICE_PROCESSING */