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

BUGFIX : Fix incorrect INSTALL target. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@558 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2010-02-27 14:04:14 +00:00
parent e8675dba75
commit 78f27eef13
2 changed files with 88 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
code/CMakeLists.txt
View File

@ -1,4 +1,4 @@
SET( HEADER_PATH ../include/ ) SET( HEADER_PATH ../include )
SET( COMPILER_HEADERS SET( COMPILER_HEADERS
${HEADER_PATH}/Compiler/pushpack1.h ${HEADER_PATH}/Compiler/pushpack1.h
@ -6,41 +6,70 @@ SET( COMPILER_HEADERS
) )
SET( PUBLIC_HEADERS SET( PUBLIC_HEADERS
aiAnim.h ${HEADER_PATH}/aiAnim.h
aiAssert.h ${HEADER_PATH}/aiAssert.h
aiCamera.h ${HEADER_PATH}/aiCamera.h
aiColor4D.h ${HEADER_PATH}/aiColor4D.h
aiColor4D.inl ${HEADER_PATH}/aiColor4D.inl
aiConfig.h ${HEADER_PATH}/aiConfig.h
aiDefines.h ${HEADER_PATH}/aiDefines.h
aiFileIO.h ${HEADER_PATH}/aiFileIO.h
aiLight.h ${HEADER_PATH}/aiLight.h
aiMaterial.h ${HEADER_PATH}/aiMaterial.h
aiMaterial.inl ${HEADER_PATH}/aiMaterial.inl
aiMatrix3x3.h ${HEADER_PATH}/aiMatrix3x3.h
aiMatrix3x3.inl ${HEADER_PATH}/aiMatrix3x3.inl
aiMatrix4x4.h ${HEADER_PATH}/aiMatrix4x4.h
aiMatrix4x4.inl ${HEADER_PATH}/aiMatrix4x4.inl
aiMesh.h ${HEADER_PATH}/aiMesh.h
aiPostProcess.h ${HEADER_PATH}/aiPostProcess.h
aiQuaternion.h ${HEADER_PATH}/aiQuaternion.h
aiScene.h ${HEADER_PATH}/aiScene.h
aiTexture.h ${HEADER_PATH}/aiTexture.h
aiTypes.h ${HEADER_PATH}/aiTypes.h
aiVector2D.h ${HEADER_PATH}/aiVector2D.h
aiVector3D.h ${HEADER_PATH}/aiVector3D.h
aiVector3D.inl ${HEADER_PATH}/aiVector3D.inl
aiVersion.h ${HEADER_PATH}/aiVersion.h
assimp.h ${HEADER_PATH}/assimp.h
assimp.hpp ${HEADER_PATH}/assimp.hpp
BoostWorkaround ${HEADER_PATH}/DefaultLogger.h
Compiler ${HEADER_PATH}/IOStream.h
DefaultLogger.h ${HEADER_PATH}/IOSystem.h
IOStream.h ${HEADER_PATH}/Logger.h
IOSystem.h ${HEADER_PATH}/LogStream.h
Logger.h ${HEADER_PATH}/NullLogger.h
LogStream.h ${HEADER_PATH}/Compiler/pushpack1.h
NullLogger.h ${HEADER_PATH}/Compiler/poppack1.h
${HEADER_PATH}/BoostWorkaround/boost/common_factor_rt.hpp
${HEADER_PATH}/BoostWorkaround/boost/foreach.hpp
${HEADER_PATH}/BoostWorkaround/boost/format.hpp
${HEADER_PATH}/BoostWorkaround/boost/random/mersenne_twister.hpp
${HEADER_PATH}/BoostWorkaround/boost/random/uniform_int.hpp
${HEADER_PATH}/BoostWorkaround/boost/random/variate_generator.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_array.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_ptr.hpp
${HEADER_PATH}/BoostWorkaround/boost/static_assert.hpp
${HEADER_PATH}/BoostWorkaround/boost/tuple/tuple.hpp
)
SOURCE_GROUP( Compiler FILES
${HEADER_PATH}/Compiler/pushpack1.h
${HEADER_PATH}/Compiler/poppack1.h
)
SOURCE_GROUP( Boost FILES
${HEADER_PATH}/BoostWorkaround/boost/common_factor_rt.hpp
${HEADER_PATH}/BoostWorkaround/boost/foreach.hpp
${HEADER_PATH}/BoostWorkaround/boost/format.hpp
${HEADER_PATH}/BoostWorkaround/boost/random
${HEADER_PATH}/BoostWorkaround/boost/random/mersenne_twister.hpp
${HEADER_PATH}/BoostWorkaround/boost/random/uniform_int.hpp
${HEADER_PATH}/BoostWorkaround/boost/random/variate_generator.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_array.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_ptr.hpp
${HEADER_PATH}/BoostWorkaround/boost/static_assert.hpp
${HEADER_PATH}/BoostWorkaround/boost/tuple/tuple.hpp
) )
SOURCE_GROUP( Logging FILES SOURCE_GROUP( Logging FILES
@ -308,11 +337,12 @@ SOURCE_GROUP( Q3D FILES
Q3DLoader.cpp Q3DLoader.cpp
Q3DLoader.h Q3DLoader.h
) )
#SOURCE_GROUP( Q3BSP FILES #SOURCE_GROUP( Q3BSP FILES
# Q3BSPFileParser.h #Q3BSPFileParser.h
# Q3BSPFileParser.cpp #Q3BSPFileParser.cpp
# Q3BSPFileImporter.h #Q3BSPFileImporter.h
# Q3BSPFileImporter.cpp #Q3BSPFileImporter.cpp
#) #)
SOURCE_GROUP( Raw FILES SOURCE_GROUP( Raw FILES
@ -415,6 +445,19 @@ ADD_LIBRARY( assimp SHARED
${HEADER_PATH}/aiVector3D.h ${HEADER_PATH}/aiVector3D.h
${HEADER_PATH}/aiVersion.h ${HEADER_PATH}/aiVersion.h
${HEADER_PATH}/assimp.h ${HEADER_PATH}/assimp.h
${HEADER_PATH}/Compiler/pushpack1.h
${HEADER_PATH}/Compiler/poppack1.h
${HEADER_PATH}/BoostWorkaround/boost/common_factor_rt.hpp
${HEADER_PATH}/BoostWorkaround/boost/foreach.hpp
${HEADER_PATH}/BoostWorkaround/boost/format.hpp
${HEADER_PATH}/BoostWorkaround/boost/random
${HEADER_PATH}/BoostWorkaround/boost/random/mersenne_twister.hpp
${HEADER_PATH}/BoostWorkaround/boost/random/uniform_int.hpp
${HEADER_PATH}/BoostWorkaround/boost/random/variate_generator.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_array.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_ptr.hpp
${HEADER_PATH}/BoostWorkaround/boost/static_assert.hpp
${HEADER_PATH}/BoostWorkaround/boost/tuple/tuple.hpp
3DSConverter.cpp 3DSConverter.cpp
3DSHelper.h 3DSHelper.h
@ -550,10 +593,10 @@ ADD_LIBRARY( assimp SHARED
ProcessHelper.h ProcessHelper.h
Q3DLoader.cpp Q3DLoader.cpp
Q3DLoader.h Q3DLoader.h
#Q3BSPFileParser.h # Q3BSPFileParser.h
#Q3BSPFileParser.cpp # Q3BSPFileParser.cpp
#Q3BSPFileImporter.h # Q3BSPFileImporter.h
#Q3BSPFileImporter.cpp # Q3BSPFileImporter.cpp
RawLoader.cpp RawLoader.cpp
RawLoader.h RawLoader.h
RemoveComments.cpp RemoveComments.cpp

1
code/ObjFileParser.cpp
View File

@ -390,6 +390,7 @@ void ObjFileParser::getMaterialDesc()
{ {
// Found, using detected material // Found, using detected material
m_pModel->m_pCurrentMaterial = (*it).second; m_pModel->m_pCurrentMaterial = (*it).second;
m_pModel->m_pCurrentMesh->m_uiMaterialIndex = getMaterialIndex( strName );
} }
// Skip rest of line // Skip rest of line