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

Ensure to delete the scene copy after the test

pull/3205/head
RichardTea 2020-05-05 10:53:26 +01:00
parent 56a4e61533
commit dc8550290e
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/unit/utColladaImportExport.cpp
View File

@ -53,6 +53,20 @@ using namespace Assimp;
class utColladaImportExport : public AbstractImportExportBase { class utColladaImportExport : public AbstractImportExportBase {
public: public:
// Clones the scene in an exception-safe way
struct SceneCloner {
SceneCloner(const aiScene *scene) {
sceneCopy = nullptr;
SceneCombiner::CopyScene(&sceneCopy, scene);
}
~SceneCloner() {
delete sceneCopy;
sceneCopy = nullptr;
}
aiScene *sceneCopy;
};
virtual bool importerTest() final { virtual bool importerTest() final {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/Collada/duck.dae", aiProcess_ValidateDataStructure); const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/Collada/duck.dae", aiProcess_ValidateDataStructure);
@ -231,12 +245,10 @@ TEST_F(utColladaImportExport, exportRootNodeMeshTest) {
ASSERT_EQ(0u, scene->mRootNode->mNumMeshes) << "Collada import should not give the root node a mesh"; ASSERT_EQ(0u, scene->mRootNode->mNumMeshes) << "Collada import should not give the root node a mesh";
{ {
// Clone the scene and give the root node a mesh and a transform SceneCloner clone(scene);
aiScene *rootMeshScene = nullptr; ASSERT_TRUE(clone.sceneCopy != nullptr) << "Fatal: could not copy scene!";
SceneCombiner::CopyScene(&rootMeshScene, scene);
ASSERT_TRUE(rootMeshScene != nullptr) << "Fatal: could not copy scene!";
// Do this by moving the meshes from the first child that has some // Do this by moving the meshes from the first child that has some
aiNode *rootNode = rootMeshScene->mRootNode; aiNode *rootNode = clone.sceneCopy->mRootNode;
ASSERT_TRUE(rootNode->mNumChildren > 0) << "Fatal: root has no children"; ASSERT_TRUE(rootNode->mNumChildren > 0) << "Fatal: root has no children";
aiNode *meshNode = rootNode->mChildren[0]; aiNode *meshNode = rootNode->mChildren[0];
ASSERT_EQ(1u, meshNode->mNumMeshes) << "Fatal: First child node has no duck mesh"; ASSERT_EQ(1u, meshNode->mNumMeshes) << "Fatal: First child node has no duck mesh";
@ -248,10 +260,12 @@ TEST_F(utColladaImportExport, exportRootNodeMeshTest) {
rootNode->mMeshes[i] = meshNode->mMeshes[i]; rootNode->mMeshes[i] = meshNode->mMeshes[i];
} }
// Remove the meshes from the original node
meshNode->mNumMeshes = 0; meshNode->mNumMeshes = 0;
delete[] meshNode->mMeshes; delete[] meshNode->mMeshes;
meshNode->mMeshes = nullptr;
ASSERT_EQ(AI_SUCCESS, exporter.Export(rootMeshScene, "collada", outFile)) << "Fatal: Could not export file"; ASSERT_EQ(AI_SUCCESS, exporter.Export(clone.sceneCopy, "collada", outFile)) << "Fatal: Could not export file";
} }
// Reimport and look for meshes // Reimport and look for meshes