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

Fix #1415 : float-color.ply is broken 

float-color.ply was broken because it doesn't have a newline at the end.
I'm not sure if a file without newline should be considered valid ?

Added more checks to float-color unit-test in order to fail as excepted.
Fixed the shipped unit test.
Add postprocess validation to PLY unit tests
pull/1825/head
Alexandre Avenel 2018-03-04 12:52:38 +01:00
parent 4697152e71
commit 065c264b34
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/models/PLY/float-color.ply
View File

@ -15,4 +15,4 @@ end_header
0.0 0.0 0.0 0 0 1 1 0.0 0.0 0.0 0 0 1 1
100.0 0.0 0.0 0 0 1 1 100.0 0.0 0.0 0 0 1 1
200.0 200.0 0.0 0 0 1 1 200.0 200.0 0.0 0 0 1 1
3 0 1 2 3 0 1 2

22
test/unit/utPLYImportExport.cpp
View File

@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/Exporter.hpp> #include <assimp/Exporter.hpp>
#include <assimp/scene.h> #include <assimp/scene.h>
#include "AbstractImportExportBase.h" #include "AbstractImportExportBase.h"
#include <assimp/postprocess.h>
using namespace ::Assimp; using namespace ::Assimp;
@ -52,7 +53,7 @@ class utPLYImportExport : public AbstractImportExportBase {
public: public:
virtual bool importerTest() { virtual bool importerTest() {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", 0 ); const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", aiProcess_ValidateDataStructure);
EXPECT_EQ( 1u, scene->mNumMeshes ); EXPECT_EQ( 1u, scene->mNumMeshes );
EXPECT_NE( nullptr, scene->mMeshes[0] ); EXPECT_NE( nullptr, scene->mMeshes[0] );
EXPECT_EQ( 8u, scene->mMeshes[0]->mNumVertices ); EXPECT_EQ( 8u, scene->mMeshes[0]->mNumVertices );
@ -65,7 +66,7 @@ public:
virtual bool exporterTest() { virtual bool exporterTest() {
Importer importer; Importer importer;
Exporter exporter; Exporter exporter;
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", 0); const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", aiProcess_ValidateDataStructure);
EXPECT_NE(nullptr, scene); EXPECT_NE(nullptr, scene);
EXPECT_EQ(aiReturn_SUCCESS, exporter.Export(scene, "ply", ASSIMP_TEST_MODELS_DIR "/PLY/cube_test.ply")); EXPECT_EQ(aiReturn_SUCCESS, exporter.Export(scene, "ply", ASSIMP_TEST_MODELS_DIR "/PLY/cube_test.ply"));
@ -89,19 +90,28 @@ TEST_F(utPLYImportExport, exportTest_Success ) {
//Test issue 1623, crash when loading two PLY files in a row //Test issue 1623, crash when loading two PLY files in a row
TEST_F(utPLYImportExport, importerMultipleTest) { TEST_F(utPLYImportExport, importerMultipleTest) {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", 0); const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", aiProcess_ValidateDataStructure);
EXPECT_NE(nullptr, scene); EXPECT_NE(nullptr, scene);
scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", 0); scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", aiProcess_ValidateDataStructure);
EXPECT_NE(nullptr, scene); EXPECT_NE(nullptr, scene);
} }
TEST_F( utPLYImportExport, vertexColorTest ) { TEST_F( utPLYImportExport, vertexColorTest ) {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/PLY/float-color.ply", 0 ); const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/PLY/float-color.ply", aiProcess_ValidateDataStructure);
EXPECT_NE( nullptr, scene ); EXPECT_NE( nullptr, scene );
EXPECT_EQ(1u, scene->mMeshes[0]->mNumFaces);
EXPECT_EQ(aiPrimitiveType_TRIANGLE, scene->mMeshes[0]->mPrimitiveTypes);
EXPECT_EQ(true, scene->mMeshes[0]->HasVertexColors(0));
auto first_face = scene->mMeshes[0]->mFaces[0];
EXPECT_EQ(3, first_face.mNumIndices);
EXPECT_EQ(0, first_face.mIndices[0]);
EXPECT_EQ(1, first_face.mIndices[1]);
EXPECT_EQ(2, first_face.mIndices[2]);
} }
static const char *test_file = static const char *test_file =
@ -125,6 +135,6 @@ 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 ), 0 ); const aiScene *scene = importer.ReadFileFromMemory( test_file, strlen( test_file ), aiProcess_ValidateDataStructure);
EXPECT_NE( nullptr, scene ); EXPECT_NE( nullptr, scene );
} }