loader: more refactoring

2 files changed, 33 insertions, 8 deletions

diff --git a/serialize/ground-atlas.cpp b/serialize/ground-atlas.cpp
index d5c04332..11ef40ef 100644
--- a/serialize/ground-atlas.cpp
+++ b/serialize/ground-atlas.cpp
@@ -1,21 +1,22 @@
 #include "ground-atlas.hpp"
+#include "compat/exception.hpp"
+#include "src/ground-atlas.hpp"
+#include "src/ground-def.hpp"
+#include "loader/loader.hpp"
+#include "loader/ground-cell.hpp"
 #include "serialize/corrade-string.hpp"
 #include "serialize/magnum-vector.hpp"
 #include "serialize/pass-mode.hpp"
-#include "loader/loader.hpp"
+#include <tuple>
+#include <Corrade/Utility/Move.h>
 #include <Magnum/Trade/ImageData.h>
 #include <Magnum/ImageView.h>
-#include <tuple>
 #include <nlohmann/json.hpp>
 
-namespace floormat {
-
-} // namespace floormat
+namespace nlohmann {
 
 using namespace floormat;
 
-namespace nlohmann {
-
 void adl_serializer<ground_def>::to_json(json& j, const ground_def& x)
 {
     using nlohmann::to_json;
@@ -31,6 +32,23 @@ void adl_serializer<ground_def>::from_json(const json& j, ground_def& val)
         val.pass = j["pass-mode"];
 }
 
+void adl_serializer<ground_cell>::to_json(json& j, const ground_cell& x)
+{
+    j = std::tuple<StringView, Vector2ub, pass_mode>{x.name, x.size, x.pass};
+}
+
+void adl_serializer<ground_cell>::from_json(const json& j, ground_cell& val)
+{
+    using nlohmann::from_json;
+    val = {};
+    val.name = j["name"];
+    fm_soft_assert(loader.check_atlas_name(val.name));
+    val.size = j["size"];
+    if (j.contains("pass-mode"))
+        val.pass = j["pass-mode"];
+}
+
+
 void adl_serializer<std::shared_ptr<ground_atlas>>::to_json(json& j, const std::shared_ptr<const ground_atlas>& x)
 {
     j = std::tuple<StringView, Vector2ub, pass_mode>{x->name(), x->num_tiles2(), x->pass_mode()};
diff --git a/serialize/ground-atlas.hpp b/serialize/ground-atlas.hpp
index a423ebbe..20b50537 100644
--- a/serialize/ground-atlas.hpp
+++ b/serialize/ground-atlas.hpp
@@ -1,10 +1,11 @@
 #pragma once
-#include "src/ground-atlas.hpp"
 #include <nlohmann/json_fwd.hpp>
 
 namespace floormat {
 
+struct ground_def;
 struct ground_cell;
+class ground_atlas;
 
 } // namespace floormat
 
@@ -22,4 +23,10 @@ struct adl_serializer<std::shared_ptr<floormat::ground_atlas>> final {
     static void from_json(const json& j, std::shared_ptr<floormat::ground_atlas>& x);
 };
 
+template<>
+struct adl_serializer<floormat::ground_cell> final {
+    static void to_json(json& j, const floormat::ground_cell& x);
+    static void from_json(const json& j, floormat::ground_cell& x);
+};
+
 } // namespace nlohmann