aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
diff options
context:
space:
mode:
authorRobert Adams2013-01-30 14:38:19 -0800
committerRobert Adams2013-01-31 15:55:53 -0800
commit371449db2ff27ffcd6d8317ffec1c0176937f38f (patch)
tree27a59b2a32b14b1d3a8ef81b318ad7d737de3e0a /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-371449db2ff27ffcd6d8317ffec1c0176937f38f.zip
opensim-SC_OLD-371449db2ff27ffcd6d8317ffec1c0176937f38f.tar.gz
opensim-SC_OLD-371449db2ff27ffcd6d8317ffec1c0176937f38f.tar.bz2
opensim-SC_OLD-371449db2ff27ffcd6d8317ffec1c0176937f38f.tar.xz
BulletSim: clean up TargetVelocity implementation by using the default defn in the PhysicsActor base class.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 3884a5d..73354bb 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -557,11 +557,12 @@ public sealed class BSCharacter : BSPhysObject
557 { 557 {
558 get 558 get
559 { 559 {
560 return _velocityMotor.TargetValue; 560 return m_targetVelocity;
561 } 561 }
562 set 562 set
563 { 563 {
564 DetailLog("{0},BSCharacter.setTargetVelocity,call,vel={1}", LocalID, value); 564 DetailLog("{0},BSCharacter.setTargetVelocity,call,vel={1}", LocalID, value);
565 m_targetVelocity = value;
565 OMV.Vector3 targetVel = value; 566 OMV.Vector3 targetVel = value;
566 if (_setAlwaysRun) 567 if (_setAlwaysRun)
567 targetVel *= BSParam.AvatarAlwaysRunFactor; 568 targetVel *= BSParam.AvatarAlwaysRunFactor;
@@ -591,7 +592,6 @@ public sealed class BSCharacter : BSPhysObject
591 _velocityMotor.Reset(); 592 _velocityMotor.Reset();
592 _velocityMotor.SetCurrent(_velocity); 593 _velocityMotor.SetCurrent(_velocity);
593 _velocityMotor.SetTarget(_velocity); 594 _velocityMotor.SetTarget(_velocity);
594 // Even though the motor is initialized, it's not used and the velocity goes straight into the avatar.
595 _velocityMotor.Enabled = false; 595 _velocityMotor.Enabled = false;
596 596
597 DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, _velocity); 597 DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, _velocity);