diff options
| m--------- | magnum-integration | 0 | ||||
| m--------- | magnum-plugins | 0 | ||||
| -rw-r--r-- | main.cpp | 2 | ||||
| -rw-r--r-- | serialize/anim.cpp | 2 | ||||
| -rw-r--r-- | serialize/magnum-vector.hpp (renamed from serialize/vector.hpp) | 0 | ||||
| -rw-r--r-- | serialize/tile-atlas.hpp | 27 |
6 files changed, 30 insertions, 1 deletions
diff --git a/magnum-integration b/magnum-integration -Subproject 2c2737621f3f7bb17bba4e5342f68e68476a567 +Subproject 8fdf1479bf01109d4171ba43496eea9578c120b diff --git a/magnum-plugins b/magnum-plugins -Subproject 1c9d360aa21a3788f32b2d94ad45c39841702a3 +Subproject 6da185c7069a224b9d10a8863c4a9148d4d5df4 @@ -16,6 +16,8 @@ #include <Magnum/Trade/AbstractImporter.h> #include <Magnum/Timeline.h> +#include "serialize/tile-atlas.hpp" //test + namespace Magnum::Examples { template<typename enum_type> diff --git a/serialize/anim.cpp b/serialize/anim.cpp index c65c24a6..78c871a8 100644 --- a/serialize/anim.cpp +++ b/serialize/anim.cpp @@ -1,4 +1,4 @@ -#include "serialize/vector.hpp" +#include "serialize/magnum-vector.hpp" #include "serialize/helper.hpp" #include "serialize/anim.hpp" diff --git a/serialize/vector.hpp b/serialize/magnum-vector.hpp index 39924a9b..39924a9b 100644 --- a/serialize/vector.hpp +++ b/serialize/magnum-vector.hpp diff --git a/serialize/tile-atlas.hpp b/serialize/tile-atlas.hpp new file mode 100644 index 00000000..af279251 --- /dev/null +++ b/serialize/tile-atlas.hpp @@ -0,0 +1,27 @@ +#pragma once +#include "../tile-atlas.hpp" +#include <nlohmann/json.hpp> + +namespace nlohmann { + +template<> +struct adl_serializer<Magnum::Examples::tile_atlas> final { + static void to_json(json& j, const Magnum::Examples::tile_atlas& x); + static void from_json(const json& j, Magnum::Examples::tile_atlas& x); +}; + +void adl_serializer<Magnum::Examples::tile_atlas>::to_json(json& j, const Magnum::Examples::tile_atlas& x) +{ +} + +void adl_serializer<Magnum::Examples::tile_atlas>::from_json(const json& j, Magnum::Examples::tile_atlas& x) +{ +} + +} // namespace nlohmann + +namespace Magnum::Examples::Serialize { + + + +} // namespace Magnum::Examples::Serialize |