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

WIP on attachment offset management in joints

meow-7.2.2
Brad Payne (Vir Linden) 2014-08-27 16:52:52 -04:00
parent 79bb641310
commit 33f66ac234
8 changed files with 105 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
indra/llcharacter/lljoint.cpp
View File

@ -52,7 +52,6 @@ void LLJoint::init()
mOldXform.setScale(LLVector3(1.0f, 1.0f, 1.0f));
mDirtyFlags = MATRIX_DIRTY | ROTATION_DIRTY | POSITION_DIRTY;
mUpdateXform = TRUE;
mResetAfterRestoreOldXform = false;
}
LLJoint::LLJoint() :
@ -245,7 +244,7 @@ void LLJoint::setPosition( const LLVector3& pos )
//--------------------------------------------------------------------
// setPosition()
// setDefaultFromCurrentXform()
//--------------------------------------------------------------------
void LLJoint::setDefaultFromCurrentXform( void )
{
@ -253,14 +252,62 @@ void LLJoint::setDefaultFromCurrentXform( void )
}
//--------------------------------------------------------------------
// storeCurrentXform()
// addAttachmentPosOverride()
//--------------------------------------------------------------------
void LLJoint::storeCurrentXform( const LLVector3& pos )
{
mOldXform = mXform;
mResetAfterRestoreOldXform = true;
setPosition( pos );
touch(ALL_DIRTY);
void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const std::string& attachment_name )
{
if (attachment_name.empty())
{
return;
}
if (m_attachmentOverrides.empty())
{
LL_WARNS() << "saving m_posBeforeOverrides " << getPosition() << LL_ENDL;
m_posBeforeOverrides = getPosition();
}
AttachmentOverrideRecord rec;
rec.name = attachment_name;
rec.pos = pos;
m_attachmentOverrides[attachment_name] = rec;
LL_WARNS() << "addAttachmentPosOverride for " << attachment_name << " pos " << pos << LL_ENDL;
updatePos();
}
//--------------------------------------------------------------------
// removeAttachmentPosOverride()
//--------------------------------------------------------------------
void LLJoint::removeAttachmentPosOverride( const std::string& attachment_name )
{
if (attachment_name.empty())
{
return;
}
attachment_map_t::iterator it = m_attachmentOverrides.find(attachment_name);
if (it != m_attachmentOverrides.end())
{
LL_WARNS() << "removeAttachmentPosOverride for " << attachment_name << LL_ENDL;
m_attachmentOverrides.erase(it);
}
updatePos();
}
void LLJoint::updatePos()
{
LLVector3 pos;
attachment_map_t::iterator it = std::max_element(m_attachmentOverrides.begin(),
m_attachmentOverrides.end());
if (it != m_attachmentOverrides.end())
{
AttachmentOverrideRecord& rec = it->second;
LL_WARNS() << "updatePos, winner is attachment " << rec.name << " pos " << rec.pos << LL_ENDL;
pos = rec.pos;
}
else
{
LL_WARNS() << "updatePos, winner is posBeforeOverrides " << m_posBeforeOverrides << LL_ENDL;
pos = m_posBeforeOverrides;
}
setPosition(pos);
}
//--------------------------------------------------------------------
@ -276,7 +323,6 @@ void LLJoint::storeScaleForReset( const LLVector3& scale )
void LLJoint::restoreOldXform( void )
{
mXform = mOldXform;
mResetAfterRestoreOldXform = false;
mDirtyFlags = ALL_DIRTY;
}
//--------------------------------------------------------------------
@ -325,7 +371,7 @@ void LLJoint::setWorldPosition( const LLVector3& pos )
//--------------------------------------------------------------------
// mXform.getRotation()
// getRotation()
//--------------------------------------------------------------------
const LLQuaternion& LLJoint::getRotation()
{
@ -548,20 +594,6 @@ void LLJoint::clampRotation(LLQuaternion old_rot, LLQuaternion new_rot)
break;
}
}
// 2003.03.26 - This code was just using up cpu cycles. AB
// LLVector3 old_axis = main_axis * old_rot;
// LLVector3 new_axis = main_axis * new_rot;
// for (S32 i = 0; i < mConstraintSilhouette.size() - 1; i++)
// {
// LLVector3 vert1 = mConstraintSilhouette[i];
// LLVector3 vert2 = mConstraintSilhouette[i + 1];
// figure out how to clamp rotation to line on 3-sphere
// }
}
// End

29
indra/llcharacter/lljoint.h
View File

@ -88,8 +88,6 @@ public:
U32 mDirtyFlags;
BOOL mUpdateXform;
BOOL mResetAfterRestoreOldXform;
// describes the skin binding pose
LLVector3 mSkinOffset;
@ -103,6 +101,25 @@ public:
static S32 sNumTouches;
static S32 sNumUpdates;
struct AttachmentOverrideRecord
{
AttachmentOverrideRecord()
{
}
LLVector3 pos;
std::string name;
bool operator<(const AttachmentOverrideRecord& other) const
{
return name < other.name;
}
};
typedef std::map<std::string,AttachmentOverrideRecord> attachment_map_t;
attachment_map_t m_attachmentOverrides;
LLVector3 m_posBeforeOverrides;
void updatePos();
public:
LLJoint();
LLJoint(S32 joint_num);
@ -188,15 +205,13 @@ public:
void setDefaultFromCurrentXform( void );
void storeCurrentXform( const LLVector3& pos );
void addAttachmentPosOverride( const LLVector3& pos, const std::string& attachment_name );
void removeAttachmentPosOverride( const std::string& attachment_name );
//Accessor for the joint id
LLUUID getId( void ) { return mId; }
//Setter for the joints id
void setId( const LLUUID& id ) { mId = id;}
//If the old transform flag has been set, then the reset logic in avatar needs to be aware(test) of it
const BOOL doesJointNeedToBeReset( void ) const { return mResetAfterRestoreOldXform; }
void setJointResetFlag( bool val ) { mResetAfterRestoreOldXform = val; }
};
#endif // LL_LLJOINT_H

3
indra/newview/llfloatermodelpreview.cpp
View File

@ -1935,7 +1935,8 @@ bool LLModelLoader::doLoadModel()
LLJoint* pJoint = mPreview->getPreviewAvatar()->getJoint( lookingForJoint );
if ( pJoint )
{
pJoint->storeCurrentXform( jointTransform.getTranslation() );
LL_WARNS() << "Aieee, now what!" << LL_ENDL;
//pJoint->storeCurrentXform( jointTransform.getTranslation() );
}
else
{

11
indra/newview/llviewerobject.cpp
View File

@ -6193,6 +6193,17 @@ const LLUUID &LLViewerObject::extractAttachmentItemID()
return getAttachmentItemID();
}
const std::string& LLViewerObject::getAttachmentItemName()
{
static std::string empty;
LLInventoryItem *item = gInventory.getItem(getAttachmentItemID());
if (isAttachment() && item)
{
return item->getName();
}
return empty;
}
//virtual
LLVOAvatar* LLViewerObject::getAvatar() const
{

2
indra/newview/llviewerobject.h
View File

@ -170,6 +170,8 @@ public:
void setOnActiveList(BOOL on_active) { mOnActiveList = on_active; }
virtual BOOL isAttachment() const { return FALSE; }
const std::string& getAttachmentItemName();
virtual LLVOAvatar* getAvatar() const; //get the avatar this object is attached to, or NULL if object is not an attachment
virtual BOOL isHUDAttachment() const { return FALSE; }
virtual BOOL isTempAttachment() const;

14
indra/newview/llvoavatar.cpp
View File

@ -5058,9 +5058,9 @@ LLJoint *LLVOAvatar::getJoint( const std::string &name )
return jointp;
}
//-----------------------------------------------------------------------------
// resetJointPositionsToDefault
// resetJointPositionsOnDetach
//-----------------------------------------------------------------------------
void LLVOAvatar::resetJointPositionsToDefault( void )
void LLVOAvatar::resetJointPositionsOnDetach(const std::string& attachment_name)
{
//Subsequent joints are relative to pelvis
avatar_joint_list_t::iterator iter = mSkeleton.begin();
@ -5072,17 +5072,16 @@ void LLVOAvatar::resetJointPositionsToDefault( void )
{
LLJoint* pJoint = (*iter);
//Reset joints except for pelvis
if ( pJoint && pJoint != pJointPelvis && pJoint->doesJointNeedToBeReset() )
if ( pJoint && pJoint != pJointPelvis)
{
pJoint->setId( LLUUID::null );
pJoint->restoreOldXform();
pJoint->removeAttachmentPosOverride(attachment_name);
}
else
if ( pJoint && pJoint == pJointPelvis && pJoint->doesJointNeedToBeReset() )
if ( pJoint && pJoint == pJointPelvis)
{
pJoint->setId( LLUUID::null );
pJoint->setPosition( LLVector3( 0.0f, 0.0f, 0.0f) );
pJoint->setJointResetFlag( false );
}
}
@ -5746,7 +5745,8 @@ void LLVOAvatar::cleanupAttachedMesh( LLViewerObject* pVO )
&& pSkinData->mJointNames.size() > JOINT_COUNT_REQUIRED_FOR_FULLRIG // full rig
&& pSkinData->mAlternateBindMatrix.size() > 0 )
{
LLVOAvatar::resetJointPositionsToDefault();
const std::string& attachment_name = pVO->getAttachmentItemName();
LLVOAvatar::resetJointPositionsOnDetach(attachment_name);
//Need to handle the repositioning of the cam, updating rig data etc during outfit editing
//This handles the case where we detach a replacement rig.
if ( gAgentCamera.cameraCustomizeAvatar() )

2
indra/newview/llvoavatar.h
View File

@ -199,7 +199,7 @@ public:
virtual LLJoint* getJoint(const std::string &name);
void resetJointPositionsToDefault( void );
void resetJointPositionsOnDetach(const std::string& attachment_name);
/*virtual*/ const LLUUID& getID() const;
/*virtual*/ void addDebugText(const std::string& text);

4
indra/newview/llvovolume.cpp
View File

@ -4626,7 +4626,9 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
const LLVector3& jointPos = pSkinData->mAlternateBindMatrix[i].getTranslation();
//Set the joint position
pJoint->storeCurrentXform( jointPos );
const std::string& attachment_name = drawablep->getVObj()->getAttachmentItemName();
//pJoint->storeCurrentXform( jointPos );
pJoint->addAttachmentPosOverride( jointPos, attachment_name );
//If joint is a pelvis then handle old/new pelvis to foot values
if ( lookingForJoint == "mPelvis" )