Pārlūkot izejas kodu

Initial parsing for header and more.

Kim Kulling 6 gadi atpakaļ
vecāks
revīzija
b03b3b9c03

+ 5 - 0
code/CMakeLists.txt

@@ -292,6 +292,11 @@ ADD_ASSIMP_IMPORTER( AMF
   AMFImporter_Postprocess.cpp
 )
 
+ADD_ASSIMP_IMPORTER( JT
+  JTImporter.h
+  JTImporter.cpp
+)
+
 ADD_ASSIMP_IMPORTER( 3DS
   3DSConverter.cpp
   3DSHelper.h

+ 8 - 1
code/ImporterRegistry.cpp

@@ -200,6 +200,9 @@ corresponding preprocessor flag to selectively disable formats.
 #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
 #   include "Importer/StepFile/StepFileImporter.h"
 #endif
+#ifndef ASSIMP_BUILD_NO_JT_IMPORTER
+#   include "JTImporter.h"
+#endif
 
 namespace Assimp {
 
@@ -358,13 +361,17 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
 #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
     out.push_back(new StepFile::StepFileImporter());
 #endif
+#ifndef ASSIMP_BUILD_NO_JT_IMPORTER
+    out.push_back(new JTImporter());
+#endif
+
 }
 
 /** will delete all registered importers. */
 void DeleteImporterInstanceList(std::vector< BaseImporter* >& deleteList){
 	for(size_t i= 0; i<deleteList.size();++i){
 		delete deleteList[i];
-		deleteList[i]=NULL;
+		deleteList[i]=nullptr;
 	}//for
 }
 

+ 1 - 0
test/CMakeLists.txt

@@ -126,6 +126,7 @@ SET( IMPORTERS
   unit/ImportExport/utOFFImportExport.cpp
   unit/ImportExport/utNFFImportExport.cpp
   unit/ImportExport/utXGLImportExport.cpp
+  unit/ImportExport/utJTImporter.cpp
 )
 
 SET( MATERIAL

BIN
test/models/JT/conrod.jt


+ 1 - 1
test/models/PLY/cube_test.ply

@@ -1,6 +1,6 @@
 ply
 format ascii 1.0
-comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.3297435427)
+comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.732158294)
 element vertex 8
 property float x
 property float y