Merge remote-tracking branch 'upstream/main'

src/world/World.cpp

@@ -1,6 +1,7 @@
 #include "World.h"
 
 #include <memory>
+#include <iostream>
 #include <glm/glm.hpp>
 
 #include "Level.h"
@@ -12,6 +13,7 @@
 #include "../voxels/ChunksStorage.h"
 #include "../objects/Player.h"
 #include "../window/Camera.h"
+#include "../items/Inventories.h"
 
 world_load_error::world_load_error(std::string message) 
     : std::runtime_error(message) {
@@ -62,23 +64,18 @@ void World::write(Level* level) {
     wfile->writePlayer(level->player);
 }
 
+
 Level* World::create(std::string name, 
                      fs::path directory, 
                      uint64_t seed,
                      EngineSettings& settings, 
                      const Content* content,
                      const std::vector<ContentPack>& packs) {
-    World* world = new World(name, directory, seed, settings, content, packs);
-    return new Level(world, content, settings);
-}
 
-ContentLUT* World::checkIndices(const fs::path& directory, 
-                                const Content* content) {
-    fs::path indicesFile = directory/fs::path("indices.json");
-    if (fs::is_regular_file(indicesFile)) {
-        return ContentLUT::create(indicesFile, content);
-    }
-    return nullptr;
+    auto world = new World(name, directory, seed, settings, content, packs);
+    auto level = new Level(world, content, settings);
+    level->inventories->store(level->player->getInventory());
+    return level;
 }
 
 Level* World::load(fs::path directory,
@@ -96,11 +93,20 @@ Level* World::load(fs::path directory,
 
     Level* level = new Level(world.get(), content, settings);
     wfile->readPlayer(level->player);
-
+    level->inventories->store(level->player->getInventory());
     world.release();
     return level;
 }
 
+ContentLUT* World::checkIndices(const fs::path& directory, 
+                                const Content* content) {
+    fs::path indicesFile = directory/fs::path("indices.json");
+    if (fs::is_regular_file(indicesFile)) {
+        return ContentLUT::create(indicesFile, content);
+    }
+    return nullptr;
+}
+
 void World::setName(const std::string& name) {
     this->name = name;
 }
@@ -128,3 +134,44 @@ uint64_t World::getSeed() const {
 const std::vector<ContentPack>& World::getPacks() const {
     return packs;
 }
+
+void World::deserialize(dynamic::Map* root) {
+    name = root->getStr("name", name);
+    seed = root->getInt("seed", seed);
+
+	auto verobj = root->map("version");
+	if (verobj) {
+		int major=0, minor=-1;
+		verobj->num("major", major);
+		verobj->num("minor", minor);
+		std::cout << "world version: " << major << "." << minor << std::endl;
+	}
+
+	auto timeobj = root->map("time");
+	if (timeobj) {
+		timeobj->num("day-time", daytime);
+		timeobj->num("day-time-speed", daytimeSpeed);
+        timeobj->num("total-time", totalTime);
+	}
+    
+    nextInventoryId = root->getNum("next-inventory-id", 2);
+}
+
+std::unique_ptr<dynamic::Map> World::serialize() const {
+	auto root = std::make_unique<dynamic::Map>();
+
+	auto& versionobj = root->putMap("version");
+	versionobj.put("major", ENGINE_VERSION_MAJOR);
+	versionobj.put("minor", ENGINE_VERSION_MINOR);
+
+	root->put("name", name);
+	root->put("seed", seed);
+	
+    auto& timeobj = root->putMap("time");
+	timeobj.put("day-time", daytime);
+	timeobj.put("day-time-speed", daytimeSpeed);
+    timeobj.put("total-time", totalTime);
+
+    root->put("next-inventory-id", nextInventoryId);
+    return root;
+}