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

X: fix out of bound access.

pull/2254/head
Kim Kulling 2019-06-15 19:17:15 +02:00
parent eb27fb753d
commit ced080f9f3
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/X/XFileImporter.cpp
View File

@ -332,7 +332,7 @@ void XFileImporter::CreateMeshes( aiScene* pScene, aiNode* pNode, const std::vec
// collect vertex data for indices of this face // collect vertex data for indices of this face
for( unsigned int d = 0; d < df.mNumIndices; ++d ) { for( unsigned int d = 0; d < df.mNumIndices; ++d ) {
df.mIndices[d] = newIndex; df.mIndices[ d ] = newIndex;
const unsigned int newIdx( pf.mIndices[ d ] ); const unsigned int newIdx( pf.mIndices[ d ] );
if ( newIdx > sourceMesh->mPositions.size() ) { if ( newIdx > sourceMesh->mPositions.size() ) {
continue; continue;
@ -344,7 +344,10 @@ void XFileImporter::CreateMeshes( aiScene* pScene, aiNode* pNode, const std::vec
mesh->mVertices[newIndex] = sourceMesh->mPositions[pf.mIndices[d]]; mesh->mVertices[newIndex] = sourceMesh->mPositions[pf.mIndices[d]];
// Normal, if present // Normal, if present
if ( mesh->HasNormals() ) { if ( mesh->HasNormals() ) {
mesh->mNormals[ newIndex ] = sourceMesh->mNormals[ sourceMesh->mNormFaces[ f ].mIndices[ d ] ]; if ( sourceMesh->mNormFaces[ f ].mIndices.size() > d ) {
const size_t idx( sourceMesh->mNormFaces[ f ].mIndices[ d ] );
mesh->mNormals[ newIndex ] = sourceMesh->mNormals[ idx ];
}
} }
// texture coord sets // texture coord sets

6
code/X/XFileImporter.h
View File

@ -58,13 +58,13 @@ struct aiNode;
namespace Assimp { namespace Assimp {
namespace XFile { namespace XFile {
struct Scene; struct Scene;
struct Node; struct Node;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** The XFileImporter is a worker class capable of importing a scene from a /** The XFileImporter is a worker class capable of importing a scene from a
* DirectX file .x * DirectX file .x
*/ */
class XFileImporter : public BaseImporter { class XFileImporter : public BaseImporter {
public: public:

2
test/models/PLY/cube_test.ply
View File

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

6
test/unit/utBlendImportMaterials.cpp
View File

@ -133,10 +133,10 @@ TEST_F(BlendImportMaterials, testImportMaterialwith2texturesAnd2TexCoordMappings
// material has 2 diffuse textures // material has 2 diffuse textures
ASSERT_TRUE(pTest->HasMaterials()); ASSERT_TRUE(pTest->HasMaterials());
EXPECT_EQ(1, pTest->mNumMaterials); EXPECT_EQ(1u, pTest->mNumMaterials);
const aiMaterial *pMat = pTest->mMaterials[0]; const aiMaterial *pMat = pTest->mMaterials[0];
ASSERT_TRUE(nullptr != pMat); ASSERT_TRUE(nullptr != pMat);
ASSERT_EQ(2, pMat->GetTextureCount(aiTextureType_DIFFUSE)); ASSERT_EQ(2u, pMat->GetTextureCount(aiTextureType_DIFFUSE));
aiString aPath; aiString aPath;
aiTextureMapping tm = aiTextureMapping::aiTextureMapping_OTHER; aiTextureMapping tm = aiTextureMapping::aiTextureMapping_OTHER;
aiReturn result = pMat->GetTexture(aiTextureType_DIFFUSE, 0, &aPath, &tm); aiReturn result = pMat->GetTexture(aiTextureType_DIFFUSE, 0, &aPath, &tm);
@ -146,7 +146,7 @@ TEST_F(BlendImportMaterials, testImportMaterialwith2texturesAnd2TexCoordMappings
// mesh has 2 texturecoord sets // mesh has 2 texturecoord sets
ASSERT_TRUE(pTest->HasMeshes()); ASSERT_TRUE(pTest->HasMeshes());
EXPECT_EQ(1, pTest->mNumMeshes); EXPECT_EQ(1u, pTest->mNumMeshes);
const aiMesh *pMesh = pTest->mMeshes[0]; const aiMesh *pMesh = pTest->mMeshes[0];
ASSERT_TRUE(nullptr != pMesh); ASSERT_TRUE(nullptr != pMesh);
ASSERT_TRUE(pMesh->HasTextureCoords(0)); ASSERT_TRUE(pMesh->HasTextureCoords(0));