From be236eda85748ac36dea51ac9d1b3a8af3760a8a Mon Sep 17 00:00:00 2001
From: Vojtech Bubnik <bubnikv@gmail.com>
Date: Sat, 23 Oct 2021 14:29:42 +0200
Subject: [PATCH] Renamed Geometry::intersect() to
 Geometry::convex_polygons_intersect() to convey its true meaning.

---
 src/libslic3r/Geometry.cpp        |  2 +-
 src/libslic3r/Geometry.hpp        |  2 +-
 tests/libslic3r/test_geometry.cpp | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp
index 4cf60dbe2..dfc463dde 100644
--- a/src/libslic3r/Geometry.cpp
+++ b/src/libslic3r/Geometry.cpp
@@ -1671,7 +1671,7 @@ void visit_antipodals (Idx& ia, Idx &ib, Fn &&fn)
 
 } // namespace rotcalip
 
-bool intersects(const Polygon &A, const Polygon &B)
+bool convex_polygons_intersect(const Polygon &A, const Polygon &B)
 {
     using namespace rotcalip;
 
diff --git a/src/libslic3r/Geometry.hpp b/src/libslic3r/Geometry.hpp
index 49886d4b8..d98cab9c7 100644
--- a/src/libslic3r/Geometry.hpp
+++ b/src/libslic3r/Geometry.hpp
@@ -563,7 +563,7 @@ inline bool is_rotation_ninety_degrees(const Vec3d &rotation)
 
 // Returns true if the intersection of the two convex polygons A and B
 // is not an empty set.
-bool intersects(const Polygon &A, const Polygon &B);
+bool convex_polygons_intersect(const Polygon &A, const Polygon &B);
 
 } } // namespace Slicer::Geometry
 
diff --git a/tests/libslic3r/test_geometry.cpp b/tests/libslic3r/test_geometry.cpp
index b183de1b4..dcb1004bf 100644
--- a/tests/libslic3r/test_geometry.cpp
+++ b/tests/libslic3r/test_geometry.cpp
@@ -468,7 +468,7 @@ TEST_CASE("Convex polygon intersection on two disjoint squares", "[Geometry][Rot
     Polygon B = A;
     B.translate(20 / SCALING_FACTOR, 0);
 
-    bool is_inters = Geometry::intersects(A, B);
+    bool is_inters = Geometry::convex_polygons_intersect(A, B);
 
     REQUIRE(is_inters == false);
 }
@@ -480,7 +480,7 @@ TEST_CASE("Convex polygon intersection on two intersecting squares", "[Geometry]
     Polygon B = A;
     B.translate(5 / SCALING_FACTOR, 5 / SCALING_FACTOR);
 
-    bool is_inters = Geometry::intersects(A, B);
+    bool is_inters = Geometry::convex_polygons_intersect(A, B);
 
     REQUIRE(is_inters == true);
 }
@@ -492,7 +492,7 @@ TEST_CASE("Convex polygon intersection on two squares touching one edge", "[Geom
     Polygon B = A;
     B.translate(10 / SCALING_FACTOR, 0);
 
-    bool is_inters = Geometry::intersects(A, B);
+    bool is_inters = Geometry::convex_polygons_intersect(A, B);
 
     REQUIRE(is_inters == false);
 }
@@ -509,7 +509,7 @@ TEST_CASE("Convex polygon intersection on two squares touching one vertex", "[Ge
     svg.draw(B, "green");
     svg.Close();
 
-    bool is_inters = Geometry::intersects(A, B);
+    bool is_inters = Geometry::convex_polygons_intersect(A, B);
 
     REQUIRE(is_inters == false);
 }
@@ -520,7 +520,7 @@ TEST_CASE("Convex polygon intersection on two overlapping squares", "[Geometry][
 
     Polygon B = A;
 
-    bool is_inters = Geometry::intersects(A, B);
+    bool is_inters = Geometry::convex_polygons_intersect(A, B);
 
     REQUIRE(is_inters == true);
 }
@@ -560,7 +560,7 @@ TEST_CASE("Convex polygon intersection on two overlapping squares", "[Geometry][
 
 //    bench.start();
 //    for (const auto &test : tests)
-//        results.emplace_back(Geometry::intersects(test.first, test.second));
+//        results.emplace_back(Geometry::convex_polygons_intersect(test.first, test.second));
 //    bench.stop();
 
 //    std::cout << "Test time: " << bench.getElapsedSec() << std::endl;
@@ -611,7 +611,7 @@ TEST_CASE("Convex polygon intersection test prusa polygons", "[Geometry][Rotcali
     for (size_t i = 0; i < PRINTER_PART_POLYGONS.size(); ++i) {
         Polygon P = PRINTER_PART_POLYGONS[i];
         P = Geometry::convex_hull(P.points);
-        bool res = Geometry::intersects(P, P);
+        bool res = Geometry::convex_polygons_intersect(P, P);
         if (!res) {
             SVG svg{std::string("fail_self") + std::to_string(i) + ".svg"};
             svg.draw(P, "green");
@@ -644,7 +644,7 @@ TEST_CASE("Convex polygon intersection test prusa polygons", "[Geometry][Rotcali
 
         B.translate(bba.size() + bbb.size());
 
-        bool res = Geometry::intersects(A, B);
+        bool res = Geometry::convex_polygons_intersect(A, B);
         bool ref = !intersection(A, B).empty();
 
         if (res != ref) {
@@ -669,7 +669,7 @@ TEST_CASE("Convex polygon intersection test prusa polygons", "[Geometry][Rotcali
         A.translate(-bba.center());
         B.translate(-bbb.center());
 
-        bool res = Geometry::intersects(A, B);
+        bool res = Geometry::convex_polygons_intersect(A, B);
         bool ref = !intersection(A, B).empty();
 
         if (res != ref) {