minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-02-11 17:10:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from jordan4ibanez/feat/gltf-loader

Browse Source 
Fix embedded textures causing a model not to load
This commit is contained in:
jordan4ibanez 2023-01-27 20:57:27 -05:00 committed by GitHub
commit d2ba0ed995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/Irrlicht/CGLTFMeshFileLoader.cpp
View File

@ -52,6 +52,13 @@ private:
std::size_t m_offset; std::size_t m_offset;
}; };
// A helper function to disable tinygltf embedded image loading
bool turn_off_textures_hack(tinygltf::Image *a, const int b, std::string *c,
std::string *d, int e, int f, const unsigned char * g,int h, void *user_pointer)
{
return true;
};
namespace irr namespace irr
{ {
@ -61,13 +68,18 @@ namespace scene
static bool tryParseGLTF(io::IReadFile* file, tinygltf::Model& model) static bool tryParseGLTF(io::IReadFile* file, tinygltf::Model& model)
{ {
tinygltf::TinyGLTF loader {}; tinygltf::TinyGLTF loader {};
// Stop embedded textures from making model fail to load
void *the_void = 0;
loader.SetImageLoader(turn_off_textures_hack, the_void);
std::string err {}; std::string err {};
std::string warn {}; std::string warn {};
auto buf = std::make_unique<char[]>(file->getSize()); auto buf = std::make_unique<char[]>(file->getSize());
file->read(buf.get(), file->getSize()); file->read(buf.get(), file->getSize());
return loader.LoadASCIIFromString(
&model, &err, &warn, buf.get(), file->getSize(), "", 1); return loader.LoadASCIIFromString(&model, &err, &warn, buf.get(), file->getSize(), "", 1);
} }
template <class T> template <class T>