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

- UPDATE : Use of correct indices in Q3BSP-loader

Browse Source 
- UPDATE : Add enum for primitive-description in Q3BSP-loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@790 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
kimmi
2010-08-07 15:10:27 +00:00
parent 4ad0d569f3
commit 8fef884dbc
5 changed files with 151 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/ObjFileImporter.cpp
View File

@@ -332,7 +332,7 @@ void ObjFileImporter::createVertexArray(const ObjFile::Model* pModel,
// Copy all index arrays
for ( size_t vertexIndex = 0; vertexIndex < pSourceFace->m_pVertices->size(); vertexIndex++ )
{
unsigned int vertex = pSourceFace->m_pVertices->at( vertexIndex );
const unsigned int vertex = pSourceFace->m_pVertices->at( vertexIndex );
ai_assert( vertex < pModel->m_Vertices.size() );
pMesh->mVertices[ newIndex ] = pModel->m_Vertices[ vertex ];
@@ -405,7 +405,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
pScene->mMaterials = new aiMaterial*[ numMaterials ];
for ( unsigned int matIndex = 0; matIndex < numMaterials; matIndex++ )
{
Assimp::MaterialHelper* mat = new Assimp::MaterialHelper();
Assimp::MaterialHelper* mat = new Assimp::MaterialHelper;
// Store material name
std::map<std::string, ObjFile::Material*>::const_iterator it;