hash_value on vec

v2
Brett 2024-12-10 00:33:04 -05:00
parent d1a9aab859
commit 1798980ac6
2 changed files with 335 additions and 318 deletions

View File

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

View File

@ -17,7 +17,6 @@
namespace blt namespace blt
{ {
#define MSVC_COMPILER (!defined(__GNUC__) && !defined(__clang__)) #define MSVC_COMPILER (!defined(__GNUC__) && !defined(__clang__))
constexpr float EPSILON = std::numeric_limits<float>::epsilon(); constexpr float EPSILON = std::numeric_limits<float>::epsilon();
@ -31,8 +30,10 @@ namespace blt
struct vec 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: private:
std::array<T, size> elements; std::array<T, size> elements;
public: public:
constexpr static blt::u32 data_size = size; constexpr static blt::u32 data_size = size;
@ -69,11 +70,13 @@ namespace blt
*/ */
template <typename U, std::enable_if_t<std::is_same_v<T, U> || std::is_convertible_v<U, T>, bool> = true> 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) constexpr vec(std::initializer_list<U> args): vec(U(), args)
{} {
}
template <typename... Args, std::enable_if_t<sizeof...(Args) == size, bool> = true> 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(Args... args): vec(std::array<T, size>{static_cast<T>(args)...})
{} {
}
constexpr explicit vec(T t) constexpr explicit vec(T t)
{ {
@ -88,7 +91,8 @@ namespace blt
} }
constexpr explicit vec(std::array<T, size> elem): elements(elem) 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> 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() constexpr explicit vec(std::array<G, base_size> el): elements()
@ -242,9 +246,11 @@ namespace blt
{ {
// cross is only defined on vectors of size 3. 2D could be implemented, which is a TODO // cross is only defined on vectors of size 3. 2D could be implemented, which is a TODO
static_assert(size == 3); static_assert(size == 3);
return {left.y() * right.z() - left.z() * right.y(), return {
left.y() * right.z() - left.z() * right.y(),
left.z() * right.x() - left.x() * right.z(), left.z() * right.x() - left.x() * right.z(),
left.x() * right.y() - left.y() * right.x()}; left.x() * right.y() - left.y() * right.x()
};
} }
constexpr static inline vec<T, size> project( constexpr static inline vec<T, size> project(
@ -295,6 +301,14 @@ namespace blt
{ {
return elements.cend(); 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>())>
@ -466,7 +480,8 @@ namespace blt
if constexpr (size >= 2) if constexpr (size >= 2)
{ {
return blt::vec<ValueType, 2>(t.x(), t.y()); return blt::vec<ValueType, 2>(t.x(), t.y());
} else }
else
{ {
return blt::vec<ValueType, 2>(t.x(), fill); return blt::vec<ValueType, 2>(t.x(), fill);
} }
@ -478,7 +493,8 @@ namespace blt
if constexpr (size >= 3) if constexpr (size >= 3)
{ {
return blt::vec<ValueType, 3>(t.x(), t.y(), t.z()); return blt::vec<ValueType, 3>(t.x(), t.y(), t.z());
} else }
else
{ {
blt::vec<ValueType, 3> ret; blt::vec<ValueType, 3> ret;
for (size_t i = 0; i < size; i++) for (size_t i = 0; i < size; i++)
@ -495,7 +511,8 @@ namespace blt
if constexpr (size >= 4) if constexpr (size >= 4)
{ {
return blt::vec<ValueType, 4>(t.x(), t.y(), t.z(), t.w()); return blt::vec<ValueType, 4>(t.x(), t.y(), t.z(), t.w());
} else }
else
{ {
blt::vec<ValueType, 4> ret; blt::vec<ValueType, 4> ret;
for (size_t i = 0; i < size; i++) for (size_t i = 0; i < size; i++)