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

WIP:Added pelvis offset to skinning info

meow-7.2.2
prep 2011-03-14 18:02:25 -04:00
parent 3559789967
commit 16ff507190
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llprimitive/llmodel.cpp
View File

@ -57,6 +57,7 @@ const int MODEL_NAMES_LENGTH = sizeof(model_names) / sizeof(std::string);
LLModel::LLModel(LLVolumeParams& params, F32 detail)
: LLVolume(params, detail), mNormalizedScale(1,1,1), mNormalizedTranslation(0,0,0)
, mPelvisOffset( 0.0f )
{
mDecompID = -1;
}
@ -1497,6 +1498,7 @@ LLSD LLModel::writeModel(
}
}
if ( upload_joints && high->mAlternateBindMatrix.size() > 0 )
{
for (U32 i = 0; i < high->mJointList.size(); ++i)
@ -1509,6 +1511,8 @@ LLSD LLModel::writeModel(
}
}
}
mdl["skin"]["pelvis_offset"] = high->mPelvisOffset;
}
}

1
indra/llprimitive/llmodel.h
View File

@ -194,6 +194,7 @@ public:
LLVector3 mNormalizedScale;
LLVector3 mNormalizedTranslation;
float mPelvisOffset;
// convex hull decomposition
S32 mDecompID;
convex_hull_decomposition mConvexHullDecomp;

7
indra/newview/llmeshrepository.cpp
View File

@ -1162,7 +1162,12 @@ bool LLMeshRepoThread::skinInfoReceived(const LLUUID& mesh_id, U8* data, S32 dat
info.mAlternateBindMatrix.push_back(mat);
}
}
if (skin.has("pelvis_offset"))
{
info.mPelvisOffset = skin["pelvis_offset"].asReal();
}
mSkinInfoQ.push(info);
}

1
indra/newview/llmeshrepository.h
View File

@ -131,6 +131,7 @@ public:
std::vector<LLMatrix4> mAlternateBindMatrix;
LLMatrix4 mBindShapeMatrix;
float mPelvisOffset;
};
class LLMeshDecomposition