diff --git a/test/models/NFF/NFF/ManyEarthsNotJustOne.nff b/test/models/NFF/ManyEarthsNotJustOne.nff similarity index 100% rename from test/models/NFF/NFF/ManyEarthsNotJustOne.nff rename to test/models/NFF/ManyEarthsNotJustOne.nff diff --git a/test/models/NFF/NFF/WithCamera.nff b/test/models/NFF/WithCamera.nff similarity index 100% rename from test/models/NFF/NFF/WithCamera.nff rename to test/models/NFF/WithCamera.nff diff --git a/test/models/NFF/NFF/cone.nff b/test/models/NFF/cone.nff similarity index 86% rename from test/models/NFF/NFF/cone.nff rename to test/models/NFF/cone.nff index 20d02b259..f6f063ae4 100644 --- a/test/models/NFF/NFF/cone.nff +++ b/test/models/NFF/cone.nff @@ -1,6 +1,6 @@ #red -f 1.0 0.0 0.0 0.5 45.2776 0 1 cantfindme.png +f 1.0 0.0 0.0 0.5 0.5 45.2776 0 1 cantfindme.png tess 4 diff --git a/test/models/NFF/NFF/cylinder.nff b/test/models/NFF/cylinder.nff similarity index 100% rename from test/models/NFF/NFF/cylinder.nff rename to test/models/NFF/cylinder.nff diff --git a/test/models/NFF/NFF/dodecahedron.nff b/test/models/NFF/dodecahedron.nff similarity index 100% rename from test/models/NFF/NFF/dodecahedron.nff rename to test/models/NFF/dodecahedron.nff diff --git a/test/models/NFF/NFF/earthCylindric.jpg b/test/models/NFF/earthCylindric.jpg similarity index 100% rename from test/models/NFF/NFF/earthCylindric.jpg rename to test/models/NFF/earthCylindric.jpg diff --git a/test/models/NFF/NFF/earthSpherical.jpg b/test/models/NFF/earthSpherical.jpg similarity index 100% rename from test/models/NFF/NFF/earthSpherical.jpg rename to test/models/NFF/earthSpherical.jpg diff --git a/test/models/NFF/NFF/hexahedron.nff b/test/models/NFF/hexahedron.nff similarity index 100% rename from test/models/NFF/NFF/hexahedron.nff rename to test/models/NFF/hexahedron.nff diff --git a/test/models/NFF/NFF/octahedron.nff b/test/models/NFF/octahedron.nff similarity index 100% rename from test/models/NFF/NFF/octahedron.nff rename to test/models/NFF/octahedron.nff diff --git a/test/models/NFF/NFF/positionTest.nff b/test/models/NFF/positionTest.nff similarity index 100% rename from test/models/NFF/NFF/positionTest.nff rename to test/models/NFF/positionTest.nff diff --git a/test/models/NFF/ref/README.md b/test/models/NFF/ref/README.md new file mode 100644 index 000000000..6afdc55f4 --- /dev/null +++ b/test/models/NFF/ref/README.md @@ -0,0 +1,4 @@ +# NFF 3D model reference images + +## cone.nff +![cone.nff](screenshots/cone_nff.png) diff --git a/test/models/NFF/ref/screenshots/cone_nff.png b/test/models/NFF/ref/screenshots/cone_nff.png new file mode 100644 index 000000000..f5aff6745 Binary files /dev/null and b/test/models/NFF/ref/screenshots/cone_nff.png differ diff --git a/test/models/NFF/NFF/spheres.nff b/test/models/NFF/spheres.nff similarity index 100% rename from test/models/NFF/NFF/spheres.nff rename to test/models/NFF/spheres.nff diff --git a/test/models/NFF/NFF/tetrahedron.nff b/test/models/NFF/tetrahedron.nff similarity index 100% rename from test/models/NFF/NFF/tetrahedron.nff rename to test/models/NFF/tetrahedron.nff diff --git a/test/unit/ImportExport/utNFFImportExport.cpp b/test/unit/ImportExport/utNFFImportExport.cpp index b989578f5..7f416e97a 100644 --- a/test/unit/ImportExport/utNFFImportExport.cpp +++ b/test/unit/ImportExport/utNFFImportExport.cpp @@ -50,7 +50,7 @@ class utNFFImportExport : public AbstractImportExportBase { public: virtual bool importerTest() { Assimp::Importer importer; - const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/NFF/NFF/ManyEarthsNotJustOne.nff", 0); + const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/NFF/ManyEarthsNotJustOne.nff", 0); return nullptr != scene; } };