summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llcharacter/llanimationstates.cpp3
-rw-r--r--indra/llcharacter/llkeyframewalkmotion.cpp26
-rw-r--r--indra/llcharacter/llmotioncontroller.cpp37
-rw-r--r--indra/newview/llappviewer.cpp8
-rw-r--r--indra/newview/llvoavatar.cpp27
-rw-r--r--indra/newview/llvoavatar.h1
6 files changed, 30 insertions, 72 deletions
diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp
index bcc28cfc8f..879f97deec 100644
--- a/indra/llcharacter/llanimationstates.cpp
+++ b/indra/llcharacter/llanimationstates.cpp
@@ -39,9 +39,6 @@
#include "llanimationstates.h"
#include "llstring.h"
-// Would be nice to be able to toggle at run-time, but not gonna
-// happen while we're using const LLUUIDs as keys.
-
const LLUUID ANIM_AGENT_AFRAID = LLUUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca");
const LLUUID ANIM_AGENT_AIM_BAZOOKA_R = LLUUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef");
const LLUUID ANIM_AGENT_AIM_BOW_L = LLUUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506");
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index 3cf4d695dd..232b617d69 100644
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -329,25 +329,23 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
{
mAnimSpeed = llclamp(mAnimSpeed, -ANIM_SPEED_MAX, -ANIM_SPEED_MIN);
}
- char debug_text[64];
- sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity);
- mCharacter->addDebugText(debug_text);
- sprintf(debug_text, "Speed: %.2f", mAvgSpeed);
- mCharacter->addDebugText(debug_text);
- sprintf(debug_text, "Speed Adjust: %.2f", mSpeedAdjust);
- mCharacter->addDebugText(debug_text);
- sprintf(debug_text, "Animation Playback Speed: %.2f", mAnimSpeed);
- mCharacter->addDebugText(debug_text);
- mCharacter->setAnimationData("Walk Speed", &mAnimSpeed);
+// char debug_text[64];
+// sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity);
+// mCharacter->addDebugText(debug_text);
+// sprintf(debug_text, "Speed: %.2f", mAvgSpeed);
+// mCharacter->addDebugText(debug_text);
+// sprintf(debug_text, "Speed Adjust: %.2f", mSpeedAdjust);
+// mCharacter->addDebugText(debug_text);
+// sprintf(debug_text, "Animation Playback Speed: %.2f", mAnimSpeed);
+// mCharacter->addDebugText(debug_text);
+ mCharacter->setAnimationData("Walk Speed", &mAnimSpeed);
if (mCharacter->getMotionController().mIsSelf)
{
F32 elapsed = mCharacter->getMotionController().getFrameTimer().getElapsedTimeF32();
llinfos << "PLOT elapsed: " << elapsed
-// << " footSlipVelocity: " << footSlipVelocity
-// << " speed: " << speed
-// << " mAvgCorrection: " << mAvgCorrection
+ << " footSlipVelocity: " << footSlipVelocity
+ << " mAvgCorrection: " << mAvgCorrection
<< " mAvgSpeed: " << mAvgSpeed
-// << " mSpeedAdjust: " << mSpeedAdjust
<< " mAnimSpeed: " << mAnimSpeed
<< " ANIM_SPEED_MAX: " << ANIM_SPEED_MAX
<< " ANIM_SPEED_MIN: " << ANIM_SPEED_MIN
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 51a9120cbb..04524dc015 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -393,8 +393,6 @@ LLMotion* LLMotionController::createMotion( const LLUUID &id )
//-----------------------------------------------------------------------------
BOOL LLMotionController::startMotion(const LLUUID &id, F32 start_offset)
{
- llinfos << animationName(id) << llendl;
-
// do we have an instance of this motion for this character?
LLMotion *motion = findMotion(id);
@@ -453,11 +451,6 @@ BOOL LLMotionController::stopMotionInstance(LLMotion* motion, BOOL stop_immediat
// If on active list, stop it
if (isMotionActive(motion) && !motion->isStopped())
{
- if (motion->getID() == ANIM_AGENT_FEMALE_WALK_NEW || motion->getID() == ANIM_AGENT_FEMALE_WALK)
- {
- llinfos << "stop female walk: " << animationName(motion->getID()) << llendl;
- }
-
motion->setStopTime(mAnimTime);
if (stop_immediate)
{
@@ -552,26 +545,6 @@ void LLMotionController::updateIdleActiveMotions()
}
}
-
-void breakWalkIf(LLMotion *motionp, BOOL flag)
-{
- if (
- (motionp->getID() == ANIM_AGENT_FEMALE_WALK) ||
- (motionp->getID() == ANIM_AGENT_FEMALE_WALK_NEW) ||
- (motionp->getID() == ANIM_AGENT_FEMALE_RUN_NEW) ||
- (motionp->getID() == ANIM_AGENT_WALK) ||
- (motionp->getID() == ANIM_AGENT_WALK_NEW) ||
- (motionp->getID() == ANIM_AGENT_RUN) ||
- (motionp->getID() == ANIM_AGENT_RUN_NEW)
- )
- {
- if (flag)
- {
-// llinfos << "break here" << llendl;
- }
- }
-}
-
//-----------------------------------------------------------------------------
// updateMotionsByType()
//-----------------------------------------------------------------------------
@@ -710,7 +683,6 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
// perform motion update
update_result = motionp->onUpdate(mAnimTime - motionp->mActivationTimestamp, last_joint_signature);
- breakWalkIf(motionp,!update_result);
}
//**********************
@@ -733,9 +705,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
}
// perform motion update
- breakWalkIf(motionp,TRUE);
update_result = motionp->onUpdate(mAnimTime - motionp->mActivationTimestamp, last_joint_signature);
- breakWalkIf(motionp,!update_result);
}
//**********************
@@ -758,13 +728,11 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
}
// perform motion update
update_result = motionp->onUpdate(mAnimTime - motionp->mActivationTimestamp, last_joint_signature);
- breakWalkIf(motionp,!update_result);
}
else
{
posep->setWeight(0.f);
update_result = motionp->onUpdate(0.f, last_joint_signature);
- breakWalkIf(motionp,!update_result);
}
// allow motions to deactivate themselves
@@ -838,11 +806,6 @@ void LLMotionController::updateLoadingMotions()
//-----------------------------------------------------------------------------
void LLMotionController::updateMotions(bool force_update)
{
- if (mIsSelf)
- {
- //dumpMotions();
- }
-
BOOL use_quantum = (mTimeStep != 0.f);
// Always update mPrevTimerElapsed
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b78d968e0e..c013831c83 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3243,11 +3243,11 @@ bool LLAppViewer::initCache()
{
LLVFile::initClass();
- llinfos << "======= Static VFS listing ========" << llendl;
- gStaticVFS->listFiles();
+ //llinfos << "======= Static VFS listing ========" << llendl;
+ //gStaticVFS->listFiles();
- llinfos << "========= regular VFS listing =====" << llendl;
- gVFS->listFiles();
+ //llinfos << "========= regular VFS listing =====" << llendl;
+ //gVFS->listFiles();
return true;
}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 3e6ec21017..b94fc3021c 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2137,23 +2137,26 @@ S32 LLVOAvatar::setTETexture(const U8 te, const LLUUID& uuid)
static LLFastTimer::DeclareTimer FTM_AVATAR_UPDATE("Update Avatar");
static LLFastTimer::DeclareTimer FTM_JOINT_UPDATE("Update Joints");
-void dumpAnimationState(LLVOAvatar *self)
+//------------------------------------------------------------------------
+// LLVOAvatar::dumpAnimationState()
+//------------------------------------------------------------------------
+void LLVOAvatar::dumpAnimationState()
{
llinfos << "==============================================" << llendl;
- for (LLVOAvatar::AnimIterator it = self->mSignaledAnimations.begin(); it != self->mSignaledAnimations.end(); ++it)
+ for (LLVOAvatar::AnimIterator it = mSignaledAnimations.begin(); it != mSignaledAnimations.end(); ++it)
{
LLUUID id = it->first;
std::string playtag = "";
- if (self->mPlayingAnimations.find(id) != self->mPlayingAnimations.end())
+ if (mPlayingAnimations.find(id) != mPlayingAnimations.end())
{
playtag = "*";
}
llinfos << animationName(id) << playtag << llendl;
}
- for (LLVOAvatar::AnimIterator it = self->mPlayingAnimations.begin(); it != self->mPlayingAnimations.end(); ++it)
+ for (LLVOAvatar::AnimIterator it = mPlayingAnimations.begin(); it != mPlayingAnimations.end(); ++it)
{
LLUUID id = it->first;
- bool is_signaled = self->mSignaledAnimations.find(id) != self->mSignaledAnimations.end();
+ bool is_signaled = mSignaledAnimations.find(id) != mSignaledAnimations.end();
if (!is_signaled)
{
llinfos << animationName(id) << "!S" << llendl;
@@ -3079,11 +3082,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
}
}
- if (isSelf())
- {
- // dumpAnimationState(this);
- }
-
if (gNoRender)
{
// Hack if we're running drones...
@@ -4491,13 +4489,13 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
{
LLMemType mt(LLMemType::MTYPE_AVATAR);
- llinfos << "motion requested " << id.asString() << " " << animationName(id) << llendl;
+ lldebugs << "motion requested " << id.asString() << " " << animationName(id) << llendl;
LLUUID remap_id = remapMotionID(id);
if (remap_id != id)
{
- llinfos << "motion resultant " << remap_id.asString() << " " << animationName(remap_id) << llendl;
+ lldebugs << "motion resultant " << remap_id.asString() << " " << animationName(remap_id) << llendl;
}
if (isSelf() && remap_id == ANIM_AGENT_AWAY)
@@ -4513,17 +4511,18 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
//-----------------------------------------------------------------------------
BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
{
- llinfos << "motion requested " << id.asString() << " " << animationName(id) << llendl;
+ lldebugs << "motion requested " << id.asString() << " " << animationName(id) << llendl;
LLUUID remap_id = remapMotionID(id);
if (remap_id != id)
{
- llinfos << "motion resultant " << remap_id.asString() << " " << animationName(remap_id) << llendl;
+ lldebugs << "motion resultant " << remap_id.asString() << " " << animationName(remap_id) << llendl;
}
if (isSelf())
{
+ // BAP - was onAnimStop(id) originally - verify fix.
gAgent.onAnimStop(remap_id);
}
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index f06bb458c5..bf075a199c 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -164,6 +164,7 @@ public:
virtual void requestStopMotion(LLMotion* motion);
LLMotion* findMotion(const LLUUID& id) const;
void startDefaultMotions();
+ void dumpAnimationState();
virtual LLJoint* getJoint(const std::string &name);
virtual LLJoint* getRootJoint() { return &mRoot; }
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 12:28:08 +0000