|
@@ -43,19 +43,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#include "AbstractImportExportBase.h"
|
|
#include "AbstractImportExportBase.h"
|
|
#include "UnitTestPCH.h"
|
|
#include "UnitTestPCH.h"
|
|
|
|
|
|
-#include <assimp/postprocess.h>
|
|
|
|
|
|
+#include <assimp/Importer.hpp>
|
|
#include <assimp/Exporter.hpp>
|
|
#include <assimp/Exporter.hpp>
|
|
|
|
+#include <assimp/postprocess.h>
|
|
#include <assimp/Importer.hpp>
|
|
#include <assimp/Importer.hpp>
|
|
|
|
|
|
using namespace Assimp;
|
|
using namespace Assimp;
|
|
|
|
|
|
class utM3DImportExport : public AbstractImportExportBase {
|
|
class utM3DImportExport : public AbstractImportExportBase {
|
|
public:
|
|
public:
|
|
- bool importerTest() override {
|
|
|
|
|
|
+ bool importerTest() override {
|
|
Assimp::Importer importer;
|
|
Assimp::Importer importer;
|
|
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure);
|
|
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure);
|
|
#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
|
|
#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
|
|
- return nullptr != scene;
|
|
|
|
|
|
+ return nullptr != scene;
|
|
#else
|
|
#else
|
|
return nullptr == scene;
|
|
return nullptr == scene;
|
|
#endif // ASSIMP_BUILD_NO_M3D_IMPORTER
|
|
#endif // ASSIMP_BUILD_NO_M3D_IMPORTER
|
|
@@ -63,11 +64,11 @@ public:
|
|
|
|
|
|
#ifndef ASSIMP_BUILD_NO_EXPORT
|
|
#ifndef ASSIMP_BUILD_NO_EXPORT
|
|
bool exporterTest() override {
|
|
bool exporterTest() override {
|
|
- Assimp::Importer importer;
|
|
|
|
- const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure);
|
|
|
|
- Exporter exporter;
|
|
|
|
- aiReturn ret = exporter.Export(scene, "m3d", ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals_out.m3d");
|
|
|
|
- return ret == AI_SUCCESS;
|
|
|
|
|
|
+ Assimp::Importer importer;
|
|
|
|
+ const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure);
|
|
|
|
+ Exporter exporter;
|
|
|
|
+ aiReturn ret = exporter.Export(scene, "m3d", ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals_out.m3d");
|
|
|
|
+ return ret == AI_SUCCESS;
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
};
|
|
};
|
|
@@ -78,6 +79,6 @@ TEST_F(utM3DImportExport, importM3DFromFileTest) {
|
|
|
|
|
|
#ifndef ASSIMP_BUILD_NO_EXPORT
|
|
#ifndef ASSIMP_BUILD_NO_EXPORT
|
|
TEST_F(utM3DImportExport, exportM3DFromFileTest) {
|
|
TEST_F(utM3DImportExport, exportM3DFromFileTest) {
|
|
- EXPECT_TRUE(exporterTest());
|
|
|
|
|
|
+ EXPECT_TRUE(exporterTest());
|
|
}
|
|
}
|
|
#endif // ASSIMP_BUILD_NO_EXPORT
|
|
#endif // ASSIMP_BUILD_NO_EXPORT
|