3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed Geometry::intersect() to Geometry::convex_polygons_intersect()

Browse Source 
to convey its true meaning.
This commit is contained in:
Vojtech Bubnik 2021-10-23 14:29:42 +02:00
parent 723155a15c
commit be236eda85
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Geometry.cpp
View File

@ -1671,7 +1671,7 @@ void visit_antipodals (Idx& ia, Idx &ib, Fn &&fn)
} // namespace rotcalip } // namespace rotcalip
bool intersects(const Polygon &A, const Polygon &B) bool convex_polygons_intersect(const Polygon &A, const Polygon &B)
{ {
using namespace rotcalip; using namespace rotcalip;

2
src/libslic3r/Geometry.hpp
View File

@ -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 // Returns true if the intersection of the two convex polygons A and B
// is not an empty set. // 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 } } // namespace Slicer::Geometry

18
tests/libslic3r/test_geometry.cpp
View File

@ -468,7 +468,7 @@ TEST_CASE("Convex polygon intersection on two disjoint squares", "[Geometry][Rot
Polygon B = A; Polygon B = A;
B.translate(20 / SCALING_FACTOR, 0); 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); REQUIRE(is_inters == false);
} }
@ -480,7 +480,7 @@ TEST_CASE("Convex polygon intersection on two intersecting squares", "[Geometry]
Polygon B = A; Polygon B = A;
B.translate(5 / SCALING_FACTOR, 5 / SCALING_FACTOR); 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); REQUIRE(is_inters == true);
} }
@ -492,7 +492,7 @@ TEST_CASE("Convex polygon intersection on two squares touching one edge", "[Geom
Polygon B = A; Polygon B = A;
B.translate(10 / SCALING_FACTOR, 0); 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); 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.draw(B, "green");
svg.Close(); svg.Close();
bool is_inters = Geometry::intersects(A, B); bool is_inters = Geometry::convex_polygons_intersect(A, B);
REQUIRE(is_inters == false); REQUIRE(is_inters == false);
} }
@ -520,7 +520,7 @@ TEST_CASE("Convex polygon intersection on two overlapping squares", "[Geometry][
Polygon B = A; Polygon B = A;
bool is_inters = Geometry::intersects(A, B); bool is_inters = Geometry::convex_polygons_intersect(A, B);
REQUIRE(is_inters == true); REQUIRE(is_inters == true);
} }
@ -560,7 +560,7 @@ TEST_CASE("Convex polygon intersection on two overlapping squares", "[Geometry][
// bench.start(); // bench.start();
// for (const auto &test : tests) // 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(); // bench.stop();
// std::cout << "Test time: " << bench.getElapsedSec() << std::endl; // 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) { for (size_t i = 0; i < PRINTER_PART_POLYGONS.size(); ++i) {
Polygon P = PRINTER_PART_POLYGONS[i]; Polygon P = PRINTER_PART_POLYGONS[i];
P = Geometry::convex_hull(P.points); P = Geometry::convex_hull(P.points);
bool res = Geometry::intersects(P, P); bool res = Geometry::convex_polygons_intersect(P, P);
if (!res) { if (!res) {
SVG svg{std::string("fail_self") + std::to_string(i) + ".svg"}; SVG svg{std::string("fail_self") + std::to_string(i) + ".svg"};
svg.draw(P, "green"); svg.draw(P, "green");
@ -644,7 +644,7 @@ TEST_CASE("Convex polygon intersection test prusa polygons", "[Geometry][Rotcali
B.translate(bba.size() + bbb.size()); 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(); bool ref = !intersection(A, B).empty();
if (res != ref) { if (res != ref) {
@ -669,7 +669,7 @@ TEST_CASE("Convex polygon intersection test prusa polygons", "[Geometry][Rotcali
A.translate(-bba.center()); A.translate(-bba.center());
B.translate(-bbb.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(); bool ref = !intersection(A, B).empty();
if (res != ref) { if (res != ref) {