diff options
Diffstat (limited to 'entity')
| -rw-r--r-- | entity/erased-constraints.cpp | 4 | ||||
| -rw-r--r-- | entity/erased-constraints.hpp | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/entity/erased-constraints.cpp b/entity/erased-constraints.cpp index 52bb784a..2c062bf1 100644 --- a/entity/erased-constraints.cpp +++ b/entity/erased-constraints.cpp @@ -19,7 +19,7 @@ template<typename T> std::pair<T, T> range::convert() const if (type == type_none) { - if constexpr (is_magnum_vector<T>) + if constexpr (Math::IsVector<T>()) { using U = typename T::Type; constexpr auto Size = T::Size; @@ -54,7 +54,7 @@ template<typename T> std::pair<T, T> range::convert() const } } } - else if constexpr(is_magnum_vector<T>) + else if constexpr(Math::IsVector<T>()) { using U = typename T::Type; constexpr auto Size = T::Size; diff --git a/entity/erased-constraints.hpp b/entity/erased-constraints.hpp index 2674a619..c77d8166 100644 --- a/entity/erased-constraints.hpp +++ b/entity/erased-constraints.hpp @@ -4,13 +4,6 @@ namespace floormat::entities::erased_constraints { -template<typename T> struct is_magnum_vector_ final : std::false_type {}; -template<std::size_t N, typename T> struct is_magnum_vector_<Math::Vector<N, T>> : std::true_type {}; -template<typename T> struct is_magnum_vector_<Math::Vector2<T>> : std::true_type {}; -template<typename T> struct is_magnum_vector_<Math::Vector3<T>> : std::true_type {}; -template<typename T> struct is_magnum_vector_<Math::Vector4<T>> : std::true_type {}; -template<typename T> constexpr inline bool is_magnum_vector = is_magnum_vector_<T>::value; - struct range final { using U = std::size_t; |