add to_json && version field #6

resources/data/ExampleMap.json

@@ -1,4 +1,5 @@
 {
+  "version": "0.1-DEV",
   "world": {
     "width": 50,
     "height": 35

src/world/Island.cpp

@@ -202,3 +202,17 @@ void mdcii::world::Island::CreateLayersFromJson(const nlohmann::json& t_json)
     gridLayer->PrepareCpuDataForRendering();
     gridLayer->PrepareGpuDataForRendering();
 }
+
+//-------------------------------------------------
+// Json
+//-------------------------------------------------
+
+void mdcii::world::to_json(nlohmann::json& t_json, const Island& t_island)
+{
+    t_json = nlohmann::json{
+        { "width", t_island.width },
+        { "height", t_island.height },
+        { "x", t_island.startWorldX },
+        { "y", t_island.startWorldY }
+    };
+}

src/world/Island.h

@@ -233,4 +233,10 @@ namespace mdcii::world
          */
         void CreateLayersFromJson(const nlohmann::json& t_json);
     };
+
+    //-------------------------------------------------
+    // Json
+    //-------------------------------------------------
+
+    void to_json(nlohmann::json& t_json, const Island& t_island);
 }

src/world/World.cpp

@@ -376,6 +376,11 @@ void mdcii::world::World::Init()
     nlohmann::json j = read_json_from_file(Game::RESOURCES_REL_PATH + m_mapFilePath);
     for (const auto& [k, v] : j.items())
     {
+        if (k == "version" && v.get<std::string>() != Game::VERSION)
+        {
+            throw MDCII_EXCEPTION("[World::Init()] Invalid map file format.");
+        }
+
         if (k == "world")
         {
             width = v.at("width").get<int32_t>();
@@ -456,3 +461,15 @@ void mdcii::world::World::CleanUp() const
     event::EventManager::event_dispatcher.removeListener(event::MdciiEventType::MOUSE_BUTTON_PRESSED, m_mouseButtonPressed);
     event::EventManager::event_dispatcher.removeListener(event::MdciiEventType::MOUSE_MOVED, m_mouseMoved);
 }
+
+//-------------------------------------------------
+// Json
+//-------------------------------------------------
+
+void mdcii::world::to_json(nlohmann::json& t_json, const World& t_world)
+{
+    t_json = nlohmann::json{
+        { "width", t_world.width },
+        { "height", t_world.height }
+    };
+}

src/world/World.h

@@ -21,6 +21,7 @@
 #include <magic_enum.hpp>
 #include <glm/vec2.hpp>
 #include "event/EventManager.h"
+#include "data/json.hpp"
 
 //-------------------------------------------------
 // Forward declarations
@@ -436,4 +437,10 @@ namespace mdcii::world
          */
         void CleanUp() const;
     };
+
+    //-------------------------------------------------
+    // Json
+    //-------------------------------------------------
+
+    void to_json(nlohmann::json& t_json, const World& t_world);
 }

src/world/WorldGui.cpp

@@ -229,24 +229,19 @@ void mdcii::world::WorldGui::SaveGameGui()
             throw MDCII_EXCEPTION("[WorldGui::SaveGameGui()] Error while opening file " + fileName + ".");
         }
 
-        // write world
-        // todo: to_json && meta data
-        auto worldJson = nlohmann::json::object();
-        worldJson["width"] = m_world->width;
-        worldJson["height"] = m_world->height;
-        json["world"] = worldJson;
-
-        // write islands
-        auto islandsJson = nlohmann::json::array();
+        // version
+        json["version"] = Game::VERSION;
+
+        // world
+        json["world"] = *m_world;
 
+        // islands
+        auto islandsJson = nlohmann::json::array();
         for (const auto& island : m_world->terrain->islands)
         {
             // island
             auto islandJson = nlohmann::json::object();
-            islandJson["width"] = island->width;
-            islandJson["height"] = island->height;
-            islandJson["x"] = island->startWorldX;
-            islandJson["y"] = island->startWorldY;
+            islandJson = *island;
             islandJson["layers"] = nlohmann::json::array();
 
             // coast