livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-133 WIP, SL-134 WIP - more handling for out-of-range joints

meow-7.2.2
Brad Payne (Vir Linden) 2015-08-31 13:06:42 -04:00
parent fa7d639f8a
commit 98166af9c7
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llvovolume.cpp
View File

@ -4174,6 +4174,8 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
LLJoint* joint = avatar->getJoint(skin->mJointNames[j]);
if (!joint)
{
// Fall back to a point inside the avatar if mesh is
// rigged to an unknown joint.
joint = avatar->getJoint("mPelvis");
}
if (joint)
@ -4181,6 +4183,12 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
mat[j] = skin->mInvBindMatrix[j];
mat[j] *= joint->getWorldMatrix();
}
else
{
// This shouldn't be possible unless the avatar skeleton
// is corrupt.
llassert(false);
}
}
for (S32 i = 0; i < volume->getNumVolumeFaces(); ++i)
@ -4220,8 +4228,21 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
wght[k] = w - floorf(w);
scale += wght[k];
}
wght *= 1.f/scale;
if (scale > 0.f)
{
wght *= 1.f / scale;
}
else
{
// Complete weighting fail - all zeroes. Just
// pick some values that add up to 1.0 so we
// don't wind up with garbage vertices
// pointing off at (0,0,0)
wght[0] = 1.f;
wght[1] = 0.f;
wght[2] = 0.f;
wght[3] = 0.f;
}
for (U32 k = 0; k < 4; k++)
{
@ -4229,9 +4250,8 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
LLMatrix4a src;
// Insure ref'd bone is in our clamped array of mats
llassert(idx[k] < kMaxJoints);
// clamp k to kMaxJoints to avoid reading garbage off stack in release
src.setMul(mp[idx[(k < kMaxJoints) ? k : 0]], w);
// clamp idx to maxJoints to avoid reading garbage off stack in release
src.setMul(mp[(idx[k]<maxJoints)?idx[k]:0], w);
final_mat.add(src);
}