From 26d5d8f07642564aa59f0ff80a99712c1bd474ee Mon Sep 17 00:00:00 2001 From: jordan4ibanez Date: Tue, 28 Nov 2023 04:46:25 -0500 Subject: [PATCH] Now we start building off the normal B3D loader --- source/Irrlicht/CB3DJSONMeshFileLoader.cpp | 4 ++-- source/Irrlicht/CB3DJSONMeshFileLoader.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/Irrlicht/CB3DJSONMeshFileLoader.cpp b/source/Irrlicht/CB3DJSONMeshFileLoader.cpp index 2378c5f3..0098d877 100644 --- a/source/Irrlicht/CB3DJSONMeshFileLoader.cpp +++ b/source/Irrlicht/CB3DJSONMeshFileLoader.cpp @@ -219,7 +219,7 @@ IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) { } // Now check some real basic elements of the JSON file. - if (!data.contains("format") || !data["format"].is_string() || data["format"] != "BB3DJSON") { + if (!data.contains("format") || !data["format"].is_string() || data["format"] != "BB3D") { os::Printer::log("No format in B3D JSON! Expected: BB3DJSON", ELL_WARNING); return nullptr; } @@ -228,7 +228,7 @@ IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) { return nullptr; } - // Now we can start doing things with it. + // Now we can start doing a full parse of the data in the model JSON. IAnimatedMesh* finalizedModel = parseModel(data); diff --git a/source/Irrlicht/CB3DJSONMeshFileLoader.h b/source/Irrlicht/CB3DJSONMeshFileLoader.h index 7e8269b9..62e9277a 100644 --- a/source/Irrlicht/CB3DJSONMeshFileLoader.h +++ b/source/Irrlicht/CB3DJSONMeshFileLoader.h @@ -1,5 +1,8 @@ +#pragma once + #include "IAnimatedMesh.h" #include "IMeshLoader.h" +#include "CSkinnedMesh.h" #include "IReadFile.h" #include "path.h" @@ -11,6 +14,9 @@ namespace scene class CB3DJSONMeshFileLoader : public IMeshLoader { +private: + CSkinnedMesh* AnimatedMesh; + public: CB3DJSONMeshFileLoader();