summaryrefslogtreecommitdiffhomepage
path: root/serialize/tile.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-09 12:22:14 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-09 12:22:14 +0200
commitcf6c5668f1d41a0fe02f97351a522ccfb3f245d4 (patch)
tree2dd795feb2b735773ca936effa57884986196aca /serialize/tile.cpp
parentb581b559fe426f39b1d548ca27f03cb22dd2ed22 (diff)
a
Diffstat (limited to 'serialize/tile.cpp')
-rw-r--r--serialize/tile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/serialize/tile.cpp b/serialize/tile.cpp
index a945f171..2e94bfb8 100644
--- a/serialize/tile.cpp
+++ b/serialize/tile.cpp
@@ -4,17 +4,17 @@
#include "serialize/tile-atlas.hpp"
#include <nlohmann/json.hpp>
-namespace Magnum::Examples {
+namespace floormat {
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(tile_image, atlas, variant)
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(tile, ground_image, wall_north, wall_west, passability)
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(local_coords, x, y)
-} // namespace Magnum::Examples
+} // namespace floormat
namespace nlohmann {
-using namespace Magnum::Examples;
+using namespace floormat;
void adl_serializer<tile_image>::to_json(json& j, const tile_image& val) { using nlohmann::to_json; if (val.atlas) to_json(j, val); else j = nullptr; }
void adl_serializer<tile_image>::from_json(const json& j, tile_image& val) { using nlohmann::from_json; from_json(j, val); }