aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
diff options
context:
space:
mode:
authorRobert Adams2013-02-08 15:25:57 -0800
committerRobert Adams2013-02-08 16:29:40 -0800
commit1b55a9d81e66972312fdc801d17da697466f9ed4 (patch)
tree32c478526da580deb85a5a1218434e8e21173cd1 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
parentBulletSim: add initial instance of the ExtendedPhysics region module which ad... (diff)
downloadopensim-SC_OLD-1b55a9d81e66972312fdc801d17da697466f9ed4.zip
opensim-SC_OLD-1b55a9d81e66972312fdc801d17da697466f9ed4.tar.gz
opensim-SC_OLD-1b55a9d81e66972312fdc801d17da697466f9ed4.tar.bz2
opensim-SC_OLD-1b55a9d81e66972312fdc801d17da697466f9ed4.tar.xz
BulletSim: fix avatar bobbing or jiggling while stationary flying.
Various comments and debugging message mods.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index e1d269a..de69fa0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -290,13 +290,13 @@ public abstract class BSPhysObject : PhysicsActor
290 CollisionAccumulation++; 290 CollisionAccumulation++;
291 291
292 // For movement tests, remember if we are colliding with an object that is moving. 292 // For movement tests, remember if we are colliding with an object that is moving.
293 ColliderIsMoving = collidee != null ? collidee.RawVelocity != OMV.Vector3.Zero : false; 293 ColliderIsMoving = collidee != null ? (collidee.RawVelocity != OMV.Vector3.Zero) : false;
294 294
295 // If someone has subscribed for collision events log the collision so it will be reported up 295 // If someone has subscribed for collision events log the collision so it will be reported up
296 if (SubscribedEvents()) { 296 if (SubscribedEvents()) {
297 CollisionCollection.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth)); 297 CollisionCollection.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
298 DetailLog("{0},{1}.Collison.AddCollider,call,with={2},point={3},normal={4},depth={5}", 298 DetailLog("{0},{1}.Collison.AddCollider,call,with={2},point={3},normal={4},depth={5},colliderMoving={6}",
299 LocalID, TypeName, collidingWith, contactPoint, contactNormal, pentrationDepth); 299 LocalID, TypeName, collidingWith, contactPoint, contactNormal, pentrationDepth, ColliderIsMoving);
300 300
301 ret = true; 301 ret = true;
302 } 302 }