diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp index ec5418348..7ce3cebc3 100644 --- a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp +++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp @@ -122,10 +122,6 @@ static Point find_first_different_vertex(const Polygon &polygon, const size_t po return polygon.points[line_idx]; } -//FIXME will be in Point.h in the master -template -inline Eigen::Matrix perp(const Eigen::MatrixBase>& v) { return Eigen::Matrix(-v.y(), v.x()); } - static Vec2d three_points_inward_normal(const Point &left, const Point &middle, const Point &right) { assert(left != middle); @@ -223,11 +219,11 @@ static Direction get_shortest_direction(const AvoidCrossingPerimeters::Boundary float total_length_backward = dist_first + contour_length - dist_second; if (reversed) std::swap(total_length_forward, total_length_backward); - total_length_forward -= (intersection_first.point - poly[intersection_first.line_idx]).cast().norm(); - total_length_backward -= (poly[(intersection_first.line_idx + 1) % poly.size()] - intersection_first.point).cast().norm(); + total_length_forward -= (intersection_first.point - poly[intersection_first.line_idx]).cast().norm(); + total_length_backward -= (poly[(intersection_first.line_idx + 1) % poly.size()] - intersection_first.point).cast().norm(); - total_length_forward -= (poly[(intersection_second.line_idx + 1) % poly.size()] - intersection_second.point).cast().norm(); - total_length_backward -= (intersection_second.point - poly[intersection_second.line_idx]).cast().norm(); + total_length_forward -= (poly[(intersection_second.line_idx + 1) % poly.size()] - intersection_second.point).cast().norm(); + total_length_backward -= (intersection_second.point - poly[intersection_second.line_idx]).cast().norm(); if (total_length_forward < total_length_backward) return Direction::Forward; return Direction::Backward;