summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-02-28 17:04:21 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-02-28 17:04:21 +0100
commitdc4b30d53a7eee3c06be4fa4a10b1c9c456fe026 (patch)
tree9271547c54a8e5a49088ec981863ab77d9988b5b
parent92f6c13f52a831af72314cfbeaae90b560c7320f (diff)
use Magnum::Math::IsVector
-rw-r--r--editor/inspect.cpp4
-rw-r--r--entity/erased-constraints.cpp4
-rw-r--r--entity/erased-constraints.hpp7
3 files changed, 3 insertions, 12 deletions
diff --git a/editor/inspect.cpp b/editor/inspect.cpp
index 0c45251b..f68df7d1 100644
--- a/editor/inspect.cpp
+++ b/editor/inspect.cpp
@@ -16,8 +16,6 @@ namespace floormat::entities {
namespace {
-using erased_constraints::is_magnum_vector;
-
const char* label_left(StringView label, char* buf, std::size_t len)
{
std::snprintf(buf, len, "##%s", label.data());
@@ -95,7 +93,7 @@ bool do_inspect_field(void* datum, const erased_accessor& accessor, field_repr r
}
else if constexpr(std::is_same_v<T, bool>)
ret = ImGui::Checkbox(label, &value);
- else if constexpr (!is_magnum_vector<T>)
+ else if constexpr (!Math::IsVector<T>())
{
auto [min, max] = accessor.get_range(datum).convert<T>();
constexpr auto igdt = IGDT<T>;
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;