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

SL-124 WIP - BENTO comments and related cleanup

master
Brad Payne (Vir Linden) 2015-11-04 16:41:37 -05:00
parent 1a7b2d3d38
commit 3cf938bcec
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llcharacter/llbvhloader.cpp
View File

@ -903,8 +903,7 @@ ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 &
return E_ST_NO_CHANNELS;
}
// FIXME BENTO do we want to open up motion of non-hip joints or
// not? Already effectively allowed via .anim upload.
// Animating position (via mNumChannels = 6) is only supported for mPelvis.
int res = sscanf(line.c_str(), " CHANNELS %d", &joint->mNumChannels);
if ( res != 1 )
{

2
indra/llcharacter/lljoint.h
View File

@ -40,7 +40,7 @@
#include "xform.h"
const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
// BENTO JOINT COUNT LIMIT
// BENTO JOINT COUNT LIMIT - need to set this to final skeleton size + 2
const U32 LL_CHARACTER_MAX_JOINTS = 152; // must be divisible by 4!
const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110;

4
indra/llprimitive/lldaeloader.cpp
View File

@ -1259,8 +1259,6 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
name = mJointMap[name];
}
model->mSkinInfo.mJointNames.push_back(name);
// BENTO this does not appear to be used anywhere.
// model->mSkinInfo.mJointMap[name] = j;
}
}
else
@ -1278,8 +1276,6 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
name = mJointMap[name];
}
model->mSkinInfo.mJointNames.push_back(name);
// BENTO not used?
// model->mSkinInfo.mJointMap[name] = j;
}
}
}

2
indra/llprimitive/llmodel.h
View File

@ -47,8 +47,6 @@ public:
std::vector<LLMatrix4> mInvBindMatrix;
std::vector<LLMatrix4> mAlternateBindMatrix;
std::vector<U32> mJointRemap;
// BENTO not used?
//std::map<std::string, U32> mJointMap;
LLMeshSkinInfo() { }
LLMeshSkinInfo(LLSD& data);

4
indra/newview/llskinningutil.cpp
View File

@ -85,9 +85,7 @@ U32 get_proxy_joint_index(U32 joint_index, LLVOAvatar *avatar, std::vector<std::
U32 j_proxy = get_valid_joint_index(joint_names[joint_index], avatar, joint_names);
LLJoint *joint = avatar->getJoint(joint_names[j_proxy]);
llassert(joint);
// BENTO - test of simple push-to-base-ancestor
// complexity reduction scheme. Find the first
// ancestor that's not flagged as extended, or the
// Find the first ancestor that's not flagged as extended, or the
// last ancestor that's rigged in this mesh, whichever
// comes first.
while (1)