diff options
Diffstat (limited to 'xs/src/libslic3r/MotionPlanner.cpp')
-rw-r--r-- | xs/src/libslic3r/MotionPlanner.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xs/src/libslic3r/MotionPlanner.cpp b/xs/src/libslic3r/MotionPlanner.cpp index 89c767959..88b69ef82 100644 --- a/xs/src/libslic3r/MotionPlanner.cpp +++ b/xs/src/libslic3r/MotionPlanner.cpp @@ -86,10 +86,10 @@ MotionPlanner::shortest_path(const Point &from, const Point &to, Polyline* polyl // Are both points in the same island? int island_idx = -1; for (ExPolygons::const_iterator island = this->islands.begin(); island != this->islands.end(); ++island) { - if (island->contains_point(from) && island->contains_point(to)) { + if (island->contains(from) && island->contains(to)) { // since both points are in the same island, is a direct move possible? // if so, we avoid generating the visibility environment - if (island->contains_line(Line(from, to))) { + if (island->contains(Line(from, to))) { polyline->points.push_back(from); polyline->points.push_back(to); return; @@ -104,20 +104,20 @@ MotionPlanner::shortest_path(const Point &from, const Point &to, Polyline* polyl Point inner_to = to; bool from_is_inside, to_is_inside; if (island_idx == -1) { - if (!(from_is_inside = this->outer.contains_point(from))) { + if (!(from_is_inside = this->outer.contains(from))) { // Find the closest inner point to start from. from.nearest_point(this->outer, &inner_from); } - if (!(to_is_inside = this->outer.contains_point(to))) { + if (!(to_is_inside = this->outer.contains(to))) { // Find the closest inner point to start from. to.nearest_point(this->outer, &inner_to); } } else { - if (!(from_is_inside = this->inner[island_idx].contains_point(from))) { + if (!(from_is_inside = this->inner[island_idx].contains(from))) { // Find the closest inner point to start from. from.nearest_point(this->inner[island_idx], &inner_from); } - if (!(to_is_inside = this->inner[island_idx].contains_point(to))) { + if (!(to_is_inside = this->inner[island_idx].contains(to))) { // Find the closest inner point to start from. to.nearest_point(this->inner[island_idx], &inner_to); } @@ -175,12 +175,12 @@ MotionPlanner::init_graph(int island_idx) const VD::vertex_type* v1 = edge->vertex1(); Point p0 = Point(v0->x(), v0->y()); Point p1 = Point(v1->x(), v1->y()); - // contains_point() should probably be faster than contains_line(), + // contains() should probably be faster than contains(), // and should it fail on any boundary points it's not a big problem if (island_idx == -1) { - if (!this->outer.contains_point(p0) || !this->outer.contains_point(p1)) continue; + if (!this->outer.contains(p0) || !this->outer.contains(p1)) continue; } else { - if (!this->inner[island_idx].contains_point(p0) || !this->inner[island_idx].contains_point(p1)) continue; + if (!this->inner[island_idx].contains(p0) || !this->inner[island_idx].contains(p1)) continue; } t_vd_vertices::const_iterator i_v0 = vd_vertices.find(v0); |