diff options
author | Robert Adams | 2013-01-21 23:43:24 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-21 23:43:24 -0800 |
commit | 80b1e32bfa00a2d3354f0d7e0df83a5b0b3e2c49 (patch) | |
tree | 6d6ca5dbbdc60f2b9464d03a773facdcf11bb80a /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
parent | BulletSim: allow changing position and rotation of a child of a linkset (diff) | |
download | opensim-SC_OLD-80b1e32bfa00a2d3354f0d7e0df83a5b0b3e2c49.zip opensim-SC_OLD-80b1e32bfa00a2d3354f0d7e0df83a5b0b3e2c49.tar.gz opensim-SC_OLD-80b1e32bfa00a2d3354f0d7e0df83a5b0b3e2c49.tar.bz2 opensim-SC_OLD-80b1e32bfa00a2d3354f0d7e0df83a5b0b3e2c49.tar.xz |
BulletSim: Tweeks to vehicle motion.
Pass through old angular velocity making for smoother transitions.
Remove some old kludges for angular motion (damping and rotvel suppression).
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 468ff40..e6b8507 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -1009,6 +1009,7 @@ public sealed class BSPrim : BSPhysObject | |||
1009 | { | 1009 | { |
1010 | DetailLog("{0},BSPrim.ForceRotationalVel,taint,rotvel={1}", LocalID, _rotationalVelocity); | 1010 | DetailLog("{0},BSPrim.ForceRotationalVel,taint,rotvel={1}", LocalID, _rotationalVelocity); |
1011 | PhysicsScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity); | 1011 | PhysicsScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity); |
1012 | // PhysicsScene.PE.SetInterpolationAngularVelocity(PhysBody, _rotationalVelocity); | ||
1012 | ActivateIfPhysical(false); | 1013 | ActivateIfPhysical(false); |
1013 | } | 1014 | } |
1014 | } | 1015 | } |
@@ -1649,7 +1650,7 @@ public sealed class BSPrim : BSPhysObject | |||
1649 | // TODO: handle physics introduced by Bullet with computed vehicle physics. | 1650 | // TODO: handle physics introduced by Bullet with computed vehicle physics. |
1650 | if (_vehicle.IsActive) | 1651 | if (_vehicle.IsActive) |
1651 | { | 1652 | { |
1652 | entprop.RotationalVelocity = OMV.Vector3.Zero; | 1653 | // entprop.RotationalVelocity = OMV.Vector3.Zero; |
1653 | } | 1654 | } |
1654 | 1655 | ||
1655 | // Assign directly to the local variables so the normal set actions do not happen | 1656 | // Assign directly to the local variables so the normal set actions do not happen |