diff options
author | Robert Adams | 2013-01-30 14:38:19 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-31 15:55:53 -0800 |
commit | 371449db2ff27ffcd6d8317ffec1c0176937f38f (patch) | |
tree | 27a59b2a32b14b1d3a8ef81b318ad7d737de3e0a /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-371449db2ff27ffcd6d8317ffec1c0176937f38f.zip opensim-SC-371449db2ff27ffcd6d8317ffec1c0176937f38f.tar.gz opensim-SC-371449db2ff27ffcd6d8317ffec1c0176937f38f.tar.bz2 opensim-SC-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/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index a113530..823402b 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -190,18 +190,6 @@ public abstract class BSPhysObject : PhysicsActor | |||
190 | public abstract OMV.Quaternion RawOrientation { get; set; } | 190 | public abstract OMV.Quaternion RawOrientation { get; set; } |
191 | public abstract OMV.Quaternion ForceOrientation { get; set; } | 191 | public abstract OMV.Quaternion ForceOrientation { get; set; } |
192 | 192 | ||
193 | // The system is telling us the velocity it wants to move at. | ||
194 | // Velocity in world coordinates. | ||
195 | // protected OMV.Vector3 m_targetVelocity; // use the definition in PhysicsActor | ||
196 | public override OMV.Vector3 TargetVelocity | ||
197 | { | ||
198 | get { return m_targetVelocity; } | ||
199 | set | ||
200 | { | ||
201 | m_targetVelocity = value; | ||
202 | Velocity = value; | ||
203 | } | ||
204 | } | ||
205 | public virtual float TargetSpeed | 193 | public virtual float TargetSpeed |
206 | { | 194 | { |
207 | get | 195 | get |