Merged distance calculation functions

1 files changed, 25 insertions, 3 deletions

diff --git a/Utils.h b/Utils.h
index b582540..72eab4d 100644
--- a/Utils.h
+++ b/Utils.h
@@ -1,8 +1,30 @@
 #pragma once
 
+#include <cmath>
+#include <type_traits>
 
-template <typename V, typename T=decltype(V::x)> T dist2(const V& lhs, const V& rhs);
-template <typename V, typename T=decltype(V::x)> T dist3(const V& lhs, const V& rhs);
 
+template <typename T> static auto test_z(int) -> decltype(decltype(T::z){}, std::true_type{});
+template <typename> static auto test_z(...) -> std::false_type;
+template <typename T> struct has_z : decltype(test_z<T>(0)) {};
 
-#include "Utils-inl.h"
+
+template <typename V, typename T=decltype(V::x), typename std::enable_if<has_z<V>::value, bool>::type=true>
+T
+dist(const V& lhs, const V& rhs)
+{
+    return std::sqrt(
+        std::pow(lhs.x - rhs.x, 2) +
+        std::pow(lhs.y - rhs.y, 2) +
+        std::pow(lhs.z - rhs.z, 2));
+}
+
+
+template <typename V, typename T=decltype(V::x), typename std::enable_if<!has_z<V>::value, bool>::type=true>
+T
+dist(const V& lhs, const V& rhs)
+{
+    return std::sqrt(
+        std::pow(lhs.x - rhs.x, 2) +
+        std::pow(lhs.y - rhs.y, 2));
+}