aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorRobert Adams2012-11-24 20:11:38 -0800
committerRobert Adams2012-11-25 20:04:28 -0800
commit9a424059446fadb80c2700ece273905ebe5a2b5a (patch)
tree8984f5acedf2385bc5dda1c9930c3fc2c321efd6 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentBulletSim: complete vector motor. Correct line endings. (diff)
downloadopensim-SC_OLD-9a424059446fadb80c2700ece273905ebe5a2b5a.zip
opensim-SC_OLD-9a424059446fadb80c2700ece273905ebe5a2b5a.tar.gz
opensim-SC_OLD-9a424059446fadb80c2700ece273905ebe5a2b5a.tar.bz2
opensim-SC_OLD-9a424059446fadb80c2700ece273905ebe5a2b5a.tar.xz
BulletSim: small change to add position correction force with AddForce rather than just storing it in the variable
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 2b3fa25..caa6c46 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -342,13 +342,12 @@ public sealed class BSPrim : BSPhysObject
342 // TODO: check for out of bounds 342 // TODO: check for out of bounds
343 343
344 // The above code computes a force to apply to correct any out-of-bounds problems. Apply same. 344 // The above code computes a force to apply to correct any out-of-bounds problems. Apply same.
345 // TODO: This should be intergrated with a geneal physics action mechanism.
346 // TODO: This should be moderated with PID'ness.
345 if (ret) 347 if (ret)
346 { 348 {
347 PhysicsScene.TaintedObject(inTaintTime, "BSPrim.PositionSanityCheck:belowTerrain", delegate() 349 // Apply upforce and overcome gravity.
348 { 350 AddForce(upForce - PhysicsScene.DefaultGravity, false, inTaintTime);
349 // Apply upforce and overcome gravity.
350 ForceVelocity = ForceVelocity + upForce - PhysicsScene.DefaultGravity;
351 });
352 } 351 }
353 return ret; 352 return ret;
354 } 353 }