diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-22 10:22:56 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-22 10:22:56 +0200 |
| commit | d18a02d38f86d44e1825619a84cd01dcd5f28cf6 (patch) | |
| tree | 9b72eae29b3787a4cbd3f76faae3b36844c4be17 | |
| parent | 087f5021200e6c80bfdc1f039a47a1d6240d0a87 (diff) | |
serializer crap
| -rw-r--r-- | serialize/magnum-vector.hpp | 7 | ||||
| -rw-r--r-- | serialize/magnum-vector2i.hpp | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/serialize/magnum-vector.hpp b/serialize/magnum-vector.hpp index 61e127b1..f747fca7 100644 --- a/serialize/magnum-vector.hpp +++ b/serialize/magnum-vector.hpp @@ -1,10 +1,5 @@ #pragma once -#include <Magnum/Magnum.h> #include <Magnum/Math/Vector.h> -#include <Magnum/Math/Vector2.h> -#include <Magnum/Math/Vector3.h> -#include <Magnum/Math/Vector4.h> -#include <Magnum/Math/Color.h> #include <nlohmann/json.hpp> namespace nlohmann { @@ -36,10 +31,10 @@ void adl_serializer<Magnum::Math::Vector<N, T>>::from_json(const json& j, vec& v val[i] = array[i]; } +template<typename T> struct adl_serializer<Magnum::Math::Vector2<T>> : adl_serializer<Magnum::Math::Vector<2, T>> {}; template<typename T> struct adl_serializer<Magnum::Math::Vector3<T>> : adl_serializer<Magnum::Math::Vector<3, T>> {}; template<typename T> struct adl_serializer<Magnum::Math::Vector4<T>> : adl_serializer<Magnum::Math::Vector<4, T>> {}; template<typename T> struct adl_serializer<Magnum::Math::Color3<T>> : adl_serializer<Magnum::Math::Vector<3, T>> {}; template<typename T> struct adl_serializer<Magnum::Math::Color4<T>> : adl_serializer<Magnum::Math::Vector<4, T>> {}; -template<typename T> struct adl_serializer<Magnum::Math::Vector2<T>> : adl_serializer<Magnum::Math::Vector<2, T>> {}; } // namespace nlohmann diff --git a/serialize/magnum-vector2i.hpp b/serialize/magnum-vector2i.hpp index c8c52e7e..00df0e46 100644 --- a/serialize/magnum-vector2i.hpp +++ b/serialize/magnum-vector2i.hpp @@ -1,8 +1,5 @@ #include <cstdio> #include <string> -#include <limits> -#include <exception> -#include <Magnum/Magnum.h> #include <Magnum/Math/Vector2.h> #include <nlohmann/json.hpp> @@ -10,7 +7,8 @@ namespace nlohmann { template<typename t> requires std::is_integral_v<t> -struct adl_serializer<Magnum::Math::Vector2<t>> final { +struct adl_serializer<Magnum::Math::Vector2<t>> final +{ static void to_json(json& j, const Magnum::Math::Vector2<t>& val) { char buf[64]; |