diff options
| -rw-r--r-- | lib/maths.h | 13 | ||||
| -rw-r--r-- | test/test-maths.cpp | 18 |
2 files changed, 0 insertions, 31 deletions
diff --git a/lib/maths.h b/lib/maths.h index 8bc728f..3ef12e7 100644 --- a/lib/maths.h +++ b/lib/maths.h @@ -435,19 +435,6 @@ isWithinLimit(T lhs, T rhs, T limit = EPSILON<T>) template<Arithmetic T, glm::qualifier Q = glm::defaultp> std::pair<glm::vec<2, T, Q>, bool> -find_arc_centre(glm::vec<2, T, Q> start, Rotation2D startDir, glm::vec<2, T, Q> end, Rotation2D endDir) -{ - const auto det = endDir.x * startDir.y - endDir.y * startDir.x; - if (det != 0) { // near parallel line will yield noisy results - const glm::vec<2, RelativeDistance, Q> d = end - start; - const auto u = (d.y * endDir.x - d.x * endDir.y) / det; - return {start + glm::vec<2, T, Q>(startDir * u), u < 0}; - } - throw std::runtime_error("no intersection"); -} - -template<Arithmetic T, glm::qualifier Q = glm::defaultp> -std::pair<glm::vec<2, T, Q>, bool> find_arc_centre(glm::vec<2, T, Q> start, Angle entrys, glm::vec<2, T, Q> end, Angle entrye) { if (start == end) { diff --git a/test/test-maths.cpp b/test/test-maths.cpp index c181686..5ee815d 100644 --- a/test/test-maths.cpp +++ b/test/test-maths.cpp @@ -151,24 +151,6 @@ BOOST_DATA_TEST_CASE(TestCreateArc, BOOST_CHECK_CLOSE(arc.second, expAngles.second, 1.F); } -using FindArcCentreData = std::tuple<glm::vec2, float, glm::vec2, float, glm::vec2, bool>; - -BOOST_DATA_TEST_CASE(TestFindArcCentre, - boost::unit_test::data::make<FindArcCentreData>({ - {{2, 2}, pi, {3, 3}, half_pi, {3, 2}, true}, - {{2, 2}, pi, {1, 3}, -half_pi, {1, 2}, false}, - {{-1100, -1000}, pi, {-900, -800}, half_pi, {-900, -1000}, true}, - {{1100, 1000}, 0, {1050, 900}, pi + 0.92F, {973, 1000}, true}, - {{1050, 900}, 0.92F, {1000, 800}, pi, {1127, 800}, false}, - }), - startPoint, startEntryAngle, endPoint, endEntryAngle, expCentre, leftRight) -{ - const auto centre = find_arc_centre(startPoint, startEntryAngle, endPoint, endEntryAngle); - BOOST_CHECK_CLOSE(expCentre.x, centre.first.x, 1); - BOOST_CHECK_CLOSE(expCentre.y, centre.first.y, 1); - BOOST_CHECK_EQUAL(leftRight, centre.second); -} - BOOST_AUTO_TEST_CASE(TestFindArcsRadius) { BOOST_CHECK_CLOSE( |