From 76ef871eea3dd8274389e3bc671905e32083189a Mon Sep 17 00:00:00 2001 From: thickbrick Date: Tue, 2 Nov 2010 17:47:00 +0200 Subject: 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. --- linden/indra/llcharacter/llkeyframewalkmotion.cpp | 2 -- 1 file changed, 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 const F32 MAX_TIME_DELTA = 2.f; //max two seconds a frame for calculating interpolation const F32 SPEED_ADJUST_MAX = 2.5f; // maximum adjustment of walk animation playback speed const F32 SPEED_ADJUST_MAX_SEC = 3.f; // maximum adjustment to walk animation playback speed for a second -const F32 SPEED_FINAL_SCALING = 0.5f; // final scaling for walk animation const F32 DRIFT_COMP_MAX_TOTAL = 0.07f;//0.55f; // 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; @@ -315,7 +314,6 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask) } mAnimSpeed = (mAvgSpeed + mSpeedAdjust) * mRelativeDir; - mAnimSpeed = mAnimSpeed * SPEED_FINAL_SCALING; // char debug_text[64]; // sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity); // mCharacter->addDebugText(debug_text); -- cgit v1.1