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

optimisation for remove_point_too_near, using only distance_to_square instead of distance_to

Browse Source 
#106
This commit is contained in:
supermerill 2019-10-22 18:02:25 +02:00
parent 8aaaeaf9de
commit 26db1722ae
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libslic3r/ExPolygon.cpp
View File

@ -199,22 +199,23 @@ ExPolygon::simplify(double tolerance, ExPolygons* expolygons) const
//simplier than simplify //simplier than simplify
void void
ExPolygon::remove_point_too_near(const coord_t tolerance) { ExPolygon::remove_point_too_near(const coord_t tolerance) {
const double tolerance_sq = tolerance * (double)tolerance;
size_t id = 1; size_t id = 1;
while (id < this->contour.points.size() - 1) { while (id < this->contour.points.size() - 1) {
coord_t newdist = (coord_t)std::min(this->contour.points[id].distance_to(this->contour.points[id - 1]) coord_t newdist = (coord_t)std::min(this->contour.points[id].distance_to_square(this->contour.points[id - 1])
, this->contour.points[id].distance_to(this->contour.points[id + 1])); , this->contour.points[id].distance_to_square(this->contour.points[id + 1]));
if (newdist < tolerance) { if (newdist < tolerance_sq) {
this->contour.points.erase(this->contour.points.begin() + id); this->contour.points.erase(this->contour.points.begin() + id);
newdist = (coord_t)this->contour.points[id].distance_to(this->contour.points[id - 1]); newdist = (coord_t)this->contour.points[id].distance_to_square(this->contour.points[id - 1]);
} }
//go to next one //go to next one
//if you removed a point, it check if the next one isn't too near from the previous one. //if you removed a point, it check if the next one isn't too near from the previous one.
// if not, it byepass it. // if not, it byepass it.
if (newdist > tolerance) { if (newdist > tolerance_sq) {
++id; ++id;
} }
} }
if (this->contour.points.front().distance_to(this->contour.points.back()) < tolerance) { if (this->contour.points.front().distance_to_square(this->contour.points.back()) < tolerance_sq) {
this->contour.points.erase(this->contour.points.end() -1); this->contour.points.erase(this->contour.points.end() -1);
} }
} }