Merge branch 'master' into fs_emboss

# Conflicts:
#	src/libslic3r/Point.hpp

tests/libslic3r/CMakeLists.txt

@@ -13,6 +13,7 @@ add_executable(${_TEST_NAME}_tests
 	test_curve_fitting.cpp
 	test_cut_surface.cpp
 	test_elephant_foot_compensation.cpp
+	test_expolygon.cpp
 	test_geometry.cpp
 	test_placeholder_parser.cpp
 	test_polygon.cpp

tests/libslic3r/test_expolygon.cpp

@@ -0,0 +1,67 @@
+#include <catch2/catch.hpp>
+
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/ExPolygon.hpp"
+
+using namespace Slic3r;
+
+static inline bool points_close(const Point &p1, const Point &p2)
+{
+    return (p1 - p2).cast<double>().norm() < SCALED_EPSILON;
+}
+
+static bool polygons_close_permuted(const Polygon &poly1, const Polygon &poly2, const std::vector<int> &permutation2)
+{
+    if (poly1.size() != poly2.size() || poly1.size() != permutation2.size())
+        return false;
+    for (size_t i = 0; i < poly1.size(); ++ i)
+        if (poly1[i] != poly2[permutation2[i]])
+            return false;
+    return true;
+}
+
+SCENARIO("Basics", "[ExPolygon]") {
+    GIVEN("ccw_square") {
+        Polygon ccw_square{ { 100, 100 }, { 200, 100 }, { 200, 200 }, { 100, 200 } };
+        Polygon cw_hole_in_square{ { 140, 140 }, { 140, 160 }, { 160, 160 }, { 160, 140 } };
+        ExPolygon expolygon { ccw_square, cw_hole_in_square };
+        THEN("expolygon is valid") {
+            REQUIRE(expolygon.is_valid());
+        }
+        THEN("expolygon area") {
+            REQUIRE(expolygon.area() == Approx(100*100-20*20));
+        }
+        WHEN("Expolygon scaled") {
+            ExPolygon expolygon2 = expolygon;
+            expolygon2.scale(2.5);
+            REQUIRE(expolygon.contour.size() == expolygon2.contour.size());
+            REQUIRE(expolygon.holes.size() == 1);
+            REQUIRE(expolygon2.holes.size() == 1);
+            for (size_t i = 0; i < expolygon.contour.size(); ++ i)
+                REQUIRE(points_close(expolygon.contour[i] * 2.5, expolygon2.contour[i]));
+            for (size_t i = 0; i < expolygon.holes.front().size(); ++ i)
+                REQUIRE(points_close(expolygon.holes.front()[i] * 2.5, expolygon2.holes.front()[i]));
+        }
+        WHEN("Expolygon translated") {
+            ExPolygon expolygon2 = expolygon;
+            expolygon2.translate(10, -5);
+            REQUIRE(expolygon.contour.size() == expolygon2.contour.size());
+            REQUIRE(expolygon.holes.size() == 1);
+            REQUIRE(expolygon2.holes.size() == 1);
+            for (size_t i = 0; i < expolygon.contour.size(); ++ i)
+                REQUIRE(points_close(expolygon.contour[i] + Point(10, -5), expolygon2.contour[i]));
+            for (size_t i = 0; i < expolygon.holes.front().size(); ++ i)
+                REQUIRE(points_close(expolygon.holes.front()[i] + Point(10, -5), expolygon2.holes.front()[i]));
+        }
+        WHEN("Expolygon rotated around point") {
+            ExPolygon expolygon2 = expolygon;
+            expolygon2.rotate(M_PI / 2, Point(150, 150));
+            REQUIRE(expolygon.contour.size() == expolygon2.contour.size());
+            REQUIRE(expolygon.holes.size() == 1);
+            REQUIRE(expolygon2.holes.size() == 1);
+            REQUIRE(polygons_close_permuted(expolygon2.contour, expolygon.contour, { 1, 2, 3, 0}));
+            REQUIRE(polygons_close_permuted(expolygon2.holes.front(), expolygon.holes.front(), { 3, 0, 1, 2}));
+        }
+    }
+}

tests/libslic3r/test_voronoi.cpp

@@ -1918,7 +1918,6 @@ TEST_CASE("Voronoi skeleton", "[VoronoiSkeleton]")
     Lines lines = to_lines(poly);
     construct_voronoi(lines.begin(), lines.end(), &vd);
     Slic3r::Voronoi::annotate_inside_outside(vd, lines);
-    Slic3r::Voronoi::annotate_inside_outside(vd, lines);
     static constexpr double threshold_alpha = M_PI / 12.; // 30 degrees
     std::vector<Vec2d> skeleton_edges = Slic3r::Voronoi::skeleton_edges_rough(vd, lines, threshold_alpha);