From 253a0b73f0975d8f14c3a3f2a06675b53c736071 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 3 Mar 2021 01:25:15 +0000 Subject: Simplify a lot of code with sincosf --- lib/maths.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'lib/maths.cpp') diff --git a/lib/maths.cpp b/lib/maths.cpp index 60413f4..5800b1b 100644 --- a/lib/maths.cpp +++ b/lib/maths.cpp @@ -112,11 +112,7 @@ find_arc_centre(glm::vec2 as, float entrys, glm::vec2 bs, float entrye) if (as == bs) { return {as, false}; } - const auto perps = entrys + half_pi; - const auto perpe = entrye - half_pi; - const glm::vec2 ad {std::sin(perps), std::cos(perps)}; - const glm::vec2 bd {std::sin(perpe), std::cos(perpe)}; - return find_arc_centre(as, ad, bs, bd); + return find_arc_centre(as, sincosf(entrys + half_pi), bs, sincosf(entrye - half_pi)); } std::pair @@ -135,11 +131,7 @@ std::pair find_arcs_radius(glm::vec2 start, float entrys, glm::vec2 end, float entrye) { const auto getrad = [&](float leftOrRight) { - const auto perps = entrys + leftOrRight; - const auto perpe = entrye + leftOrRight; - const glm::vec2 ad {std::sin(perps), std::cos(perps)}; - const glm::vec2 bd {std::sin(perpe), std::cos(perpe)}; - return find_arcs_radius(start, ad, end, bd); + return find_arcs_radius(start, sincosf(entrys + leftOrRight), end, sincosf(entrye + leftOrRight)); }; return {getrad(-half_pi), getrad(half_pi)}; } -- cgit v1.2.3