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

Merge pull request #1345 from jamesgk/master 

Use unique node names when loading Collada files
pull/1347/head^2
Kim Kulling 2017-07-15 11:08:59 +02:00 committed by GitHub
parent bd7fdfeeca 727cffdfb4
commit c9d18ebe1f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/ColladaLoader.cpp
View File

@ -1903,14 +1903,13 @@ const Collada::Node* ColladaLoader::FindNodeBySID( const Collada::Node* pNode, c
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Finds a proper name for a node derived from the collada-node's properties // Finds a proper unique name for a node derived from the collada-node's properties.
// The name must be unique for proper node-bone association.
std::string ColladaLoader::FindNameForNode( const Collada::Node* pNode) std::string ColladaLoader::FindNameForNode( const Collada::Node* pNode)
{ {
// now setup the name of the node. We take the name if not empty, otherwise the collada ID // Now setup the name of the assimp node. The collada name might not be
// FIX: Workaround for XSI calling the instanced visual scene 'untitled' by default. // unique, so we use the collada ID.
if (!pNode->mName.empty() && pNode->mName != "untitled") if (!pNode->mID.empty())
return pNode->mName;
else if (!pNode->mID.empty())
return pNode->mID; return pNode->mID;
else if (!pNode->mSID.empty()) else if (!pNode->mSID.empty())
return pNode->mSID; return pNode->mSID;