diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-02-27 20:07:18 +0000 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-02-27 20:07:18 +0000 |
commit | 491cdb55efed10a31be0d21ede5bbfe289fb83ca (patch) | |
tree | 5cb85e20f00f9c65db6778c05597845558f0c154 | |
parent | Operator! to convert vec3 to vec2 (diff) | |
download | ilt-491cdb55efed10a31be0d21ede5bbfe289fb83ca.tar.bz2 ilt-491cdb55efed10a31be0d21ede5bbfe289fb83ca.tar.xz ilt-491cdb55efed10a31be0d21ede5bbfe289fb83ca.zip |
find_arc_centre given vectors
-rw-r--r-- | utility/maths.cpp | 5 | ||||
-rw-r--r-- | utility/maths.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/utility/maths.cpp b/utility/maths.cpp index bda6ea6..866097a 100644 --- a/utility/maths.cpp +++ b/utility/maths.cpp @@ -69,7 +69,12 @@ find_arc_centre(glm::vec2 as, float entrys, glm::vec2 bs, float entrye) 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); +} +std::pair<glm::vec2, bool> +find_arc_centre(glm::vec2 as, glm::vec2 ad, glm::vec2 bs, glm::vec2 bd) +{ const auto det = bd.x * ad.y - bd.y * ad.x; if (det != 0) { // near parallel line will yield noisy results const auto d = bs - as; diff --git a/utility/maths.h b/utility/maths.h index 47b95a3..2ce5d94 100644 --- a/utility/maths.h +++ b/utility/maths.h @@ -54,5 +54,6 @@ arc_length(const Arc & arc) float normalize(float ang); std::pair<glm::vec2, bool> find_arc_centre(glm::vec2 start, float entrys, glm::vec2 end, float entrye); +std::pair<glm::vec2, bool> find_arc_centre(glm::vec2 start, glm::vec2 ad, glm::vec2 end, glm::vec2 bd); #endif |