v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ADD_ASSIMP_IMPORTER for STEP importer

pull/2259/head
sfalexrog 2018-12-04 23:28:50 +03:00
parent d7eae5bb13
commit af323de741
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/CMakeLists.txt
View File

@ -727,7 +727,7 @@ ADD_ASSIMP_IMPORTER( MMD
MMDVmdParser.h MMDVmdParser.h
) )
SET( Step_SRCS ADD_ASSIMP_IMPORTER( STEP
STEPFile.h STEPFile.h
Importer/StepFile/StepFileImporter.h Importer/StepFile/StepFileImporter.h
Importer/StepFile/StepFileImporter.cpp Importer/StepFile/StepFileImporter.cpp
@ -738,7 +738,6 @@ SET( Step_SRCS
StepExporter.h StepExporter.h
StepExporter.cpp StepExporter.cpp
) )
SOURCE_GROUP( Step FILES ${Step_SRCS})
SET( Exporter_SRCS SET( Exporter_SRCS
Exporter.cpp Exporter.cpp

2
code/Importer/StepFile/StepFileGen1.cpp
View File

@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */ /** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */
#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
#include "code/Importer/StepFile/StepReaderGen.h" #include "code/Importer/StepFile/StepReaderGen.h"

4
code/Importer/StepFile/StepFileImporter.cpp
View File

@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
*/ */
#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
#include "StepFileImporter.h" #include "StepFileImporter.h"
#include "../../Importer/STEPParser/STEPFileReader.h" #include "../../Importer/STEPParser/STEPFileReader.h"
@ -110,5 +110,5 @@ void StepFileImporter::InternReadFile(const std::string &file, aiScene* pScene,
} // Namespace StepFile } // Namespace StepFile
} // Namespace Assimp } // Namespace Assimp
#endif // ASSIMP_BUILD_NO_STEPFILE_IMPORTER #endif // ASSIMP_BUILD_NO_STEP_IMPORTER

4
code/Importer/StepFile/StepFileImporter.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once #pragma once
#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
#include <assimp/BaseImporter.h> #include <assimp/BaseImporter.h>
@ -66,4 +66,4 @@ private:
} // Namespace StepFile } // Namespace StepFile
} // Namespace Assimp } // Namespace Assimp
#endif // ASSIMP_BUILD_NO_STEPFILE_IMPORTER #endif // ASSIMP_BUILD_NO_STEP_IMPORTER

4
code/ImporterRegistry.cpp
View File

@ -197,7 +197,7 @@ corresponding preprocessor flag to selectively disable formats.
#ifndef ASSIMP_BUILD_NO_MMD_IMPORTER #ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
# include "MMDImporter.h" # include "MMDImporter.h"
#endif #endif
#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
# include "Importer/StepFile/StepFileImporter.h" # include "Importer/StepFile/StepFileImporter.h"
#endif #endif
@ -355,7 +355,7 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
#ifndef ASSIMP_BUILD_NO_MMD_IMPORTER #ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
out.push_back( new MMDImporter() ); out.push_back( new MMDImporter() );
#endif #endif
#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
out.push_back(new StepFile::StepFileImporter()); out.push_back(new StepFile::StepFileImporter());
#endif #endif
} }

2
scripts/StepImporter/StepReaderGen.cpp.template
View File

@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */ /** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */
#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
#include "code/Importer/StepFile/StepReaderGen.h" #include "code/Importer/StepFile/StepReaderGen.h"