diff options
author | Robert Adams | 2012-12-12 11:01:36 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-12 11:01:36 -0800 |
commit | bb6eeb54296246e26594bc06edc3a42c0e5824e9 (patch) | |
tree | d2a705795d7b6d93d2c0373d195c05653ecf4be7 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | BulletSim: fix crash caused by the creation of a linkset child that is under ... (diff) | |
download | opensim-SC-bb6eeb54296246e26594bc06edc3a42c0e5824e9.zip opensim-SC-bb6eeb54296246e26594bc06edc3a42c0e5824e9.tar.gz opensim-SC-bb6eeb54296246e26594bc06edc3a42c0e5824e9.tar.bz2 opensim-SC-bb6eeb54296246e26594bc06edc3a42c0e5824e9.tar.xz |
BulletSim: do not return the current velocity for targetVelocity.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index d2fc15c..f3b6993 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -139,6 +139,17 @@ public abstract class BSPhysObject : PhysicsActor | |||
139 | public abstract OMV.Quaternion RawOrientation { get; set; } | 139 | public abstract OMV.Quaternion RawOrientation { get; set; } |
140 | public abstract OMV.Quaternion ForceOrientation { get; set; } | 140 | public abstract OMV.Quaternion ForceOrientation { get; set; } |
141 | 141 | ||
142 | // The system is telling us the velocity it wants to move at. | ||
143 | protected OMV.Vector3 m_targetVelocity; | ||
144 | public override OMV.Vector3 TargetVelocity | ||
145 | { | ||
146 | get { return m_targetVelocity; } | ||
147 | set | ||
148 | { | ||
149 | m_targetVelocity = value; | ||
150 | Velocity = value; | ||
151 | } | ||
152 | } | ||
142 | public abstract OMV.Vector3 ForceVelocity { get; set; } | 153 | public abstract OMV.Vector3 ForceVelocity { get; set; } |
143 | 154 | ||
144 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } | 155 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } |