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

Use unique_ptr to store pivot nodes until moved to mapPivot

pull/4977/head
Turo Lamminen 2023-02-24 13:44:40 +02:00
parent 3bdfecb0ed
commit 657c1d8ad0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/AssetLib/LWO/LWOLoader.cpp
View File

@ -574,9 +574,9 @@ void LWOImporter::GenerateNodeGraph(std::map<uint16_t, aiNode *> &apcNodes) {
uint16_t parentIndex = nodeLayer->mParent; uint16_t parentIndex = nodeLayer->mParent;
//Create pivot node, store it into the pivot map, and set the parent as the pivot //Create pivot node, store it into the pivot map, and set the parent as the pivot
aiNode *pivotNode = new aiNode(); std::unique_ptr<aiNode> pivotNode(new aiNode());
pivotNode->mName.Set("Pivot-" + std::string(itapcNodes->second->mName.data)); pivotNode->mName.Set("Pivot-" + std::string(itapcNodes->second->mName.data));
itapcNodes->second->mParent = pivotNode; itapcNodes->second->mParent = pivotNode.get();
//Look for the parent node to attach the pivot to //Look for the parent node to attach the pivot to
if (apcNodes.find(parentIndex) != apcNodes.end()) { if (apcNodes.find(parentIndex) != apcNodes.end()) {
@ -593,7 +593,7 @@ void LWOImporter::GenerateNodeGraph(std::map<uint16_t, aiNode *> &apcNodes) {
pivotNode->mTransformation.a4 = nodeLayer->mPivot.x; pivotNode->mTransformation.a4 = nodeLayer->mPivot.x;
pivotNode->mTransformation.b4 = nodeLayer->mPivot.y; pivotNode->mTransformation.b4 = nodeLayer->mPivot.y;
pivotNode->mTransformation.c4 = nodeLayer->mPivot.z; pivotNode->mTransformation.c4 = nodeLayer->mPivot.z;
mapPivot[-(itapcNodes->first + 2)] = pivotNode; mapPivot[-(itapcNodes->first + 2)] = pivotNode.release();
} }
//Merge pivot map into node map //Merge pivot map into node map