hash_value on vec

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 include(cmake/color.cmake)
-set(BLT_VERSION 2.1.12)
+set(BLT_VERSION 2.1.13)
 
 set(BLT_TARGET BLT)
 

include/blt/math/vectors.h

@@ -17,7 +17,6 @@
 
 namespace blt
 {
-
 #define MSVC_COMPILER (!defined(__GNUC__) && !defined(__clang__))
 
     constexpr float EPSILON = std::numeric_limits<float>::epsilon();
@@ -27,277 +26,292 @@ namespace blt
         return v1 >= v2 - EPSILON && v1 <= v2 + EPSILON;
     }
 
-    template<typename T, blt::u32 size>
+    template <typename T, blt::u32 size>
     struct vec
     {
-            static_assert(std::is_arithmetic_v<T> && "blt::vec must be created using an arithmetic type!");
+        static_assert(std::is_arithmetic_v<T> && "blt::vec must be created using an arithmetic type!");
-        private:
-            std::array<T, size> elements;
-        public:
-            constexpr static blt::u32 data_size = size;
 
-            constexpr vec()
+    private:
-            {
+        std::array<T, size> elements;
-                for (auto& v : elements)
-                    v = static_cast<T>(0);
-            }
 
-            /**
+    public:
-             * Create a vector with initializer list, if the initializer list doesn't contain enough values to fill this vec, it will use t
+        constexpr static blt::u32 data_size = size;
-             * @param t default value to fill with
+
-             * @param args list of args
+        constexpr vec()
-             */
+        {
-            template<typename U, std::enable_if_t<std::is_same_v<T, U> || std::is_convertible_v<U, T>, bool> = true>
+            for (auto& v : elements)
-            constexpr vec(U t, std::initializer_list<U> args): elements()
+                v = static_cast<T>(0);
+        }
+
+        /**
+         * Create a vector with initializer list, if the initializer list doesn't contain enough values to fill this vec, it will use t
+         * @param t default value to fill with
+         * @param args list of args
+         */
+        template <typename U, std::enable_if_t<std::is_same_v<T, U> || std::is_convertible_v<U, T>, bool>  = true>
+        constexpr vec(U t, std::initializer_list<U> args): elements()
+        {
+            auto b = args.begin();
+            for (auto& v : elements)
             {
-                auto b = args.begin();
+                if (b == args.end())
-                for (auto& v : elements)
                 {
-                    if (b == args.end())
-                    {
-                        v = t;
-                        continue;
-                    }
-                    v = *b;
-                    ++b;
-                }
-            }
-            
-            /**
-             * Create a vector from an initializer list, if the list doesn't have enough elements it will be filled with the default value (0)
-             * @param args
-             */
-            template<typename U, std::enable_if_t<std::is_same_v<T, U> || std::is_convertible_v<U, T>, bool> = true>
-            constexpr vec(std::initializer_list<U> args): vec(U(), args)
-            {}
-            
-            template<typename... Args, std::enable_if_t<sizeof...(Args) == size, bool> = true>
-            constexpr explicit vec(Args... args): vec(std::array<T, size>{static_cast<T>(args)...})
-            {}
-            
-            constexpr explicit vec(T t)
-            {
-                for (auto& v : elements)
                     v = t;
-            }
+                    continue;
-            
-            constexpr explicit vec(const T elem[size])
-            {
-                for (size_t i = 0; i < size; i++)
-                    elements[i] = elem[i];
-            }
-            
-            constexpr explicit vec(std::array<T, size> elem): elements(elem)
-            {}
-            
-            template<typename G, size_t base_size, std::enable_if_t<std::is_convertible_v<G, T>, bool> = true>
-            constexpr explicit vec(std::array<G, base_size> el): elements()
-            {
-                auto b = el.begin();
-                auto m = elements.begin();
-                while (b != el.end() && m != elements.end())
-                {
-                    *m = *b;
-                    ++m;
-                    ++b;
                 }
+                v = *b;
+                ++b;
             }
+        }
 
-            [[nodiscard]] constexpr inline T x() const
+        /**
-            {
+         * Create a vector from an initializer list, if the list doesn't have enough elements it will be filled with the default value (0)
-                return elements[0];
+         * @param args
-            }
+         */
+        template <typename U, std::enable_if_t<std::is_same_v<T, U> || std::is_convertible_v<U, T>, bool>  = true>
+        constexpr vec(std::initializer_list<U> args): vec(U(), args)
+        {
+        }
 
-            [[nodiscard]] constexpr inline T y() const
+        template <typename... Args, std::enable_if_t<sizeof...(Args) == size, bool>  = true>
-            {
+        constexpr explicit vec(Args... args): vec(std::array<T, size>{static_cast<T>(args)...})
-                static_assert(size > 1);
+        {
-                return elements[1];
+        }
-            }
 
-            [[nodiscard]] constexpr inline T z() const
+        constexpr explicit vec(T t)
-            {
+        {
-                static_assert(size > 2);
+            for (auto& v : elements)
-                return elements[2];
+                v = t;
-            }
+        }
 
-            [[nodiscard]] constexpr inline T w() const
+        constexpr explicit vec(const T elem[size])
-            {
+        {
-                static_assert(size > 3);
+            for (size_t i = 0; i < size; i++)
-                return elements[3];
+                elements[i] = elem[i];
-            }
+        }
 
-            [[nodiscard]] constexpr inline vec<T, size> abs() const
+        constexpr explicit vec(std::array<T, size> elem): elements(elem)
-            {
+        {
-                auto copy = *this;
+        }
-                for (auto& v : copy.elements)
-                    v = std::abs(v);
-                return copy;
-            }
 
-            [[nodiscard]] constexpr inline vec<T, size> bipolar() const
+        template <typename G, size_t base_size, std::enable_if_t<std::is_convertible_v<G, T>, bool>  = true>
+        constexpr explicit vec(std::array<G, base_size> el): elements()
+        {
+            auto b = el.begin();
+            auto m = elements.begin();
+            while (b != el.end() && m != elements.end())
             {
-                auto copy = *this;
+                *m = *b;
-                for (auto& v : copy.elements)
+                ++m;
-                    v = v >= 0 ? 1 : -1;
+                ++b;
-                return copy;
             }
+        }
 
-            [[nodiscard]] constexpr inline T magnitude() const
+        [[nodiscard]] constexpr inline T x() const
-            {
+        {
-                T total = 0;
+            return elements[0];
-                for (blt::u32 i = 0; i < size; i++)
+        }
-                    total += elements[i] * elements[i];
-                return std::sqrt(total);
-            }
 
-            [[nodiscard]] constexpr inline vec<T, size> normalize() const
+        [[nodiscard]] constexpr inline T y() const
-            {
+        {
-                T mag = this->magnitude();
+            static_assert(size > 1);
-                if (mag == 0)
+            return elements[1];
-                    return vec<T, size>(*this);
+        }
-                return *this / mag;
-            }
 
-            constexpr inline T& operator[](blt::size_t index)
+        [[nodiscard]] constexpr inline T z() const
-            {
+        {
-                return elements[index];
+            static_assert(size > 2);
-            }
+            return elements[2];
+        }
 
-            constexpr inline T operator[](blt::size_t index) const
+        [[nodiscard]] constexpr inline T w() const
-            {
+        {
-                return elements[index];
+            static_assert(size > 3);
-            }
+            return elements[3];
+        }
 
-            constexpr inline vec<T, size>& operator=(T v)
+        [[nodiscard]] constexpr inline vec<T, size> abs() const
-            {
+        {
-                for (blt::u32 i = 0; i < size; i++)
+            auto copy = *this;
-                    elements[i] = v;
+            for (auto& v : copy.elements)
-                return *this;
+                v = std::abs(v);
-            }
+            return copy;
+        }
 
-            constexpr inline vec<T, size> operator-()
+        [[nodiscard]] constexpr inline vec<T, size> bipolar() const
-            {
+        {
-                vec<T, size> initializer{};
+            auto copy = *this;
-                for (blt::u32 i = 0; i < size; i++)
+            for (auto& v : copy.elements)
-                    initializer[i] = -elements[i];
+                v = v >= 0 ? 1 : -1;
-                return vec<T, size>{initializer};
+            return copy;
-            }
+        }
 
-            constexpr inline vec<T, size>& operator+=(const vec<T, size>& other)
+        [[nodiscard]] constexpr inline T magnitude() const
-            {
+        {
-                for (blt::u32 i = 0; i < size; i++)
+            T total = 0;
-                    elements[i] += other[i];
+            for (blt::u32 i = 0; i < size; i++)
-                return *this;
+                total += elements[i] * elements[i];
-            }
+            return std::sqrt(total);
+        }
 
-            constexpr inline vec<T, size>& operator*=(const vec<T, size>& other)
+        [[nodiscard]] constexpr inline vec<T, size> normalize() const
-            {
+        {
-                for (blt::u32 i = 0; i < size; i++)
+            T mag = this->magnitude();
-                    elements[i] *= other[i];
+            if (mag == 0)
-                return *this;
+                return vec<T, size>(*this);
-            }
+            return *this / mag;
+        }
 
-            constexpr inline vec<T, size>& operator+=(T f)
+        constexpr inline T& operator[](blt::size_t index)
-            {
+        {
-                for (blt::u32 i = 0; i < size; i++)
+            return elements[index];
-                    elements[i] += f;
+        }
-                return *this;
-            }
 
-            constexpr inline vec<T, size>& operator*=(T f)
+        constexpr inline T operator[](blt::size_t index) const
-            {
+        {
-                for (blt::u32 i = 0; i < size; i++)
+            return elements[index];
-                    elements[i] *= f;
+        }
-                return *this;
-            }
 
-            constexpr inline vec<T, size>& operator-=(const vec<T, size>& other)
+        constexpr inline vec<T, size>& operator=(T v)
-            {
+        {
-                for (blt::u32 i = 0; i < size; i++)
+            for (blt::u32 i = 0; i < size; i++)
-                    elements[i] -= other[i];
+                elements[i] = v;
-                return *this;
+            return *this;
-            }
+        }
 
-            constexpr inline vec<T, size>& operator-=(T f)
+        constexpr inline vec<T, size> operator-()
-            {
+        {
-                for (blt::u32 i = 0; i < size; i++)
+            vec<T, size> initializer{};
-                    elements[i] -= f;
+            for (blt::u32 i = 0; i < size; i++)
-                return *this;
+                initializer[i] = -elements[i];
-            }
+            return vec<T, size>{initializer};
+        }
 
-            /**
+        constexpr inline vec<T, size>& operator+=(const vec<T, size>& other)
-             * performs the dot product of left * right
+        {
-             */
+            for (blt::u32 i = 0; i < size; i++)
-            constexpr static inline T dot(const vec<T, size>& left, const vec<T, size>& right)
+                elements[i] += other[i];
-            {
+            return *this;
-                T dot = 0;
+        }
-                for (blt::u32 i = 0; i < size; i++)
-                    dot += left[i] * right[i];
-                return dot;
-            }
 
-            constexpr static inline vec<T, size> cross(
+        constexpr inline vec<T, size>& operator*=(const vec<T, size>& other)
-                    const vec<T, size>& left, const vec<T, size>& right
+        {
-                                                      )
+            for (blt::u32 i = 0; i < size; i++)
-            {
+                elements[i] *= other[i];
-                // cross is only defined on vectors of size 3. 2D could be implemented, which is a TODO
+            return *this;
-                static_assert(size == 3);
+        }
-                return {left.y() * right.z() - left.z() * right.y(),
-                        left.z() * right.x() - left.x() * right.z(),
-                        left.x() * right.y() - left.y() * right.x()};
-            }
 
-            constexpr static inline vec<T, size> project(
+        constexpr inline vec<T, size>& operator+=(T f)
-                    const vec<T, size>& u, const vec<T, size>& v
+        {
-                                                        )
+            for (blt::u32 i = 0; i < size; i++)
-            {
+                elements[i] += f;
-                T du = dot(u);
+            return *this;
-                T dv = dot(v);
+        }
-                return (du / dv) * v;
-            }
 
-            constexpr inline auto* data()
+        constexpr inline vec<T, size>& operator*=(T f)
-            {
+        {
-                return elements.data();
+            for (blt::u32 i = 0; i < size; i++)
-            }
+                elements[i] *= f;
+            return *this;
+        }
 
-            [[nodiscard]] constexpr inline const auto* data() const
+        constexpr inline vec<T, size>& operator-=(const vec<T, size>& other)
-            {
+        {
-                return elements.data();
+            for (blt::u32 i = 0; i < size; i++)
-            }
+                elements[i] -= other[i];
+            return *this;
+        }
 
-            [[nodiscard]] constexpr auto begin() const
+        constexpr inline vec<T, size>& operator-=(T f)
-            {
+        {
-                return elements.begin();
+            for (blt::u32 i = 0; i < size; i++)
-            }
+                elements[i] -= f;
+            return *this;
+        }
 
-            [[nodiscard]] constexpr auto end() const
+        /**
-            {
+         * performs the dot product of left * right
-                return elements.end();
+         */
-            }
+        constexpr static inline T dot(const vec<T, size>& left, const vec<T, size>& right)
+        {
+            T dot = 0;
+            for (blt::u32 i = 0; i < size; i++)
+                dot += left[i] * right[i];
+            return dot;
+        }
 
-            [[nodiscard]] constexpr auto rbegin() const
+        constexpr static inline vec<T, size> cross(
-            {
+            const vec<T, size>& left, const vec<T, size>& right
-                return elements.rbegin();
+        )
-            }
+        {
+            // cross is only defined on vectors of size 3. 2D could be implemented, which is a TODO
+            static_assert(size == 3);
+            return {
+                left.y() * right.z() - left.z() * right.y(),
+                left.z() * right.x() - left.x() * right.z(),
+                left.x() * right.y() - left.y() * right.x()
+            };
+        }
 
-            [[nodiscard]] constexpr auto rend() const
+        constexpr static inline vec<T, size> project(
-            {
+            const vec<T, size>& u, const vec<T, size>& v
-                return elements.rend();
+        )
-            }
+        {
+            T du = dot(u);
+            T dv = dot(v);
+            return (du / dv) * v;
+        }
 
-            [[nodiscard]] constexpr auto cbegin() const
+        constexpr inline auto* data()
-            {
+        {
-                return elements.cbegin();
+            return elements.data();
-            }
+        }
 
-            [[nodiscard]] constexpr auto cend() const
+        [[nodiscard]] constexpr inline const auto* data() const
-            {
+        {
-                return elements.cend();
+            return elements.data();
-            }
+        }
+
+        [[nodiscard]] constexpr auto begin() const
+        {
+            return elements.begin();
+        }
+
+        [[nodiscard]] constexpr auto end() const
+        {
+            return elements.end();
+        }
+
+        [[nodiscard]] constexpr auto rbegin() const
+        {
+            return elements.rbegin();
+        }
+
+        [[nodiscard]] constexpr auto rend() const
+        {
+            return elements.rend();
+        }
+
+        [[nodiscard]] constexpr auto cbegin() const
+        {
+            return elements.cbegin();
+        }
+
+        [[nodiscard]] constexpr auto cend() const
+        {
+            return elements.cend();
+        }
+
+        friend std::size_t hash_value(const vec& obj)
+        {
+            std::size_t seed = 0x5410391E;
+            for (const auto& v : obj)
+                seed ^= (seed << 6) + (seed >> 2) + std::hash<T>{}(v);
+            return seed;
+        }
     };
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() + std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() + std::declval<G>())>
     inline constexpr vec<R, size> operator+(const vec<T, size>& left, const vec<G, size>& right)
     {
         vec<R, size> initializer{};
@@ -306,7 +320,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() - std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() - std::declval<G>())>
     inline constexpr vec<R, size> operator-(const vec<T, size>& left, const vec<G, size>& right)
     {
         vec<R, size> initializer{};
@@ -315,7 +329,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() + std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() + std::declval<G>())>
     inline constexpr vec<R, size> operator+(const vec<T, size>& left, G right)
     {
         vec<R, size> initializer{};
@@ -324,7 +338,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() - std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() - std::declval<G>())>
     inline constexpr vec<R, size> operator-(const vec<T, size>& left, G right)
     {
         vec<R, size> initializer{};
@@ -333,7 +347,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() + std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() + std::declval<G>())>
     inline constexpr vec<R, size> operator+(G left, const vec<T, size>& right)
     {
         vec<R, size> initializer{};
@@ -342,7 +356,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() - std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() - std::declval<G>())>
     inline constexpr vec<R, size> operator-(G left, const vec<T, size>& right)
     {
         vec<R, size> initializer{};
@@ -351,7 +365,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() * std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() * std::declval<G>())>
     inline constexpr vec<R, size> operator*(const vec<T, size>& left, const vec<G, size>& right)
     {
         vec<R, size> initializer{};
@@ -360,7 +374,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() * std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() * std::declval<G>())>
     inline constexpr vec<R, size> operator*(const vec<T, size>& left, G right)
     {
         vec<R, size> initializer{};
@@ -369,7 +383,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() * std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() * std::declval<G>())>
     inline constexpr vec<R, size> operator*(G left, const vec<T, size>& right)
     {
         vec<R, size> initializer{};
@@ -378,7 +392,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() / std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() / std::declval<G>())>
     inline constexpr vec<R, size> operator/(const vec<T, size>& left, G right)
     {
         vec<R, size> initializer{};
@@ -387,7 +401,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() / std::declval<G>())>
+    template <typename T, typename G, blt::u32 size, typename R = decltype(std::declval<T>() / std::declval<G>())>
     inline constexpr vec<R, size> operator/(G left, const vec<T, size>& right)
     {
         vec<R, size> initializer{};
@@ -396,7 +410,7 @@ namespace blt
         return initializer;
     }
 
-    template<typename T, typename G, blt::u32 size>
+    template <typename T, typename G, blt::u32 size>
     inline constexpr bool operator==(const vec<T, size>& left, const vec<G, size>& right)
     {
         constexpr double E = std::numeric_limits<T>::epsilon();
@@ -409,13 +423,13 @@ namespace blt
         return true;
     }
 
-    template<typename T, typename G, blt::u32 size>
+    template <typename T, typename G, blt::u32 size>
     inline constexpr bool operator!=(const vec<T, size>& left, const vec<G, size>& right)
     {
         return !(left == right);
     }
 
-    template<typename Ret, typename T, blt::u32 size>
+    template <typename Ret, typename T, blt::u32 size>
     inline constexpr vec<Ret, size> vec_cast(const vec<T, size>& conv)
     {
         vec<Ret, size> initializer{};
@@ -460,25 +474,27 @@ namespace blt
         return color4{r, g, b, 1.0f};
     }
 
-    template<typename ValueType, u32 size>
+    template <typename ValueType, u32 size>
     inline constexpr blt::vec<ValueType, 2> make_vec2(const blt::vec<ValueType, size>& t, size_t fill = 0)
     {
         if constexpr (size >= 2)
         {
             return blt::vec<ValueType, 2>(t.x(), t.y());
-        } else
+        }
+        else
         {
             return blt::vec<ValueType, 2>(t.x(), fill);
         }
     }
 
-    template<typename ValueType, u32 size>
+    template <typename ValueType, u32 size>
     inline constexpr blt::vec<ValueType, 3> make_vec3(const blt::vec<ValueType, size>& t, size_t fill = 0)
     {
         if constexpr (size >= 3)
         {
             return blt::vec<ValueType, 3>(t.x(), t.y(), t.z());
-        } else
+        }
+        else
         {
             blt::vec<ValueType, 3> ret;
             for (size_t i = 0; i < size; i++)
@@ -489,13 +505,14 @@ namespace blt
         }
     }
 
-    template<typename ValueType, u32 size>
+    template <typename ValueType, u32 size>
     inline constexpr blt::vec<ValueType, 4> make_vec4(const blt::vec<ValueType, size>& t, size_t fill = 0)
     {
         if constexpr (size >= 4)
         {
             return blt::vec<ValueType, 4>(t.x(), t.y(), t.z(), t.w());
-        } else
+        }
+        else
         {
             blt::vec<ValueType, 4> ret;
             for (size_t i = 0; i < size; i++)
@@ -525,7 +542,7 @@ namespace blt
         // Gram-Schmidt orthonormalization algorithm
         static inline void gramSchmidt(std::vector<vec3>& vectors)
         {
-            int n = (int) vectors.size();
+            int n = (int)vectors.size();
             std::vector<vec3> basis;
 
             // normalize first vector