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

Merge bento-box

master
Ansariel 2016-08-15 16:55:40 +02:00
parent 304b9726de 57da9bcd1b
commit ffb27ed5ae
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llappearance/llavatarappearance.cpp
View File

@ -186,7 +186,8 @@ LLAvatarAppearance::LLAvatarAppearance(LLWearableData* wearable_data) :
mPelvisToFoot(0.f),
mHeadOffset(),
mRoot(NULL),
mWearableData(wearable_data)
mWearableData(wearable_data),
mNextJointNum(0)
{
llassert_always(mWearableData);
mBakedTextureDatas.resize(LLAvatarAppearanceDefines::BAKED_NUM_INDICES);
@ -646,6 +647,8 @@ BOOL LLAvatarAppearance::setupBone(const LLAvatarBoneInfo* info, LLJoint* parent
volume_num++;
}
joint->setJointNum(mNextJointNum++);
// setup children
LLAvatarBoneInfo::child_list_t::const_iterator iter;
for (iter = info->mChildList.begin(); iter != info->mChildList.end(); ++iter)
@ -1297,7 +1300,6 @@ LLJoint *LLAvatarAppearance::getCharacterJoint( U32 num )
if (!mSkeleton[num])
{
mSkeleton[num] = createAvatarJoint();
mSkeleton[num]->setJointNum(num);
}
return mSkeleton[num];
}

2
indra/llappearance/llavatarappearance.h
View File

@ -145,6 +145,8 @@ public:
// </FS:ND>
joint_map_t mJointMap;
S32 mNextJointNum;
void computeBodySize();

7
indra/llcharacter/lljoint.h
View File

@ -40,9 +40,10 @@
#include "xform.h"
const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
// 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!
// Need to set this to count of animate-able joints,
// currently = #bones + #collision_volumes + #attachments + 2,
// rounded to next multiple of 4.
const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 216; // must be divisible by 4!
const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110;
// These should be higher than the joint_num of any

2
indra/newview/llvoavatar.cpp
View File

@ -6561,7 +6561,7 @@ void LLVOAvatar::initAttachmentPoints(bool ignore_hud_joints)
attachment->setVisibleInFirstPerson(info->mVisibleFirstPerson);
attachment->setIsHUDAttachment(info->mIsHUDAttachment);
// attachment can potentially be animated, needs a number.
attachment->setJointNum(mSkeleton.size() + attachmentID - 1);
attachment->setJointNum(mNextJointNum++);
if (newly_created)
{