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

SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint names defined

master
Brad Payne (Vir Linden) 2016-06-24 16:43:23 -04:00
parent b2a67c00b0
commit b649847fe9
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/llappearance/llpolyskeletaldistortion.cpp
View File

@ -154,12 +154,6 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info)
continue;
}
// BENTO remove?
//if (mJointScales.find(joint) != mJointScales.end())
//{
// LL_WARNS() << "Scale deformation already supplied for joint " << joint->getName() << "." << LL_ENDL;
//}
// store it
mJointScales[joint] = bone_info->mScaleDeformation;
@ -178,11 +172,6 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info)
if (bone_info->mHasPositionDeformation)
{
// BENTO remove?
//if (mJointOffsets.find(joint) != mJointOffsets.end())
//{
// LL_WARNS() << "Offset deformation already supplied for joint " << joint->getName() << "." << LL_ENDL;
//}
mJointOffsets[joint] = bone_info->mPositionDeformation;
}
}
@ -237,8 +226,8 @@ void LLPolySkeletalDistortion::apply( ESex avatar_sex )
LLVector3 positionDelta = iter->second;
newPosition = newPosition + (effective_weight * positionDelta) - (mLastWeight * positionDelta);
// SL-315
// BENTO - allow attachment positions to override requests from the params.
joint->setPosition(newPosition, true);
bool allow_attachment_pos_overrides = true;
joint->setPosition(newPosition, allow_attachment_pos_overrides);
}
if (mLastWeight != mCurWeight && !mIsAnimating)

4
indra/llcharacter/lljoint.h
View File

@ -40,8 +40,8 @@
#include "xform.h"
const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
// BENTO JOINT COUNT LIMIT - need to set this to final skeleton size
// (bones + attachments) + 2, rounded to next multiple of 4.
// Need to set this to count of animate-able joints (currently #bones +
// #attachments) + 2, rounded to next multiple of 4.
const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 192; // must be divisible by 4!
const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110;

18
indra/newview/llskinningutil.cpp
View File

@ -72,7 +72,7 @@ U32 get_valid_joint_index(const std::string& name, LLVOAvatar *avatar, std::vect
return j;
}
}
// BENTO how to handle?
// Shouldn't ever get here, because of the name cleanup pass in remapSkinInfoJoints()
LL_ERRS() << "no valid joints in joint_names" << LL_ENDL;
return 0;
}
@ -118,7 +118,7 @@ U32 LLSkinningUtil::getMaxJointCount()
U32 result = LL_MAX_JOINTS_PER_MESH_OBJECT;
if (!sIncludeEnhancedSkeleton)
{
// BENTO - currently the remap logic does not guarantee joint count <= 52;
// Currently the remap logic does not guarantee joint count <= 52;
// if one of the base ancestors is not rigged in a given mesh, an extended
// joint can still be included.
result = llmin(result,(U32)52);
@ -160,6 +160,16 @@ void LLSkinningUtil::remapSkinInfoJoints(LLVOAvatar *avatar, LLMeshSkinInfo* ski
U32 max_joints = getMeshJointCount(skin);
// Compute the remap
for (U32 j = 0; j < skin->mJointNames.size(); ++j)
{
// Fix invalid names to "mPelvis". Currently meshes with
// invalid names will be blocked on upload, so this is just
// needed for handling of any legacy bad data.
if (!avatar->getJoint(skin->mJointNames[j]))
{
skin->mJointNames[j] = "mPelvis";
}
}
std::vector<U32> j_proxy(skin->mJointNames.size());
for (U32 j = 0; j < skin->mJointNames.size(); ++j)
{
@ -179,8 +189,6 @@ void LLSkinningUtil::remapSkinInfoJoints(LLVOAvatar *avatar, LLMeshSkinInfo* ski
{
top++;
}
}
}
// Then use j_proxy to fill in j_remap for the joints that will be discarded
@ -285,7 +293,7 @@ void LLSkinningUtil::remapSkinWeights(LLVector4a* weights, U32 num_vertices, con
void LLSkinningUtil::checkSkinWeights(LLVector4a* weights, U32 num_vertices, const LLMeshSkinInfo* skin)
{
#ifndef LL_RELEASE_FOR_DOWNLOAD
const S32 max_joints = skin->mJointNames.size();
const S32 max_joints = skin->mJointRemap.size();
if (skin->mJointRemap.size()>0)
{
// Check the weights are consistent with the current remap.