Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for importing both glTF and glTF2 files

Browse Source
This commit is contained in:
John Senneker
2017-09-06 14:50:02 -04:00
committed by Daniel Hritzkiv
parent 2ee7991558
commit 19876e9822
4 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ImporterRegistry.cpp
View File

@@ -181,6 +181,7 @@ corresponding preprocessor flag to selectively disable formats.
# include "AssbinLoader.h"
#endif
#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
# include "glTFImporter.h"
# include "glTF2Importer.h"
#endif
#ifndef ASSIMP_BUILD_NO_C4D_IMPORTER
@@ -335,6 +336,7 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
out.push_back( new AssbinImporter() );
#endif
#if ( !defined ASSIMP_BUILD_NO_GLTF_IMPORTER )
out.push_back( new glTFImporter() );
out.push_back( new glTF2Importer() );
#endif
#if ( !defined ASSIMP_BUILD_NO_C4D_IMPORTER )