BlackMATov/vmath.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/vmath.hpp.git synced 2025-12-14 12:28:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

hash and cast_to qua functions

Browse Source
This commit is contained in:
BlackMATov
2021-01-25 06:10:53 +07:00
parent e26d759b6d
commit 55d5dfd9a3
2 changed files with 88 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
headers/vmath.hpp/vmath_ext.hpp
View File

@@ -11,6 +11,7 @@
#include "vmath_fun.hpp"
#include "vmath_vec_fun.hpp"
#include "vmath_mat_fun.hpp"
#include "vmath_qua_fun.hpp"
//
// Units
@@ -73,6 +74,11 @@ namespace vmath_hpp::detail
[[nodiscard]] std::size_t hash(const mat<T, Size>& m) noexcept {
return fold_join(hash_combiner{}, std::size_t{}, m);
}
template < typename T >
[[nodiscard]] std::size_t hash(const qua<T>& q) noexcept {
return fold_join(hash_combiner{}, std::size_t{}, q);
}
}
namespace std
@@ -90,6 +96,13 @@ namespace std
return vmath_hpp::detail::hash(m);
}
};
template < typename T >
struct hash<vmath_hpp::qua<T>> {
size_t operator()(const vmath_hpp::qua<T>& q) const noexcept {
return vmath_hpp::detail::hash(q);
}
};
}
//
@@ -115,6 +128,11 @@ namespace vmath_hpp
[[nodiscard]] constexpr mat<To, Size> cast_to(const mat<From, Size>& m) {
return detail::map_join([](const vec<From, Size>& v){ return cast_to<To>(v); }, m);
}
template < typename To, typename From >
[[nodiscard]] constexpr qua<To> cast_to(const qua<From>& q) {
return detail::map_join([](From x){ return cast_to<To>(x); }, q);
}
}
//

73
untests/vmath_ext_tests.cpp
View File

@@ -52,7 +52,7 @@ TEST_CASE("vmath/ext") {
STATIC_REQUIRE(identity4x4<int> == int4x4());
}
SUBCASE("hash") {
SUBCASE("vector hash") {
REQUIRE(std::hash<int2>{}({1,2}) == std::hash<int2>{}({1,2}));
REQUIRE_FALSE(std::hash<int2>{}({1,2}) == std::hash<int2>{}({2,1}));
@@ -62,8 +62,6 @@ TEST_CASE("vmath/ext") {
REQUIRE(std::hash<int4>{}({1,2,3,4}) == std::hash<int4>{}({1,2,3,4}));
REQUIRE_FALSE(std::hash<int4>{}({1,2,3,4}) == std::hash<int4>{}({3,2,1,4}));
REQUIRE(std::hash<int2x2>{}({1,2,3,4}) == std::hash<int2x2>{}({1,2,3,4}));
REQUIRE_FALSE(std::hash<int2x2>{}({1,2,3,4}) == std::hash<int2x2>{}({1,2,4,3}));
{
std::set<int2> s;
s.insert(int2(1,2));
@@ -92,6 +90,70 @@ TEST_CASE("vmath/ext") {
}
}
SUBCASE("matrix hash") {
REQUIRE(std::hash<int2x2>{}({1,2,3,4}) == std::hash<int2x2>{}({1,2,3,4}));
REQUIRE_FALSE(std::hash<int2x2>{}({1,2,3,4}) == std::hash<int2x2>{}({1,2,4,3}));
{
std::set<int2x2> s;
s.insert(int2x2(1,2,3,4));
REQUIRE(s.count(int2x2(1,2,3,4)) > 0);
REQUIRE_FALSE(s.count(int2x2(1,1,1,1)) > 0);
}
{
std::map<int2x2, int> s;
s.emplace(int2x2(1,2,3,4),3);
s.emplace(int2x2(2,3,4,5),5);
REQUIRE(s[int2x2(1,2,3,4)] == 3);
REQUIRE(s[int2x2(2,3,4,5)] == 5);
}
{
std::unordered_set<int2x2> s;
s.insert(int2x2(1,2,3,4));
REQUIRE(s.count(int2x2(1,2,3,4)) > 0);
REQUIRE_FALSE(s.count(int2x2(1,1,1,1)) > 0);
}
{
std::unordered_map<int2x2, int> s;
s.emplace(int2x2(1,2,3,4),3);
s.emplace(int2x2(2,3,4,5),5);
REQUIRE(s[int2x2(1,2,3,4)] == 3);
REQUIRE(s[int2x2(2,3,4,5)] == 5);
}
}
SUBCASE("quaternion hash") {
REQUIRE(std::hash<fqua>{}({1,2,3,4}) == std::hash<fqua>{}({1,2,3,4}));
REQUIRE_FALSE(std::hash<fqua>{}({1,2,3,4}) == std::hash<fqua>{}({3,2,1,4}));
{
std::set<qua<int>> s;
s.insert(qua(1,2,3,4));
REQUIRE(s.count(qua(1,2,3,4)) > 0);
REQUIRE_FALSE(s.count(qua(1,1,1,1)) > 0);
}
{
std::map<qua<int>, int> s;
s.emplace(qua(1,2,3,4),3);
s.emplace(qua(2,3,4,5),5);
REQUIRE(s[qua(1,2,3,4)] == 3);
REQUIRE(s[qua(2,3,4,5)] == 5);
}
{
std::unordered_set<qua<int>> s;
s.insert(qua(1,2,3,4));
REQUIRE(s.count(qua(1,2,3,4)) > 0);
REQUIRE_FALSE(s.count(qua(1,1,1,1)) > 0);
}
{
std::unordered_map<qua<int>, int> s;
s.emplace(qua(1,2,3,4),3);
s.emplace(qua(2,3,4,5),5);
REQUIRE(s[qua(1,2,3,4)] == 3);
REQUIRE(s[qua(2,3,4,5)] == 5);
}
}
SUBCASE("cast_to") {
{
constexpr auto i = cast_to<int>(1.5f);
@@ -108,6 +170,11 @@ TEST_CASE("vmath/ext") {
STATIC_REQUIRE(m == int2x2(1));
STATIC_REQUIRE(std::is_same_v<decltype(m)::row_type, int2>);
}
{
constexpr auto v = cast_to<int>(fqua{1.5f, 2.2f, 3.6f, 4.5f});
STATIC_REQUIRE(v == qua(1,2,3,4));
STATIC_REQUIRE(std::is_same_v<decltype(v)::component_type, int>);
}
}
SUBCASE("component") {