Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved mesh model (DAE) loader compatibility

Browse Source 
Added dynamic SID joint resolution for skinning (adds compatibility for DAE files made using MAXON Cinema 4D)
This commit is contained in:
Tarocco
2020-09-06 20:51:14 -07:00
parent f941bc4334
commit 386528a892
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llprimitive/lldaeloader.cpp
View File

@@ -1266,6 +1266,8 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
skin_info.mBindShapeMatrix = trans; skin_info.mBindShapeMatrix = trans;
} }
// Build the joint to node mapping array and update joint aliases (mJointMap)
buildJointToNodeMappingFromScene(root);
//Some collada setup for accessing the skeleton //Some collada setup for accessing the skeleton
U32 skeleton_count = dae->getDatabase()->getElementCount( NULL, "skeleton" ); U32 skeleton_count = dae->getDatabase()->getElementCount( NULL, "skeleton" );
@@ -1491,8 +1493,7 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
//Now that we've parsed the joint array, let's determine if we have a full rig //Now that we've parsed the joint array, let's determine if we have a full rig
//(which means we have all the joint sthat are required for an avatar versus //(which means we have all the joint sthat are required for an avatar versus
//a skinned asset attached to a node in a file that contains an entire skeleton, //a skinned asset attached to a node in a file that contains an entire skeleton,
//but does not use the skeleton). //but does not use the skeleton).
buildJointToNodeMappingFromScene( root );
critiqueRigForUploadApplicability( model->mSkinInfo.mJointNames ); critiqueRigForUploadApplicability( model->mSkinInfo.mJointNames );
if ( !missingSkeletonOrScene ) if ( !missingSkeletonOrScene )
@@ -1729,6 +1730,8 @@ void LLDAELoader::processJointToNodeMapping( domNode* pNode )
if (!nodeName.empty()) if (!nodeName.empty())
{ {
mJointsFromNode.push_front(pNode->getName()); mJointsFromNode.push_front(pNode->getName());
// Alias joint node SIDs to joint names for compatibility
mJointMap[pNode->getSid()] = mJointMap[pNode->getName()];
} }
//2. Handle the kiddo's //2. Handle the kiddo's
processChildJoints(pNode); processChildJoints(pNode);