diff options
| author | Richard Linden <none@none> | 2010-07-01 10:36:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-01 10:36:03 -0700 |
| commit | 166a29e4ebd63d893edf94e8e550e42f56e9bec1 (patch) | |
| tree | e956e7e67bf4f0125353bf04d486f2103d44343e /indra/llcharacter | |
| parent | 928b205329fb4392c6ed6b659f4ef7cda6e056d3 (diff) | |
| parent | e8a52ebc51ebb27b7ffe3c9c275c04ccf3084bbb (diff) | |
merge
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llkeyframewalkmotion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp index 0587e5642c..4a1aca62bc 100644 --- a/indra/llcharacter/llkeyframewalkmotion.cpp +++ b/indra/llcharacter/llkeyframewalkmotion.cpp @@ -289,7 +289,8 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask) F32 foot_speed = speed - ((foot_slip_vector * avatar_movement_dir) / delta_time); // multiply animation playback rate so that foot speed matches avatar speed - F32 desired_speed_multiplier = llclamp(speed / foot_speed, 0.f, ANIM_SPEED_MAX); + F32 min_speed_multiplier = clamp_rescale(speed, 0.f, 1.f, 0.f, 0.1f); + F32 desired_speed_multiplier = llclamp(speed / foot_speed, min_speed_multiplier, ANIM_SPEED_MAX); // blend towards new speed adjustment value F32 new_speed_adjust = lerp(mAdjustedSpeed, desired_speed_multiplier, LLCriticalDamp::getInterpolant(SPEED_ADJUST_TIME_CONSTANT)); |