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

Use avatar-relative transforms when skinning via software, and translate to world coordinates after.

Browse Source
This commit is contained in:
Shyotl
2017-01-12 23:47:58 -06:00
parent aa7c5e652c
commit f62fded4bd
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llskinningutil.cpp
View File

@@ -76,7 +76,8 @@ void LLSkinningUtil::initSkinningMatrixPalette(
LLMatrix4a* mat,
S32 count,
const LLMeshSkinInfo* skin,
LLVOAvatar *avatar)
LLVOAvatar *avatar,
bool relative_to_avatar)
{
for (U32 j = 0; j < (U32)count; ++j)
{
@@ -117,7 +118,14 @@ void LLSkinningUtil::initSkinningMatrixPalette(
{
LLMatrix4a bind;
bind.loadu((F32*)skin->mInvBindMatrix[j].mMatrix);
mat[j].setMul(joint->getWorldMatrix(), bind);
if (relative_to_avatar)
{
LLMatrix4a trans = joint->getWorldMatrix();
trans.translate_affine(avatar->getPosition() * -1.f);
mat[j].setMul(trans, bind);
}
else
mat[j].setMul(joint->getWorldMatrix(), bind);
}
else
{