[core] Privatize math.hpp and vec.hpp

7 files changed, 74 insertions, 287 deletions

diff --git a/include/mbgl/math/clamp.hpp b/include/mbgl/math/clamp.hpp
new file mode 100644
index 0000000000..38d430547d
--- /dev/null
+++ b/include/mbgl/math/clamp.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/math/minmax.hpp>
+
+namespace mbgl {
+namespace util {
+
+template <typename T>
+T clamp(T value, T min_, T max_) {
+    return max(min_, min(max_, value));
+}
+
+} // namespace util
+} // namespace mbgl
diff --git a/include/mbgl/math/minmax.hpp b/include/mbgl/math/minmax.hpp
new file mode 100644
index 0000000000..e8c50a39cf
--- /dev/null
+++ b/include/mbgl/math/minmax.hpp
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <type_traits>
+#include <algorithm>
+#include <cmath>
+
+namespace mbgl {
+namespace util {
+
+template <typename T>
+typename std::enable_if_t<std::is_integral<T>::value, T> max(T a, T b) {
+    return std::max(a, b);
+}
+
+template <typename T>
+typename std::enable_if_t<std::is_floating_point<T>::value, T> max(T a, T b) {
+    return ::fmax(a, b);
+}
+
+template <typename T, typename... Ts>
+typename std::enable_if_t<std::is_arithmetic<T>::value, T> max(T a, T b, Ts... args) {
+    return max(a, max(b, args...));
+}
+
+template <typename T>
+typename std::enable_if_t<std::is_integral<T>::value, T> min(T a, T b) {
+    return std::min(a, b);
+}
+
+template <typename T>
+typename std::enable_if_t<std::is_floating_point<T>::value, T> min(T a, T b) {
+    return ::fmin(a, b);
+}
+
+template <typename T, typename... Ts>
+typename std::enable_if_t<std::is_arithmetic<T>::value, T> min(T a, T b, Ts... args) {
+    return min(a, min(b, args...));
+}
+
+} // namespace util
+} // namespace mbgl
diff --git a/include/mbgl/math/wrap.hpp b/include/mbgl/math/wrap.hpp
new file mode 100644
index 0000000000..16dc598c22
--- /dev/null
+++ b/include/mbgl/math/wrap.hpp
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <cmath>
+
+namespace mbgl {
+namespace util {
+
+// Constrains n to the given range (including min, excluding max) via modular
+// arithmetic.
+template <typename T>
+T wrap(T value, T min, T max) {
+    T d = max - min;
+    return std::fmod((std::fmod((value - min), d) + d), d) + min;
+}
+
+} // namespace util
+} // namespace mbgl
diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp
index 84128caae7..f0c708dcd4 100644
--- a/include/mbgl/util/geo.hpp
+++ b/include/mbgl/util/geo.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_UTIL_GEO
 #define MBGL_UTIL_GEO
 
-#include <mbgl/util/math.hpp>
+#include <mbgl/math/wrap.hpp>
 #include <mbgl/util/vec.hpp>
 #include <mbgl/util/constants.hpp>
 
diff --git a/include/mbgl/util/math.hpp b/include/mbgl/util/math.hpp
deleted file mode 100644
index c0fdea47fb..0000000000
--- a/include/mbgl/util/math.hpp
+++ /dev/null
@@ -1,159 +0,0 @@
-#ifndef MBGL_UTIL_MATH
-#define MBGL_UTIL_MATH
-
-#include <cmath>
-#include <array>
-#include <limits>
-
-#include <mbgl/util/vec.hpp>
-
-namespace mbgl {
-namespace util {
-
-
-template <typename T>
-typename std::enable_if_t<std::is_integral<T>::value, T> max(T a, T b) {
-    return std::max(a, b);
-}
-
-template <typename T>
-typename std::enable_if_t<std::is_floating_point<T>::value, T> max(T a, T b) {
-    return ::fmax(a, b);
-}
-
-template <typename T, typename... Ts>
-typename std::enable_if_t<std::is_arithmetic<T>::value, T> max(T a, T b, Ts... args) {
-    return max(a, max(b, args...));
-}
-
-template <typename T>
-typename std::enable_if_t<std::is_integral<T>::value, T> min(T a, T b) {
-    return std::min(a, b);
-}
-
-template <typename T>
-typename std::enable_if_t<std::is_floating_point<T>::value, T> min(T a, T b) {
-    return ::fmin(a, b);
-}
-
-template <typename T, typename... Ts>
-typename std::enable_if_t<std::is_arithmetic<T>::value, T> min(T a, T b, Ts... args) {
-    return min(a, min(b, args...));
-}
-
-// Find the angle of the two vectors, solving the formula for the cross product
-// a x b = |a||b|sin(θ) for θ.
-template <typename T = double, typename S>
-inline T angle_between(S ax, S ay, S bx, S by) {
-    return std::atan2((ax * by - ay * bx), ax * bx + ay * by);
-}
-
-template <typename T = double, typename S>
-inline T angle_between(const vec2<S>& a, const vec2<S>& b) {
-    return angle_between(a.x, a.y, b.x, b.y);
-}
-
-template <typename T = double, typename S>
-inline T angle_to(const vec2<S>& a, const vec2<S>& b) {
-    return std::atan2(a.y - b.y, a.x - b.x);
-}
-
-// Reflect an angle around 0 degrees
-template <typename T>
-inline std::array<T, 2> flip(const std::array<T, 2>& c) {
-    return {{
-        static_cast<T>(2 * M_PI - c[0]),
-        static_cast<T>(2 * M_PI - c[1])
-    }};
-}
-
-template <typename T, typename S1, typename S2>
-inline vec2<T> normal(const S1& a, const S2& b) {
-    T dx = b.x - a.x;
-    T dy = b.y - a.y;
-    T c = std::sqrt(dx * dx + dy * dy);
-    return { dx / c, dy / c };
-}
-
-template <typename T>
-inline T perp(const T& a) {
-    return T(-a.y, a.x);
-}
-
-template <typename T, typename S1, typename S2>
-inline T dist(const S1& a, const S2& b) {
-    T dx = b.x - a.x;
-    T dy = b.y - a.y;
-    T c = std::sqrt(dx * dx + dy * dy);
-    return c;
-}
-
-template <typename T, typename S1, typename S2>
-inline T distSqr(const S1& a, const S2& b) {
-    T dx = b.x - a.x;
-    T dy = b.y - a.y;
-    T c = dx * dx + dy * dy;
-    return c;
-}
-
-template <typename T>
-inline T round(const T& a) {
-    return T(::round(a.x), ::round(a.y));
-}
-
-template <typename T>
-inline T length(T a, T b) {
-    return std::sqrt(a * a + b * b);
-}
-
-// Take the magnitude of vector a.
-template <typename T = double, typename S>
-inline T mag(const S& a) {
-    return std::sqrt(a.x * a.x + a.y * a.y);
-}
-
-template <typename S>
-inline S unit(const S& a) {
-    auto magnitude = mag(a);
-    if (magnitude == 0) {
-        return a;
-    }
-    return a * (1 / magnitude);
-}
-
-template <typename T, typename S = double>
-inline T rotate(const T& a, S angle) {
-    S cos = std::cos(angle);
-    S sin = std::sin(angle);
-    S x = cos * a.x - sin * a.y;
-    S y = sin * a.x + cos * a.y;
-    return T(x, y);
-}
-
-template <typename T>
-T clamp(T value, T min_, T max_) {
-    return max(min_, min(max_, value));
-}
-
-// Constrains n to the given range (including min, excluding max) via modular
-// arithmetic.
-template <typename T>
-T wrap(T value, T min, T max) {
-    T d = max - min;
-    return std::fmod((std::fmod((value - min), d) + d), d) + min;
-}
-
-template <typename T>
-T smoothstep(T edge0, T edge1, T x) {
-    T t = clamp((x - edge0) / (edge1 - edge0), T(0), T(1));
-    return t * t * (T(3) - T(2) * t);
-}
-
-// Computes the log2(x) rounded up to the next integer.
-// (== number of bits required to store x)
-uint32_t ceil_log2(uint64_t x);
-
-} // namespace util
-} // namespace mbgl
-
-#endif
diff --git a/include/mbgl/util/projection.hpp b/include/mbgl/util/projection.hpp
index 09c8ce74ab..cc1c391962 100644
--- a/include/mbgl/util/projection.hpp
+++ b/include/mbgl/util/projection.hpp
@@ -3,7 +3,7 @@
 
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/geo.hpp>
-#include <mbgl/util/math.hpp>
+#include <mbgl/math/clamp.hpp>
 
 #include <cmath>
 
diff --git a/include/mbgl/util/vec.hpp b/include/mbgl/util/vec.hpp
deleted file mode 100644
index 40d540fca4..0000000000
--- a/include/mbgl/util/vec.hpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef MBGL_UTIL_VEC
-#define MBGL_UTIL_VEC
-
-#include <limits>
-#include <type_traits>
-#include <cmath>
-#include <cstdint>
-#include <array>
-
-namespace mbgl {
-
-template <typename T = double>
-struct vec2 {
-    struct null {};
-    typedef T Type;
-
-    T x, y;
-
-    inline vec2() = default;
-
-    template<typename U = T, typename std::enable_if<std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    inline vec2(null) : x(std::numeric_limits<T>::quiet_NaN()), y(std::numeric_limits<T>::quiet_NaN()) {}
-
-    template<typename U = T, typename std::enable_if<!std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    inline vec2(null) : x(std::numeric_limits<T>::min()), y(std::numeric_limits<T>::min()) {}
-
-    inline vec2(const vec2& o) = default;
-
-    template<typename U>
-    inline vec2(const U& u) : x(u.x), y(u.y) {}
-
-    inline vec2(T x_, T y_) : x(x_), y(y_) {}
-
-    inline bool operator==(const vec2& rhs) const {
-        return x == rhs.x && y == rhs.y;
-    }
-
-    template <typename O>
-    inline typename std::enable_if<std::is_arithmetic<O>::value, vec2>::type
-    operator*(O o) const {
-        return {x * o, y * o};
-    }
-
-    inline void operator*=(T o) {
-        x *= o;
-        y *= o;
-    }
-
-    template <typename O>
-    inline typename std::enable_if<std::is_arithmetic<O>::value, vec2>::type
-    operator/(O o) const {
-        return {x / o, y / o};
-    }
-
-    inline void operator/=(T o) {
-        x /= o;
-        y /= o;
-    }
-
-    inline vec2<T> operator *(const std::array<float, 16>& matrix) {
-        return { x * matrix[0] + y * matrix[4] + matrix[12], x * matrix[1] + y * matrix[5] + matrix[13] };
-    }
-
-    template <typename O>
-    inline typename std::enable_if<std::is_arithmetic<O>::value, vec2>::type
-    operator-(O o) const {
-        return {x - o, y - o};
-    }
-
-    template <typename O>
-    inline typename std::enable_if<!std::is_arithmetic<O>::value, vec2>::type
-    operator-(const O &o) const {
-        return vec2<T>(x - o.x, y - o.y);
-    }
-
-    template <typename O>
-    inline typename std::enable_if<!std::is_arithmetic<O>::value, vec2>::type
-    operator+(const O &o) const {
-        return vec2<T>(x + o.x, y + o.y);
-    }
-
-    template <typename M>
-    inline vec2 matMul(const M &m) const {
-        return {m[0] * x + m[1] * y, m[2] * x + m[3] * y};
-    }
-
-    template<typename U = T, typename std::enable_if<std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    explicit operator bool() const {
-        return !std::isnan(x) && !std::isnan(y);
-    }
-
-    template<typename U = T, typename std::enable_if<!std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    explicit operator bool() const {
-        return x != std::numeric_limits<T>::min() && y != std::numeric_limits<T>::min();
-    }
-};
-
-template <typename T = double>
-struct vec4 {
-    T x, y, z, w;
-
-    inline vec4() = default;
-    inline vec4(const vec4& o) : x(o.x), y(o.y), z(o.z), w(o.w) {}
-    inline vec4(T x_, T y_, T z_, T w_) : x(x_), y(y_), z(z_), w(w_) {}
-    inline bool operator==(const vec4& rhs) const {
-        return x == rhs.x && y == rhs.y && z == rhs.z && w == rhs.w;
-    }
-
-    template<typename U = T, typename std::enable_if<std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    explicit operator bool() const {
-        return !std::isnan(x) && !std::isnan(y) && !std::isnan(z) && !std::isnan(w);
-    }
-
-    template<typename U = T, typename std::enable_if<!std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    explicit operator bool() const {
-        return x != std::numeric_limits<T>::min()
-            && y != std::numeric_limits<T>::min()
-            && z != std::numeric_limits<T>::min()
-            && w != std::numeric_limits<T>::min();
-    }
-};
-
-
-} // namespace mbgl
-
-#endif // MBGL_UTIL_VEC