celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimized deserialization

Browse Source
This commit is contained in:
Antoine Pilote
2023-08-03 18:56:30 -04:00
parent df24ab3259
commit a5ee88cb8e
52 changed files with 82 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Nuake/src/Scene/Scene.cpp
View File

@@ -367,7 +367,7 @@ namespace Nuake {
json serializedScene = Serialize();
sceneCopy->Deserialize(serializedScene.dump());
sceneCopy->Deserialize(serializedScene);
return sceneCopy;
}
@@ -392,12 +392,11 @@ namespace Nuake {
END_SERIALIZE();
}
bool Scene::Deserialize(const std::string& str)
bool Scene::Deserialize(const json& j)
{
if (str == "")
if (j == "")
return false;
BEGIN_DESERIALIZE();
if (!j.contains("Name"))
return false;
@@ -413,8 +412,7 @@ namespace Nuake {
if (j.contains("m_Environement"))
{
m_Environement = CreateRef<Environment>();
std::string env = j["m_Environement"].dump();
m_Environement->Deserialize(env);
m_Environement->Deserialize(j["m_Environement"]);
}
// Parse entities
@@ -427,12 +425,12 @@ namespace Nuake {
{
std::string name = e["NameComponent"]["Name"];
Entity ent = { m_Registry.create(), this };
ent.Deserialize(e.dump());
ent.Deserialize(e);
}
if (j.contains("m_EditorCamera"))
{
m_EditorCamera->Deserialize(j["m_EditorCamera"].dump());
m_EditorCamera->Deserialize(j["m_EditorCamera"]);
}
auto view = m_Registry.view<ParentComponent>();