summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llkeyframewalkmotion.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-24 10:08:13 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-24 10:08:13 -0400
commit76fb5f1542297a7e1afdf983d8a0db459fc0b8ab (patch)
tree0c35366715e4a944361f5ec1cbf61535b04b6ab0 /indra/llcharacter/llkeyframewalkmotion.cpp
parentff42e557848158d5a01cc260bac0bbf974650934 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
merge with viewer tools update
Diffstat (limited to 'indra/llcharacter/llkeyframewalkmotion.cpp')
-rwxr-xr-xindra/llcharacter/llkeyframewalkmotion.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index 7c1fcacf8a..f180702385 100755
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -45,10 +45,7 @@ const F32 TIME_EPSILON = 0.001f; // minumum frame time
const F32 MAX_TIME_DELTA = 2.f; // max two seconds a frame for calculating interpolation
F32 SPEED_ADJUST_MAX_SEC = 2.f; // maximum adjustment to walk animation playback speed for a second
F32 ANIM_SPEED_MAX = 1.5f; // absolute upper limit on animation speed
-const F32 DRIFT_COMP_MAX_TOTAL = 0.1f; // maximum drift compensation overall, in any direction
-const F32 DRIFT_COMP_MAX_SPEED = 4.f; // speed at which drift compensation total maxes out
const F32 MAX_ROLL = 0.6f;
-const F32 PELVIS_COMPENSATION_WIEGHT = 0.7f; // proportion of foot drift that is compensated by moving the avatar directly
const F32 SPEED_ADJUST_TIME_CONSTANT = 0.1f; // time constant for speed adjustment interpolation
//-----------------------------------------------------------------------------