diff options
author | Robert Adams | 2012-12-25 23:54:10 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-25 23:54:10 -0800 |
commit | 5f71ee57c44f277e9e78392c616509498459c027 (patch) | |
tree | e649e10730ad8c0deefa604d7a3c8c47ab7c4c01 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
parent | BulletSim: Rename some of the interface structures (BulletWorld, ...) (diff) | |
download | opensim-SC_OLD-5f71ee57c44f277e9e78392c616509498459c027.zip opensim-SC_OLD-5f71ee57c44f277e9e78392c616509498459c027.tar.gz opensim-SC_OLD-5f71ee57c44f277e9e78392c616509498459c027.tar.bz2 opensim-SC_OLD-5f71ee57c44f277e9e78392c616509498459c027.tar.xz |
BulletSim: stop avatar from sliding VERY slowly after walking by
only zeroing the movement motor in the UpdateProperties routine.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index bf0545a..9f0d5af 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -260,7 +260,6 @@ public sealed class BSCharacter : BSPhysObject | |||
260 | public override void ZeroMotion(bool inTaintTime) | 260 | public override void ZeroMotion(bool inTaintTime) |
261 | { | 261 | { |
262 | _velocity = OMV.Vector3.Zero; | 262 | _velocity = OMV.Vector3.Zero; |
263 | _velocityMotor.Zero(); | ||
264 | _acceleration = OMV.Vector3.Zero; | 263 | _acceleration = OMV.Vector3.Zero; |
265 | _rotationalVelocity = OMV.Vector3.Zero; | 264 | _rotationalVelocity = OMV.Vector3.Zero; |
266 | 265 | ||
@@ -772,9 +771,9 @@ public sealed class BSCharacter : BSPhysObject | |||
772 | // the motor can be turned off. Set the velocity to zero so the zero motion is sent to the viewer. | 771 | // the motor can be turned off. Set the velocity to zero so the zero motion is sent to the viewer. |
773 | if (_velocityMotor.TargetValue.ApproxEquals(OMV.Vector3.Zero, 0.01f) && _velocityMotor.ErrorIsZero) | 772 | if (_velocityMotor.TargetValue.ApproxEquals(OMV.Vector3.Zero, 0.01f) && _velocityMotor.ErrorIsZero) |
774 | { | 773 | { |
775 | _velocityMotor.Enabled = false; | ||
776 | stepVelocity = OMV.Vector3.Zero; | ||
777 | ZeroMotion(true); | 774 | ZeroMotion(true); |
775 | stepVelocity = OMV.Vector3.Zero; | ||
776 | _velocityMotor.Enabled = false; | ||
778 | DetailLog("{0},BSCharacter.UpdateProperties,taint,disableVelocityMotor,m={1}", LocalID, _velocityMotor); | 777 | DetailLog("{0},BSCharacter.UpdateProperties,taint,disableVelocityMotor,m={1}", LocalID, _velocityMotor); |
779 | } | 778 | } |
780 | 779 | ||