summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llmotioncontroller.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-01 15:51:14 -0500
committerDave Parks <davep@lindenlab.com>2012-06-01 15:51:14 -0500
commitae15778eebafa6c8f69cedd51fe5fe1a5f7b543b (patch)
tree76a83a42a0e0b4764649a19b98c36f135fb29828 /indra/llcharacter/llmotioncontroller.cpp
parent02a88f42a248f96f6816af4f674dde23f6bad9ef (diff)
Add some timers.
Diffstat (limited to 'indra/llcharacter/llmotioncontroller.cpp')
-rw-r--r--indra/llcharacter/llmotioncontroller.cpp24
1 files changed, 20 insertions, 4 deletions
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index bb892f4a7f..e7ec83efc0 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -539,11 +539,14 @@ void LLMotionController::updateIdleActiveMotions()
}
}
+static LLFastTimer::DeclareTimer FTM_UPDATE_MOTIONS_BY_TYPE("Update Motions By Type");
+
//-----------------------------------------------------------------------------
// updateMotionsByType()
//-----------------------------------------------------------------------------
void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_type)
{
+ LLFastTimer t(FTM_UPDATE_MOTIONS_BY_TYPE);
BOOL update_result = TRUE;
U8 last_joint_signature[LL_CHARACTER_MAX_JOINTS];
@@ -795,6 +798,9 @@ void LLMotionController::updateLoadingMotions()
// call updateMotion() or updateMotionsMinimal() every frame
//-----------------------------------------------------------------------------
+static LLFastTimer::DeclareTimer FTM_UPDATE_MOTION_PURGE_EXCESS("Purge Excess Motions");
+static LLFastTimer::DeclareTimer FTM_UPDATE_LOADING_MOTIONS("Update Loading Motions");
+
//-----------------------------------------------------------------------------
// updateMotion()
//-----------------------------------------------------------------------------
@@ -808,8 +814,11 @@ void LLMotionController::updateMotions(bool force_update)
mPrevTimerElapsed = cur_time;
mLastTime = mAnimTime;
- // Always cap the number of loaded motions
- purgeExcessMotions();
+ {
+ LLFastTimer t(FTM_UPDATE_MOTION_PURGE_EXCESS);
+ // Always cap the number of loaded motions
+ purgeExcessMotions();
+ }
// Update timing info for this time step.
if (!mPaused)
@@ -831,7 +840,11 @@ void LLMotionController::updateMotions(bool force_update)
mLastInterp = interp;
}
- updateLoadingMotions();
+ {
+ LLFastTimer t(FTM_UPDATE_LOADING_MOTIONS);
+ updateLoadingMotions();
+ }
+
return;
}
@@ -849,7 +862,10 @@ void LLMotionController::updateMotions(bool force_update)
}
}
- updateLoadingMotions();
+ {
+ LLFastTimer t(FTM_UPDATE_LOADING_MOTIONS);
+ updateLoadingMotions();
+ }
resetJointSignatures();