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

Improvements to triangulation, trying to workaround weaknesses of poly2tri, but no success. #3953

Browse Source
This commit is contained in:
Alessandro Ranellucci 2017-05-26 17:19:55 +02:00
parent 27d807448f
commit 8efbc7636e
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xs/src/libslic3r/ExPolygon.cpp
View File

@ -450,25 +450,37 @@ ExPolygon::triangulate_pp(Polygons* polygons) const
void void
ExPolygon::triangulate_p2t(Polygons* polygons) const ExPolygon::triangulate_p2t(Polygons* polygons) const
{ {
ExPolygons expp = simplify_polygons_ex(*this, true); for (const ExPolygon &ex : simplify_polygons_ex(*this, true)) {
for (ExPolygons::const_iterator ex = expp.begin(); ex != expp.end(); ++ex) {
// TODO: prevent duplicate points
// contour // contour
std::vector<p2t::Point*> ContourPoints; std::vector<p2t::Point*> ContourPoints;
for (Points::const_iterator point = ex->contour.points.begin(); point != ex->contour.points.end(); ++point) {
Polygon contour = ex.contour;
contour.remove_duplicate_points();
for (const Point &point : contour.points) {
// We should delete each p2t::Point object // We should delete each p2t::Point object
ContourPoints.push_back(new p2t::Point(point->x, point->y)); ContourPoints.push_back(new p2t::Point(point.x, point.y));
} }
p2t::CDT cdt(ContourPoints); p2t::CDT cdt(ContourPoints);
// holes // holes
for (Polygons::const_iterator hole = ex->holes.begin(); hole != ex->holes.end(); ++hole) { for (Polygon hole : ex.holes) {
hole.remove_duplicate_points();
std::vector<p2t::Point*> points; std::vector<p2t::Point*> points;
for (Points::const_iterator point = hole->points.begin(); point != hole->points.end(); ++point) { Point prev = hole.points.back();
for (Point &point : hole.points) {
// Shrink large polygons by reducing each coordinate by 1 in the
// general direction of the last point as we wind around
// This normally wouldn't work in every case, but our upscaled polygons
// have little chance to create new duplicate points with this method.
// For information on why this was needed, see:
// https://code.google.com/p/poly2tri/issues/detail?id=90
// https://github.com/raptor/clip2tri
(point.x - prev.x) > 0 ? point.x-- : point.x++;
(point.y - prev.y) > 0 ? point.y-- : point.y++;
prev = point;
// will be destructed in SweepContext::~SweepContext // will be destructed in SweepContext::~SweepContext
points.push_back(new p2t::Point(point->x, point->y)); points.push_back(new p2t::Point(point.x, point.y));
} }
cdt.AddHole(points); cdt.AddHole(points);
} }
@ -477,18 +489,17 @@ ExPolygon::triangulate_p2t(Polygons* polygons) const
cdt.Triangulate(); cdt.Triangulate();
std::vector<p2t::Triangle*> triangles = cdt.GetTriangles(); std::vector<p2t::Triangle*> triangles = cdt.GetTriangles();
for (std::vector<p2t::Triangle*>::const_iterator triangle = triangles.begin(); triangle != triangles.end(); ++triangle) { for (p2t::Triangle* triangle : triangles) {
Polygon p; Polygon p;
for (int i = 0; i <= 2; ++i) { for (int i = 0; i <= 2; ++i) {
p2t::Point* point = (*triangle)->GetPoint(i); p2t::Point* point = triangle->GetPoint(i);
p.points.push_back(Point(point->x, point->y)); p.points.push_back(Point(point->x, point->y));
} }
polygons->push_back(p); polygons->push_back(p);
} }
for(std::vector<p2t::Point*>::iterator it = ContourPoints.begin(); it != ContourPoints.end(); ++it) { for (p2t::Point* it : ContourPoints)
delete *it; delete it;
}
} }
} }