use (and fix) new shape implementation

[blank.git] / src / model / geometry.hpp

diff --git a/src/model/geometry.hpp b/src/model/geometry.hpp
index df45fff2f2a2797d789b06b9bd2ad71feb3c6464..f9f87c4f9d14462f31af92b16247e5a6aad584e9 100644 (file)
--- a/src/model/geometry.hpp
+++ b/src/model/geometry.hpp
@@ -13,6 +13,31 @@ constexpr float PI_0p5 = PI * 0.5f;
 constexpr float PI_1p5 = PI * 1.5f;
 constexpr float PI_2p0 = PI * 2.0f;
 
+constexpr float DEG_RAD_FACTOR = PI / 180.0f;
+constexpr float RAD_DEG_FACTOR = 180.0f / PI;
+
+constexpr float deg2rad(float d) {
+       return d * DEG_RAD_FACTOR;
+}
+
+constexpr float rad2deg(float r) {
+       return r * RAD_DEG_FACTOR;
+}
+
+
+template<class T>
+T manhattan_distance(const glm::tvec3<T> &a, const glm::tvec3<T> &b) {
+       glm::tvec3<T> diff(abs(a - b));
+       return diff.x + diff.y + diff.z;
+}
+
+template<class T>
+T manhattan_radius(const glm::tvec3<T> &v) {
+       glm::tvec3<T> a(abs(v));
+       return std::max(a.x, std::max(a.y, a.z));
+}
+
+
 struct AABB {
        glm::vec3 min;
        glm::vec3 max;