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

Fix line endings

meow-7.2.2
Ansariel 2016-09-21 12:50:00 +02:00
parent 1eb1d59470
commit 5dacf76ae8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llskinningutil.cpp
View File

@ -36,12 +36,12 @@ bool LLSkinningUtil::sIncludeEnhancedSkeleton = true;
namespace {
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//bool get_name_index( const std::string& name, std::vector<std::string>& names, U32& result )
bool get_name_index( const JointKey& name, std::vector<JointKey>& names, U32& result )
//</FS:ND>
{
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
// std::vector<std::string>::const_iterator find_it =
std::vector<JointKey>::const_iterator find_it =
// </FS:ND>
@ -60,7 +60,7 @@ bool get_name_index( const JointKey& name, std::vector<JointKey>& names, U32& re
// Find a name table index that is also a valid joint on the
// avatar. Order of preference is: requested name, mPelvis, first
// valid match in names table.
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//U32 get_valid_joint_index( const std::string& name, LLVOAvatar *avatar, std::vector<std::string>& joint_names )
U32 get_valid_joint_index( const JointKey& name, LLVOAvatar *avatar, std::vector<JointKey>& joint_names )
//</FS:ND>
@ -70,7 +70,7 @@ U32 get_valid_joint_index( const JointKey& name, LLVOAvatar *avatar, std::vector
{
return result;
}
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
// if( get_name_index( "mPelvis", joint_names, result ) )
if( get_name_index( JointKey::construct( "mPelvis" ), joint_names, result ) )
// </FS:ND>
@ -90,7 +90,7 @@ U32 get_valid_joint_index( const JointKey& name, LLVOAvatar *avatar, std::vector
}
// Which joint will stand in for this joint?
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//U32 get_proxy_joint_index( U32 joint_index, LLVOAvatar *avatar, std::vector<std::string>& joint_names )
U32 get_proxy_joint_index( U32 joint_index, LLVOAvatar *avatar, std::vector<JointKey>& joint_names )
//</FS:ND>
@ -110,7 +110,7 @@ U32 get_proxy_joint_index( U32 joint_index, LLVOAvatar *avatar, std::vector<Join
LLJoint *parent = joint->getParent();
if (!parent)
break;
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
// if( !get_name_index( parent->getName(), joint_names, j_proxy ) )
if( !get_name_index( JointKey::construct( parent->getName() ), joint_names, j_proxy ) )
// </FS:ND>
@ -185,7 +185,7 @@ void LLSkinningUtil::remapSkinInfoJoints(LLVOAvatar *avatar, LLMeshSkinInfo* ski
// needed for handling of any legacy bad data.
if (!avatar->getJoint(skin->mJointNames[j]))
{
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
// skin->mJointNames[ j ] = "mPelvis";
skin->mJointNames[ j ] = JointKey::construct( "mPelvis" );
//</FS:ND>
@ -223,7 +223,7 @@ void LLSkinningUtil::remapSkinInfoJoints(LLVOAvatar *avatar, LLMeshSkinInfo* ski
// Apply the remap to mJointNames, mInvBindMatrix, and mAlternateBindMatrix
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
//<FS:ND> Query by JointKey rather than just a string, the key can be a U32 index for faster lookup
// std::vector<std::string> new_joint_names;
std::vector< JointKey > new_joint_names;
// </FS:ND>