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

EXT-6953 WIP - pre-push cleanup after review. Accumulated EXT-6953 commits reviewed by Nyx.

master
Brad Payne (Vir Linden) 2010-05-27 17:04:48 -04:00
parent aa9c621cb9
commit d213946c6c
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llcharacter/llanimationstates.cpp
View File

@ -412,6 +412,15 @@ void LLAnimationLibrary::animStateSetString( const LLUUID& state, const std::str
mAnimMap[state] = mAnimStringTable.addString(name);
}
std::string LLAnimationLibrary::animationName( const LLUUID& id ) const
{
const char *cptr = gAnimLibrary.animStateToString(id);
if (cptr)
return std::string(cptr);
else
return std::string("[") + id.asString() + std::string("]");
}
// Animation states that the user can trigger as part of a gesture
// See struct LLAnimStateEntry in header for label location information
const LLAnimStateEntry gUserAnimStates[] = {
@ -489,14 +498,5 @@ const LLAnimStateEntry gUserAnimStates[] = {
const S32 gUserAnimStatesCount = LL_ARRAY_SIZE(gUserAnimStates);
std::string animationName( const LLUUID& id )
{
const char *cptr = gAnimLibrary.animStateToString(id);
if (cptr)
return std::string(cptr);
else
return std::string("[") + id.asString() + std::string("]");
}
// End

7
indra/llcharacter/llanimationstates.h
View File

@ -232,6 +232,11 @@ public:
// Associate an anim state with a name
//-----------------------------------------------------------------------------
void animStateSetString( const LLUUID& state, const std::string& name);
//-----------------------------------------------------------------------------
// Find the name for a given animation, or UUID string if none defined.
//-----------------------------------------------------------------------------
std::string animationName( const LLUUID& id ) const;
};
struct LLAnimStateEntry
@ -257,8 +262,6 @@ extern const LLAnimStateEntry gUserAnimStates[];
extern const S32 gUserAnimStatesCount;
extern LLAnimationLibrary gAnimLibrary;
std::string animationName( const LLUUID& id );
#endif // LL_LLANIMATIONSTATES_H

2
indra/llcharacter/llkeyframewalkmotion.cpp
View File

@ -341,7 +341,7 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
mCharacter->setAnimationData("Walk Speed", &mAnimSpeed);
if (mCharacter->getMotionController().mIsSelf)
{
F32 elapsed = mCharacter->getMotionController().getFrameTimer().getElapsedTimeF32();
// F32 elapsed = mCharacter->getMotionController().getFrameTimer().getElapsedTimeF32();
// llinfos << "PLOT elapsed: " << elapsed
// << " footSlipVelocity: " << footSlipVelocity
// << " mAvgCorrection: " << mAvgCorrection

2
indra/llcharacter/llmotioncontroller.cpp
View File

@ -1054,7 +1054,7 @@ void LLMotionController::dumpMotions()
state_string += std::string("A");
if (mDeprecatedMotions.find(motion) != mDeprecatedMotions.end())
state_string += std::string("D");
llinfos << animationName(id) << " " << state_string << llendl;
llinfos << gAnimLibrary.animationName(id) << " " << state_string << llendl;
}
}

13
indra/newview/llvoavatar.cpp
View File

@ -2191,7 +2191,7 @@ void LLVOAvatar::dumpAnimationState()
{
playtag = "*";
}
llinfos << animationName(id) << playtag << llendl;
llinfos << gAnimLibrary.animationName(id) << playtag << llendl;
}
for (LLVOAvatar::AnimIterator it = mPlayingAnimations.begin(); it != mPlayingAnimations.end(); ++it)
{
@ -2199,7 +2199,7 @@ void LLVOAvatar::dumpAnimationState()
bool is_signaled = mSignaledAnimations.find(id) != mSignaledAnimations.end();
if (!is_signaled)
{
llinfos << animationName(id) << "!S" << llendl;
llinfos << gAnimLibrary.animationName(id) << "!S" << llendl;
}
}
}
@ -4542,13 +4542,13 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
{
LLMemType mt(LLMemType::MTYPE_AVATAR);
lldebugs << "motion requested " << id.asString() << " " << animationName(id) << llendl;
lldebugs << "motion requested " << id.asString() << " " << gAnimLibrary.animationName(id) << llendl;
LLUUID remap_id = remapMotionID(id);
if (remap_id != id)
{
lldebugs << "motion resultant " << remap_id.asString() << " " << animationName(remap_id) << llendl;
lldebugs << "motion resultant " << remap_id.asString() << " " << gAnimLibrary.animationName(remap_id) << llendl;
}
if (isSelf() && remap_id == ANIM_AGENT_AWAY)
@ -4564,18 +4564,17 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
//-----------------------------------------------------------------------------
BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
{
lldebugs << "motion requested " << id.asString() << " " << animationName(id) << llendl;
lldebugs << "motion requested " << id.asString() << " " << gAnimLibrary.animationName(id) << llendl;
LLUUID remap_id = remapMotionID(id);
if (remap_id != id)
{
lldebugs << "motion resultant " << remap_id.asString() << " " << animationName(remap_id) << llendl;
lldebugs << "motion resultant " << remap_id.asString() << " " << gAnimLibrary.animationName(remap_id) << llendl;
}
if (isSelf())
{
// BAP - was onAnimStop(id) originally - verify fix.
gAgent.onAnimStop(remap_id);
}