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

Fix public API

pull/5169/head
Alex 2023-07-03 11:50:08 +00:00
parent ca781a5860
commit 16c0b9e880
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/Irr/IRRLoader.cpp
View File

@ -1328,7 +1328,7 @@ void IRRImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
// Now merge all sub scenes and attach them to the correct // Now merge all sub scenes and attach them to the correct
// attachment points in the scenegraph. // attachment points in the scenegraph.
SceneCombiner::MergeScenes(&pScene, tempScene, attach, SceneCombiner::MergeScenes(&pScene, tempScene.release(), attach,
AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES | (!configSpeedFlag ? (AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES_IF_NECESSARY | AI_INT_MERGE_SCENE_GEN_UNIQUE_MATNAMES) : AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES | (!configSpeedFlag ? (AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES_IF_NECESSARY | AI_INT_MERGE_SCENE_GEN_UNIQUE_MATNAMES) :
0)); 0));

2
code/AssetLib/LWS/LWSLoader.cpp
View File

@ -906,7 +906,7 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
flipper.Execute(master.get()); flipper.Execute(master.get());
// OK ... finally build the output graph // OK ... finally build the output graph
SceneCombiner::MergeScenes(&pScene, master, attach, SceneCombiner::MergeScenes(&pScene, master.release(), attach,
AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES | (!configSpeedFlag ? ( AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES | (!configSpeedFlag ? (
AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES_IF_NECESSARY | AI_INT_MERGE_SCENE_GEN_UNIQUE_MATNAMES) : AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES_IF_NECESSARY | AI_INT_MERGE_SCENE_GEN_UNIQUE_MATNAMES) :
0)); 0));

2
code/AssetLib/MD3/MD3Loader.cpp
View File

@ -617,7 +617,7 @@ bool MD3Importer::ReadMultipartFile() {
scene_upper->mRootNode->mTransformation = aiMatrix4x4(); scene_upper->mRootNode->mTransformation = aiMatrix4x4();
// and merge the scenes // and merge the scenes
SceneCombiner::MergeScenes(&mScene, master, attach, SceneCombiner::MergeScenes(&mScene, master.release(), attach,
AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES | AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES |
AI_INT_MERGE_SCENE_GEN_UNIQUE_MATNAMES | AI_INT_MERGE_SCENE_GEN_UNIQUE_MATNAMES |
AI_INT_MERGE_SCENE_RESOLVE_CROSS_ATTACHMENTS | AI_INT_MERGE_SCENE_RESOLVE_CROSS_ATTACHMENTS |

13
code/Common/SceneCombiner.cpp
View File

@ -200,7 +200,7 @@ void SceneCombiner::MergeScenes(aiScene **_dest, std::vector<aiScene *> &src, un
} }
// 'master' will be deleted afterwards // 'master' will be deleted afterwards
MergeScenes(_dest, master, srcList, flags); MergeScenes(_dest, master.release(), srcList, flags);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -250,7 +250,8 @@ void SceneCombiner::AttachToGraph(aiScene *master, std::vector<NodeAttachmentInf
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void SceneCombiner::MergeScenes(aiScene **_dest, std::unique_ptr<aiScene>& master, std::vector<AttachmentInfo> &srcList, unsigned int flags) { void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<AttachmentInfo> &srcList, unsigned int flags) {
std::unique_ptr<aiScene> masterAutoPtr(master);
if (nullptr == _dest) { if (nullptr == _dest) {
return; return;
} }
@ -258,9 +259,9 @@ void SceneCombiner::MergeScenes(aiScene **_dest, std::unique_ptr<aiScene>& maste
// if _dest points to nullptr allocate a new scene. Otherwise clear the old and reuse it // if _dest points to nullptr allocate a new scene. Otherwise clear the old and reuse it
if (srcList.empty()) { if (srcList.empty()) {
if (*_dest) { if (*_dest) {
SceneCombiner::CopySceneFlat(_dest, master.get()); SceneCombiner::CopySceneFlat(_dest, master);
} else } else
*_dest = master.release(); *_dest = masterAutoPtr.release();
return; return;
} }
if (*_dest) { if (*_dest) {
@ -272,7 +273,7 @@ void SceneCombiner::MergeScenes(aiScene **_dest, std::unique_ptr<aiScene>& maste
aiScene *dest = *_dest; aiScene *dest = *_dest;
std::vector<SceneHelper> src(srcList.size() + 1); std::vector<SceneHelper> src(srcList.size() + 1);
src[0].scene = master.release(); src[0].scene = masterAutoPtr.release();
for (unsigned int i = 0; i < srcList.size(); ++i) { for (unsigned int i = 0; i < srcList.size(); ++i) {
src[i + 1] = SceneHelper(srcList[i].scene); src[i + 1] = SceneHelper(srcList[i].scene);
} }
@ -608,7 +609,7 @@ void SceneCombiner::MergeScenes(aiScene **_dest, std::unique_ptr<aiScene>& maste
} }
// Now build the output graph // Now build the output graph
AttachToGraph(master.get(), nodes); AttachToGraph(master, nodes);
dest->mRootNode = master->mRootNode; dest->mRootNode = master->mRootNode;
// Check whether we succeeded at building the output graph // Check whether we succeeded at building the output graph