aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorthickbrick2010-11-02 17:47:00 +0200
committerthickbrick2010-11-02 17:47:00 +0200
commit76ef871eea3dd8274389e3bc671905e32083189a (patch)
tree1c23b7b059a85399a0746e03342d330d36173add /linden
parentUse the right name for the Aurora capability (diff)
downloadmeta-impy-76ef871eea3dd8274389e3bc671905e32083189a.zip
meta-impy-76ef871eea3dd8274389e3bc671905e32083189a.tar.gz
meta-impy-76ef871eea3dd8274389e3bc671905e32083189a.tar.bz2
meta-impy-76ef871eea3dd8274389e3bc671905e32083189a.tar.xz
Revert "Fix Bug #671 (aka VWR-1603): Duckwalk is too fast"
This reverts commit 694e64db099caa07ca7a1ef740f8dac524eb2479. It seems to not work for small avatars who depend on the fast default animation to make their walk look realistic. This is all different anyway in v2.2, so let's not thouch it for now.
Diffstat (limited to '')
-rw-r--r--linden/indra/llcharacter/llkeyframewalkmotion.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.cpp b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
index 4aa9d2a..b5817e5 100644
--- a/linden/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -50,7 +50,6 @@ const F32 MIN_WALK_SPEED = 0.1f; // minimum speed at which we use velocity for d
50const F32 MAX_TIME_DELTA = 2.f; //max two seconds a frame for calculating interpolation 50const F32 MAX_TIME_DELTA = 2.f; //max two seconds a frame for calculating interpolation
51const F32 SPEED_ADJUST_MAX = 2.5f; // maximum adjustment of walk animation playback speed 51const F32 SPEED_ADJUST_MAX = 2.5f; // maximum adjustment of walk animation playback speed
52const F32 SPEED_ADJUST_MAX_SEC = 3.f; // maximum adjustment to walk animation playback speed for a second 52const F32 SPEED_ADJUST_MAX_SEC = 3.f; // maximum adjustment to walk animation playback speed for a second
53const F32 SPEED_FINAL_SCALING = 0.5f; // final scaling for walk animation
54const F32 DRIFT_COMP_MAX_TOTAL = 0.07f;//0.55f; // maximum drift compensation overall, in any direction 53const F32 DRIFT_COMP_MAX_TOTAL = 0.07f;//0.55f; // maximum drift compensation overall, in any direction
55const F32 DRIFT_COMP_MAX_SPEED = 4.f; // speed at which drift compensation total maxes out 54const F32 DRIFT_COMP_MAX_SPEED = 4.f; // speed at which drift compensation total maxes out
56const F32 MAX_ROLL = 0.6f; 55const F32 MAX_ROLL = 0.6f;
@@ -315,7 +314,6 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
315 } 314 }
316 315
317 mAnimSpeed = (mAvgSpeed + mSpeedAdjust) * mRelativeDir; 316 mAnimSpeed = (mAvgSpeed + mSpeedAdjust) * mRelativeDir;
318 mAnimSpeed = mAnimSpeed * SPEED_FINAL_SCALING;
319// char debug_text[64]; 317// char debug_text[64];
320// sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity); 318// sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity);
321// mCharacter->addDebugText(debug_text); 319// mCharacter->addDebugText(debug_text);