From 3e10ee032cfa1610f459aded8de592152bdced17 Mon Sep 17 00:00:00 2001 From: antopilo Date: Sat, 4 Jan 2025 03:17:11 -0500 Subject: [PATCH] Fixed mesh deserialization --- Nuake/src/Rendering/Mesh/Mesh.cpp | 7 +++++-- Nuake/src/Resource/Model.cpp | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Nuake/src/Rendering/Mesh/Mesh.cpp b/Nuake/src/Rendering/Mesh/Mesh.cpp index dc30a905..daf13249 100644 --- a/Nuake/src/Rendering/Mesh/Mesh.cpp +++ b/Nuake/src/Rendering/Mesh/Mesh.cpp @@ -200,8 +200,11 @@ namespace Nuake { Vertex vertex; try { - vertex.uv_x = v["UV"]["X"]; - vertex.uv_y = v["UV"]["Y"]; + if (v.contains("UV") && v["UV"].contains("x") && v["UV"].contains("y")) + { + vertex.uv_x = v["UV"]["x"]; + vertex.uv_y = v["UV"]["x"]; + } } catch (std::exception& /*e*/) { vertex.uv_x = 0.0f; diff --git a/Nuake/src/Resource/Model.cpp b/Nuake/src/Resource/Model.cpp index 5dd9f5c5..b8d3f1f1 100644 --- a/Nuake/src/Resource/Model.cpp +++ b/Nuake/src/Resource/Model.cpp @@ -79,9 +79,9 @@ namespace Nuake { for (auto& m : j["Meshes"]) { - //Ref mesh = CreateRef(); - //mesh->Deserialize(m); - //m_Meshes.push_back(mesh); + Ref mesh = CreateRef(); + mesh->Deserialize(m); + m_Meshes.push_back(mesh); } } }