diff options
author | thickbrick | 2010-10-29 15:49:14 +0200 |
---|---|---|
committer | thickbrick | 2010-10-29 15:49:14 +0200 |
commit | 694e64db099caa07ca7a1ef740f8dac524eb2479 (patch) | |
tree | ca1a750234a873ea3d712369784dbef7945b3c3c | |
parent | Fixed xml files from the German translation missing from the repo (diff) | |
download | meta-impy-694e64db099caa07ca7a1ef740f8dac524eb2479.zip meta-impy-694e64db099caa07ca7a1ef740f8dac524eb2479.tar.gz meta-impy-694e64db099caa07ca7a1ef740f8dac524eb2479.tar.bz2 meta-impy-694e64db099caa07ca7a1ef740f8dac524eb2479.tar.xz |
Fix Bug #671 (aka VWR-1603): Duckwalk is too fast
Slow down AO-less avatars' walk animation by 2x. Patch by Gigs Taggart
from https://jira.secondlife.com/browse/VWR-1603
-rw-r--r-- | linden/indra/llcharacter/llkeyframewalkmotion.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.cpp b/linden/indra/llcharacter/llkeyframewalkmotion.cpp index b5817e5..4aa9d2a 100644 --- a/linden/indra/llcharacter/llkeyframewalkmotion.cpp +++ b/linden/indra/llcharacter/llkeyframewalkmotion.cpp | |||
@@ -50,6 +50,7 @@ const F32 MIN_WALK_SPEED = 0.1f; // minimum speed at which we use velocity for d | |||
50 | const F32 MAX_TIME_DELTA = 2.f; //max two seconds a frame for calculating interpolation | 50 | const F32 MAX_TIME_DELTA = 2.f; //max two seconds a frame for calculating interpolation |
51 | const F32 SPEED_ADJUST_MAX = 2.5f; // maximum adjustment of walk animation playback speed | 51 | const F32 SPEED_ADJUST_MAX = 2.5f; // maximum adjustment of walk animation playback speed |
52 | const F32 SPEED_ADJUST_MAX_SEC = 3.f; // maximum adjustment to walk animation playback speed for a second | 52 | const F32 SPEED_ADJUST_MAX_SEC = 3.f; // maximum adjustment to walk animation playback speed for a second |
53 | const F32 SPEED_FINAL_SCALING = 0.5f; // final scaling for walk animation | ||
53 | const F32 DRIFT_COMP_MAX_TOTAL = 0.07f;//0.55f; // maximum drift compensation overall, in any direction | 54 | const F32 DRIFT_COMP_MAX_TOTAL = 0.07f;//0.55f; // maximum drift compensation overall, in any direction |
54 | const F32 DRIFT_COMP_MAX_SPEED = 4.f; // speed at which drift compensation total maxes out | 55 | const F32 DRIFT_COMP_MAX_SPEED = 4.f; // speed at which drift compensation total maxes out |
55 | const F32 MAX_ROLL = 0.6f; | 56 | const F32 MAX_ROLL = 0.6f; |
@@ -314,6 +315,7 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask) | |||
314 | } | 315 | } |
315 | 316 | ||
316 | mAnimSpeed = (mAvgSpeed + mSpeedAdjust) * mRelativeDir; | 317 | mAnimSpeed = (mAvgSpeed + mSpeedAdjust) * mRelativeDir; |
318 | mAnimSpeed = mAnimSpeed * SPEED_FINAL_SCALING; | ||
317 | // char debug_text[64]; | 319 | // char debug_text[64]; |
318 | // sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity); | 320 | // sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity); |
319 | // mCharacter->addDebugText(debug_text); | 321 | // mCharacter->addDebugText(debug_text); |