aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorRobert Adams2013-01-20 09:33:13 -0800
committerRobert Adams2013-01-20 23:09:53 -0800
commit3b0df52d10c157cd2711d64ef9007d2afccbd468 (patch)
treeff548c66f9ee84933e33988ec21fb6712b6b82c1 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentThis updates prebuild to remove BulletSimN, implements the BulletSim API in B... (diff)
downloadopensim-SC_OLD-3b0df52d10c157cd2711d64ef9007d2afccbd468.zip
opensim-SC_OLD-3b0df52d10c157cd2711d64ef9007d2afccbd468.tar.gz
opensim-SC_OLD-3b0df52d10c157cd2711d64ef9007d2afccbd468.tar.bz2
opensim-SC_OLD-3b0df52d10c157cd2711d64ef9007d2afccbd468.tar.xz
BulletSim: modify motors to return correction rather than current value
to better use them for incremental updates. Modify prim and character to use the new motors. Simplify the vehicle linear movement code to just update the velocity directly or the basic movement.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index aaa6fe5..22afdc9 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1082,7 +1082,7 @@ public sealed class BSPrim : BSPhysObject
1082 OMV.Vector3 origPosition = RawPosition; // DEBUG DEBUG (for printout below) 1082 OMV.Vector3 origPosition = RawPosition; // DEBUG DEBUG (for printout below)
1083 1083
1084 // 'movePosition' is where we'd like the prim to be at this moment. 1084 // 'movePosition' is where we'd like the prim to be at this moment.
1085 OMV.Vector3 movePosition = _targetMotor.Step(timeStep); 1085 OMV.Vector3 movePosition = RawPosition + _targetMotor.Step(timeStep);
1086 1086
1087 // If we are very close to our target, turn off the movement motor. 1087 // If we are very close to our target, turn off the movement motor.
1088 if (_targetMotor.ErrorIsZero()) 1088 if (_targetMotor.ErrorIsZero())