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

Rename and fix header

pull/5169/head
Alex 2023-07-03 12:05:37 +00:00
parent 16c0b9e880
commit 2c323ab406
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/Common/SceneCombiner.cpp
View File

@ -250,8 +250,8 @@ void SceneCombiner::AttachToGraph(aiScene *master, std::vector<NodeAttachmentInf
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<AttachmentInfo> &srcList, unsigned int flags) { void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master_raw, std::vector<AttachmentInfo> &srcList, unsigned int flags) {
std::unique_ptr<aiScene> masterAutoPtr(master); std::unique_ptr<aiScene> master(master_raw);
if (nullptr == _dest) { if (nullptr == _dest) {
return; return;
} }
@ -259,9 +259,9 @@ void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<At
// 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); SceneCombiner::CopySceneFlat(_dest, master.get());
} else } else
*_dest = masterAutoPtr.release(); *_dest = master.release();
return; return;
} }
if (*_dest) { if (*_dest) {
@ -273,7 +273,7 @@ void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<At
aiScene *dest = *_dest; aiScene *dest = *_dest;
std::vector<SceneHelper> src(srcList.size() + 1); std::vector<SceneHelper> src(srcList.size() + 1);
src[0].scene = masterAutoPtr.release(); src[0].scene = master.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);
} }
@ -609,7 +609,7 @@ void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<At
} }
// Now build the output graph // Now build the output graph
AttachToGraph(master, nodes); AttachToGraph(master.get(), 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

2
include/assimp/SceneCombiner.h
View File

@ -223,7 +223,7 @@ public:
* deletes the input scenes afterwards. There may be duplicate scenes. * deletes the input scenes afterwards. There may be duplicate scenes.
* @param flags Combination of the AI_INT_MERGE_SCENE flags defined above * @param flags Combination of the AI_INT_MERGE_SCENE flags defined above
*/ */
static void MergeScenes(aiScene **dest, std::unique_ptr<aiScene>& master, static void MergeScenes(aiScene **dest, aiScene *master,
std::vector<AttachmentInfo> &src, std::vector<AttachmentInfo> &src,
unsigned int flags = 0); unsigned int flags = 0);