minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Now we start building off the normal B3D loader

This commit is contained in:
jordan4ibanez 2023-11-28 04:46:25 -05:00
parent 7deaf11dea
commit 26d5d8f076
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Irrlicht/CB3DJSONMeshFileLoader.cpp
View File

@ -219,7 +219,7 @@ IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) {
} }
// Now check some real basic elements of the JSON 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); os::Printer::log("No format in B3D JSON! Expected: BB3DJSON", ELL_WARNING);
return nullptr; return nullptr;
} }
@ -228,7 +228,7 @@ IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) {
return nullptr; 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); IAnimatedMesh* finalizedModel = parseModel(data);

6
source/Irrlicht/CB3DJSONMeshFileLoader.h
View File

@ -1,5 +1,8 @@
#pragma once
#include "IAnimatedMesh.h" #include "IAnimatedMesh.h"
#include "IMeshLoader.h" #include "IMeshLoader.h"
#include "CSkinnedMesh.h"
#include "IReadFile.h" #include "IReadFile.h"
#include "path.h" #include "path.h"
@ -11,6 +14,9 @@ namespace scene
class CB3DJSONMeshFileLoader : public IMeshLoader class CB3DJSONMeshFileLoader : public IMeshLoader
{ {
private:
CSkinnedMesh* AnimatedMesh;
public: public:
CB3DJSONMeshFileLoader(); CB3DJSONMeshFileLoader();