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

Merge branch 'master' into blender_fbx_opacity_fix

pull/1820/head
Kim Kulling 2018-03-09 08:30:23 +01:00 committed by GitHub
parent 9f02c8a97c e93d14a2e9
commit 56f9069eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/PlyLoader.cpp
View File

@ -245,28 +245,7 @@ void PLYImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOSy
// list is containing a list of points // list is containing a list of points
bool pointsOnly = mGeneratedMesh->mFaces == NULL ? true : false; bool pointsOnly = mGeneratedMesh->mFaces == NULL ? true : false;
if (pointsOnly) { if (pointsOnly) {
if (mGeneratedMesh->mNumVertices < 3) { mGeneratedMesh->mPrimitiveTypes = aiPrimitiveType::aiPrimitiveType_POINT;
if (mGeneratedMesh != NULL) {
delete(mGeneratedMesh);
mGeneratedMesh = nullptr;
}
streamedBuffer.close();
throw DeadlyImportError("Invalid .ply file: Not enough "
"vertices to build a proper face list. ");
}
const unsigned int iNum = (unsigned int)mGeneratedMesh->mNumVertices / 3;
mGeneratedMesh->mNumFaces = iNum;
mGeneratedMesh->mFaces = new aiFace[mGeneratedMesh->mNumFaces];
for (unsigned int i = 0; i < iNum; ++i) {
mGeneratedMesh->mFaces[i].mNumIndices = 3;
mGeneratedMesh->mFaces[i].mIndices = new unsigned int[3];
mGeneratedMesh->mFaces[i].mIndices[0] = (i * 3);
mGeneratedMesh->mFaces[i].mIndices[1] = (i * 3) + 1;
mGeneratedMesh->mFaces[i].mIndices[2] = (i * 3) + 2;
}
} }
// now load a list of all materials // now load a list of all materials

36
test/models/PLY/issue623.ply 100644
View File

@ -0,0 +1,36 @@
ply
format ascii 1.0
comment Created by Blender 2.77 (sub 0) - www.blender.org, source file: ''
element vertex 24
property float x
property float y
property float z
property float nx
property float ny
property float nz
property list uchar uint vertex_indices
end_header
7.941797 1.432409 -0.927566 0.000000 0.000000 -1.000000
7.941797 -2.321273 -0.927566 0.000000 0.000000 -1.000000
4.188114 -2.321273 -0.927566 0.000000 0.000000 -1.000000
4.188115 1.432410 -0.927566 0.000000 0.000000 -1.000000
7.941798 1.432408 2.826117 0.000000 -0.000000 1.000000
4.188114 1.432409 2.826117 0.000000 -0.000000 1.000000
4.188113 -2.321273 2.826117 0.000000 -0.000000 1.000000
7.941795 -2.321275 2.826117 0.000000 -0.000000 1.000000
7.941797 1.432409 -0.927566 1.000000 -0.000000 0.000000
7.941798 1.432408 2.826117 1.000000 -0.000000 0.000000
7.941795 -2.321275 2.826117 1.000000 -0.000000 0.000000
7.941797 -2.321273 -0.927566 1.000000 -0.000000 0.000000
7.941797 -2.321273 -0.927566 -0.000000 -1.000000 -0.000000
7.941795 -2.321275 2.826117 -0.000000 -1.000000 -0.000000
4.188113 -2.321273 2.826117 -0.000000 -1.000000 -0.000000
4.188114 -2.321273 -0.927566 -0.000000 -1.000000 -0.000000
4.188114 -2.321273 -0.927566 -1.000000 0.000000 -0.000000
4.188113 -2.321273 2.826117 -1.000000 0.000000 -0.000000
4.188114 1.432409 2.826117 -1.000000 0.000000 -0.000000
4.188115 1.432410 -0.927566 -1.000000 0.000000 -0.000000
7.941798 1.432408 2.826117 0.000000 1.000000 0.000000
7.941797 1.432409 -0.927566 0.000000 1.000000 0.000000
4.188115 1.432410 -0.927566 0.000000 1.000000 0.000000
4.188114 1.432409 2.826117 0.000000 1.000000 0.000000

21
test/unit/utPLYImportExport.cpp
View File

@ -97,6 +97,8 @@ TEST_F(utPLYImportExport, importerMultipleTest) {
scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", aiProcess_ValidateDataStructure); scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", aiProcess_ValidateDataStructure);
EXPECT_NE(nullptr, scene); EXPECT_NE(nullptr, scene);
EXPECT_NE(nullptr, scene->mMeshes[0]);
EXPECT_EQ(6u, scene->mMeshes[0]->mNumFaces);
} }
TEST_F(utPLYImportExport, importPLYwithUV) { TEST_F(utPLYImportExport, importPLYwithUV) {
@ -113,7 +115,7 @@ TEST_F(utPLYImportExport, importPLYwithUV) {
TEST_F(utPLYImportExport, importBinaryPLY) { TEST_F(utPLYImportExport, importBinaryPLY) {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube_binary.ply", 0); const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube_binary.ply", aiProcess_ValidateDataStructure);
EXPECT_NE(nullptr, scene); EXPECT_NE(nullptr, scene);
EXPECT_NE(nullptr, scene->mMeshes[0]); EXPECT_NE(nullptr, scene->mMeshes[0]);
@ -136,6 +138,20 @@ TEST_F( utPLYImportExport, vertexColorTest ) {
EXPECT_EQ(2, first_face.mIndices[2]); EXPECT_EQ(2, first_face.mIndices[2]);
} }
//Test issue #623, PLY importer should not automatically create faces
TEST_F(utPLYImportExport, pointcloudTest) {
Assimp::Importer importer;
//Could not use aiProcess_ValidateDataStructure since it's missing faces.
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/issue623.ply", 0);
EXPECT_NE(nullptr, scene);
EXPECT_EQ(1u, scene->mNumMeshes);
EXPECT_NE(nullptr, scene->mMeshes[0]);
EXPECT_EQ(24u, scene->mMeshes[0]->mNumVertices);
EXPECT_EQ(aiPrimitiveType::aiPrimitiveType_POINT, scene->mMeshes[0]->mPrimitiveTypes);
EXPECT_EQ(0u, scene->mMeshes[0]->mNumFaces);
}
static const char *test_file = static const char *test_file =
"ply\n" "ply\n"
"format ascii 1.0\n" "format ascii 1.0\n"
@ -157,6 +173,7 @@ static const char *test_file =
TEST_F( utPLYImportExport, parseErrorTest ) { TEST_F( utPLYImportExport, parseErrorTest ) {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFileFromMemory( test_file, strlen( test_file ), aiProcess_ValidateDataStructure); //Could not use aiProcess_ValidateDataStructure since it's missing faces.
const aiScene *scene = importer.ReadFileFromMemory( test_file, strlen( test_file ), 0);
EXPECT_NE( nullptr, scene ); EXPECT_NE( nullptr, scene );
} }