Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CM…

…ake List
assimp · Sep 11, 2017 · 63d3655 · 63d3655
1 parent f7d39cf
commit 63d3655
Show file tree

Hide file tree

Showing 4 changed files with 775 additions and 2 deletions.
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
@@ -665,6 +665,8 @@ ADD_ASSIMP_IMPORTER( GLTF
   glTF2Asset.inl
   glTF2AssetWriter.h
   glTF2AssetWriter.inl
+  glTF2Importer.cpp
+  glTF2Importer.h
   glTF2Exporter.h
   glTF2Exporter.cpp
 )

diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp
@@ -181,7 +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
 #   include "C4DImporter.h"
@@ -335,7 +335,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 )
     out.push_back( new C4DImporter() );