From 30e46b5ead923ddcf866b7c1d683137b46af6b85 Mon Sep 17 00:00:00 2001 From: jordan4ibanez Date: Tue, 28 Nov 2023 08:51:46 -0500 Subject: [PATCH] Make this look nicer --- source/Irrlicht/CB3DJSONMeshFileLoader.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/source/Irrlicht/CB3DJSONMeshFileLoader.cpp b/source/Irrlicht/CB3DJSONMeshFileLoader.cpp index 2df5cecd..62088552 100644 --- a/source/Irrlicht/CB3DJSONMeshFileLoader.cpp +++ b/source/Irrlicht/CB3DJSONMeshFileLoader.cpp @@ -243,6 +243,7 @@ std::tuple CB3DJSONMeshFileLoader::readChunkBRUS() { json b = *reference; if (!b.is_object()) { + return {false, "BRUS: Element " + std::to_string(index) + " is not an object."}; } @@ -255,7 +256,9 @@ std::tuple CB3DJSONMeshFileLoader::readChunkBRUS() { //* Red. if (b.contains("red") && b["red"].is_number()) { + B3DMaterial.red = b["red"]; + } else { if (!b.contains("red")) { @@ -279,7 +282,9 @@ std::tuple CB3DJSONMeshFileLoader::readChunkBRUS() { //* Blue. if (b.contains("blue") && b["blue"].is_number()) { + B3DMaterial.blue = b["blue"]; + } else { if (!b.contains("blue")) { @@ -303,7 +308,9 @@ std::tuple CB3DJSONMeshFileLoader::readChunkBRUS() { //* Blend. if (b.contains("blend") && b["blend"].is_number_integer()) { + B3DMaterial.blend = b["blend"]; + } else { if (!b.contains("blend")) { @@ -315,7 +322,9 @@ std::tuple CB3DJSONMeshFileLoader::readChunkBRUS() { //* FX. if (b.contains("fx") && b["fx"].is_number_integer()) { + B3DMaterial.fx = b["fx"]; + } else { if (!b.contains("fx")) { @@ -325,8 +334,6 @@ std::tuple CB3DJSONMeshFileLoader::readChunkBRUS() { return {false, "BRUS: Element (" + std::to_string(index) + ") \"fx\" is not an integer."}; } - - index++; }