Skip to content

Improved mesh model (DAE) loader compatibility #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 1, 2020
Merged

Improved mesh model (DAE) loader compatibility #35

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
386528a
Improved mesh model (DAE) loader compatibility
tarocco Sep 7, 2020
9f9a21b
refactor: reuse local variable
tarocco Sep 25, 2020
f9c07b4
only use SID if it is not empty
tarocco Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions indra/llprimitive/lldaeloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,6 +1266,8 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
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
U32 skeleton_count = dae->getDatabase()->getElementCount( NULL, "skeleton" );
Expand Down Expand Up @@ -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
//(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,
//but does not use the skeleton).
buildJointToNodeMappingFromScene( root );
//but does not use the skeleton).
critiqueRigForUploadApplicability( model->mSkinInfo.mJointNames );

if ( !missingSkeletonOrScene )
Expand Down Expand Up @@ -1728,7 +1729,11 @@ void LLDAELoader::processJointToNodeMapping( domNode* pNode )
std::string nodeName = pNode->getName();
if (!nodeName.empty())
{
mJointsFromNode.push_front(pNode->getName());
mJointsFromNode.push_front(nodeName);
// Alias joint node SIDs to joint names for compatibility
std::string nodeSID = pNode->getSid();
if(!nodeSID.empty())
mJointMap[nodeSID] = mJointMap[nodeName];
}
//2. Handle the kiddo's
processChildJoints(pNode);
Expand Down