3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 11:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed the "avoid crossing perimeters" bug introduced in Slic3r 1.34.1.24

Browse source 
https://github.com/prusa3d/Slic3r/issues/311
https://github.com/prusa3d/Slic3r/issues/317
https://github.com/prusa3d/Slic3r/issues/323
This commit is contained in:
bubnikv 2017-06-02 13:33:19 +02:00
parent ef73bb404b
commit b5f38dd23f
7 changed files with 191 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

32
xs/src/libslic3r/Point.cpp
View file

@ -119,29 +119,6 @@ int Point::nearest_point_index(const PointConstPtrs &points) const
return idx;
}
/* This method finds the point that is closest to both this point and the supplied one */
size_t Point::nearest_waypoint_index(const Points &points, const Point &dest) const
{
size_t idx = size_t(-1);
double d2min = std::numeric_limits<double>::infinity(); // double because long is limited to 2147483647 on some platforms and it's not enough
for (const Point &p : points) {
double d2 =
// distance from this to candidate
sqr<double>(this->x - p.x) + sqr<double>(this->y - p.y) +
// distance from candidate to dest
sqr<double>(p.x - dest.x) + sqr<double>(p.y - dest.y);
if (d2 < d2min) {
idx = &p - points.data();
d2min = d2;
if (d2min < EPSILON)
break;
}
}
return idx;
}
int
Point::nearest_point_index(const PointPtrs &points) const
{
@ -161,15 +138,6 @@ Point::nearest_point(const Points &points, Point* point) const
return true;
}
bool
Point::nearest_waypoint(const Points &points, const Point &dest, Point* point) const
{
int idx = this->nearest_waypoint_index(points, dest);
if (idx == -1) return false;
*point = points.at(idx);
return true;
}
/* distance to the closest point of line */
double
Point::distance_to(const Line &line) const