diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
| commit | c4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch) | |
| tree | 96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/llcharacter/llmotioncontroller.h | |
| parent | b0c449d301299a4ba1b7d83e930f9df6b071b931 (diff) | |
| parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) | |
viewer-development merge
Diffstat (limited to 'indra/llcharacter/llmotioncontroller.h')
| -rw-r--r-- | indra/llcharacter/llmotioncontroller.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h index b996f708d2..52eaf557b1 100644 --- a/indra/llcharacter/llmotioncontroller.h +++ b/indra/llcharacter/llmotioncontroller.h @@ -168,6 +168,9 @@ public: const LLFrameTimer& getFrameTimer() { return mTimer; } + static F32 getCurrentTimeFactor() { return sCurrentTimeFactor; }; + static void setCurrentTimeFactor(F32 factor) { sCurrentTimeFactor = factor; }; + protected: // internal operations act on motion instances directly // as there can be duplicate motions per id during blending overlap @@ -187,7 +190,8 @@ protected: void deactivateStoppedMotions(); protected: - F32 mTimeFactor; + F32 mTimeFactor; // 1.f for normal speed + static F32 sCurrentTimeFactor; // Value to use for initialization static LLMotionRegistry sRegistry; LLPoseBlender mPoseBlender; |