Убрал паттерн Builder из SaveMap из-за неправильной работы

Core/Game/Actors/Actor.cpp

@@ -14,11 +14,12 @@ Actor::Actor() : loc_(new Vector3D), rot_(new Vector3D), scale_(new Vector3D)
 
 std::shared_ptr<SaveMap> Actor::save()
 {
-    return std::make_shared<SaveMap>("Actor")
-               ->SaveObject("loc", loc_)
-               ->SaveObject("rot", rot_)
-               ->SaveObject("scale", scale_)
-               ->SaveListStrings("tags", std::move(tags));
+    std::shared_ptr<SaveMap> save = std::make_shared<SaveMap>("Actor");
+    save->SaveObject("loc", loc_);
+    save->SaveObject("rot", rot_);
+    save->SaveObject("scale", scale_);
+    save->SaveListStrings("tags", std::move(tags));
+    return save;
 }
 
 void Actor::load(std::shared_ptr<SaveMap> save)

Core/Game/SaveMap/SaveMap.cpp

@@ -371,76 +371,64 @@ save_list_objects(std::move(save_map.save_list_objects))
 {
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveInteger(const char* name, int value) noexcept
+void SaveMap::SaveInteger(const char* name, int value) noexcept
 {
     save_long[name] = value;
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveDouble(const char* name, double value) noexcept
+void SaveMap::SaveDouble(const char* name, double value) noexcept
 {
     save_double[name] = value;
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveString(const char* name, const std::string& value) noexcept
+void SaveMap::SaveString(const char* name, const std::string& value) noexcept
 {
     save_string[name] = value;
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveObject(const char* name, std::shared_ptr<ISave> object) noexcept
+void SaveMap::SaveObject(const char* name, std::shared_ptr<ISave> object) noexcept
 {
     save_objects[name] = object;
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveVectorInteger(const char* name, std::vector<long long>&& value) noexcept
+void SaveMap::SaveVectorInteger(const char* name, std::vector<long long>&& value) noexcept
 {
     save_vector_integer[name] = std::move(value);
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveVectorDouble(const char* name, std::vector<double>&& value) noexcept
+void SaveMap::SaveVectorDouble(const char* name, std::vector<double>&& value) noexcept
 {
     save_vector_double[name] = std::move(value);
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveVectorStrings(const char* name, std::vector<std::string>&& value) noexcept
+void SaveMap::SaveVectorStrings(const char* name, std::vector<std::string>&& value) noexcept
 {
     save_vector_strings[name] = std::move(value);
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveVectorObject(const char* name, std::vector<std::shared_ptr<ISave>>&& value) noexcept
+void SaveMap::SaveVectorObject(const char* name, std::vector<std::shared_ptr<ISave>>&& value) noexcept
 {
     save_vector_objects[name] = std::move(value);
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveListInteger(const char* name, std::list<long long>&& value) noexcept
+void SaveMap::SaveListInteger(const char* name, std::list<long long>&& value) noexcept
 {
     save_list_integer[name] = std::move(value);
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveListDouble(const char* name, std::list<double>&& value) noexcept
+void SaveMap::SaveListDouble(const char* name, std::list<double>&& value) noexcept
 {
     save_list_double[name] = std::move(value);
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveListStrings(const char* name, std::list<std::string>&& value) noexcept
+void SaveMap::SaveListStrings(const char* name, std::list<std::string>&& value) noexcept
 {
     save_list_strings[name] = std::move(value);
-    return std::shared_ptr<SaveMap>(this);
 }
 
-std::shared_ptr<SaveMap> SaveMap::SaveListObject(const char* name, std::list<std::shared_ptr<ISave>>&& value) noexcept
+void SaveMap::SaveListObject(const char* name, std::list<std::shared_ptr<ISave>>&& value) noexcept
 {
     save_list_objects[name] = std::move(value);
-    return std::shared_ptr<SaveMap>(this);
 }
 
 long long SaveMap::GetInteger(const char* name)
@@ -517,7 +505,7 @@ std::string SaveMap::serialize() noexcept
         buffer += ",\"s" + key + "\":\"" + value + '\"';
 
     for (auto& [key, value] : save_objects)
-        buffer += ",\"o" + key + "\":\"" + value->save()->serialize();
+        buffer += ",\"o" + key + "\":" + value->save()->serialize();
 
     for (auto& [key, value] : save_vector_integer)
     {
@@ -631,13 +619,12 @@ std::string SaveMap::serialize() noexcept
     return buffer;
 }
 
-std::shared_ptr<SaveMap> SaveMap::connect_to(const std::shared_ptr<SaveMap>& parent)
+void SaveMap::connect_to(const std::shared_ptr<SaveMap>& parent)
 {
     if (this->parent_ != nullptr)
         throw std::runtime_error("Can't connect to second parent");
     
     this->parent_ = parent;
-    return std::shared_ptr<SaveMap>(this);
 }
 
 std::string SaveMap::CleaningJSON(const std::string& json_data)

Core/Game/SaveMap/SaveMap.hpp

@@ -44,18 +44,18 @@ public:
     SaveMap(SaveMap&& save_map) noexcept;
 
     // Методы созранения значений
-    std::shared_ptr<SaveMap> SaveInteger(const char* name, int value) noexcept;
-    std::shared_ptr<SaveMap> SaveDouble(const char* name, double value) noexcept;
-    std::shared_ptr<SaveMap> SaveString(const char* name, const std::string& value) noexcept;
-    std::shared_ptr<SaveMap> SaveObject(const char* name, std::shared_ptr<ISave> object) noexcept;
-    std::shared_ptr<SaveMap> SaveVectorInteger(const char* name, std::vector<long long>&& value) noexcept;
-    std::shared_ptr<SaveMap> SaveVectorDouble(const char* name, std::vector<double>&& value) noexcept;
-    std::shared_ptr<SaveMap> SaveVectorStrings(const char* name, std::vector<std::string>&& value) noexcept;
-    std::shared_ptr<SaveMap> SaveVectorObject(const char* name, std::vector<std::shared_ptr<ISave>>&& value) noexcept;
-    std::shared_ptr<SaveMap> SaveListInteger(const char* name, std::list<long long>&& value) noexcept;
-    std::shared_ptr<SaveMap> SaveListDouble(const char* name, std::list<double>&& value) noexcept;
-    std::shared_ptr<SaveMap> SaveListStrings(const char* name, std::list<std::string>&& value) noexcept;
-    std::shared_ptr<SaveMap> SaveListObject(const char* name, std::list<std::shared_ptr<ISave>>&& value) noexcept;
+    void SaveInteger(const char* name, int value) noexcept;
+    void SaveDouble(const char* name, double value) noexcept;
+    void SaveString(const char* name, const std::string& value) noexcept;
+    void SaveObject(const char* name, std::shared_ptr<ISave> object) noexcept;
+    void SaveVectorInteger(const char* name, std::vector<long long>&& value) noexcept;
+    void SaveVectorDouble(const char* name, std::vector<double>&& value) noexcept;
+    void SaveVectorStrings(const char* name, std::vector<std::string>&& value) noexcept;
+    void SaveVectorObject(const char* name, std::vector<std::shared_ptr<ISave>>&& value) noexcept;
+    void SaveListInteger(const char* name, std::list<long long>&& value) noexcept;
+    void SaveListDouble(const char* name, std::list<double>&& value) noexcept;
+    void SaveListStrings(const char* name, std::list<std::string>&& value) noexcept;
+    void SaveListObject(const char* name, std::list<std::shared_ptr<ISave>>&& value) noexcept;
 
     // Методы получения значенй
     long long GetInteger(const char* name);
@@ -77,7 +77,7 @@ public:
     // Собирает все токены в JSON объект
     std::string serialize() noexcept;
 
-    std::shared_ptr<SaveMap> connect_to(const std::shared_ptr<SaveMap>& parent);
+    void connect_to(const std::shared_ptr<SaveMap>& parent);
 
     static std::string CleaningJSON(const std::string& json_data);
 };

Core/Game/World/World.cpp

@@ -28,6 +28,18 @@ void World::Tick(double delta_time)
 std::shared_ptr<SaveMap> World::save()
 {
     std::shared_ptr<SaveMap> save = std::make_shared<SaveMap>("World");
+    
+    std::vector<std::string> ActorsIDs;
+    ActorsIDs.reserve(actors_map.size());
+    std::list<std::shared_ptr<ISave>> actors;
+    for (auto[it, flag] : actors_map)
+    {
+        ActorsIDs.push_back(it);
+        actors.push_back(flag);
+    }
+    save->SaveVectorStrings("ActorsIDs", std::move(ActorsIDs));
+    save->SaveListObject("Actors", std::move(actors));
+    
     return save;
 }
 

Core/Game/World/World.hpp

@@ -49,8 +49,8 @@ public:
         std::shared_ptr<T> object = std::make_shared<T>();
         object->SetActorLocate(loc);
         object->SetActorRotate(rot);
-        static_cast<Actor*>(object)->world_ = this;
-        static_cast<Actor*>(object)->name_ = name;
+        std::static_pointer_cast<Actor>(object)->world_ = this;
+        std::static_pointer_cast<Actor>(object)->name_ = name;
         actors_map.try_emplace(name, object);
         return object;
     }