diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs index 629bc72..d0b2a56 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | |||
@@ -259,7 +259,7 @@ public sealed class BSLinksetConstraints : BSLinkset | |||
259 | if (PhysicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody, childPrim.PhysBody)) | 259 | if (PhysicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody, childPrim.PhysBody)) |
260 | { | 260 | { |
261 | // Make the child refresh its location | 261 | // Make the child refresh its location |
262 | BulletSimAPI.PushUpdate2(childPrim.PhysBody.ptr); | 262 | PhysicsScene.PE.PushUpdate(childPrim.PhysBody); |
263 | ret = true; | 263 | ret = true; |
264 | } | 264 | } |
265 | 265 | ||
@@ -286,9 +286,6 @@ public sealed class BSLinksetConstraints : BSLinkset | |||
286 | float linksetMass = LinksetMass; | 286 | float linksetMass = LinksetMass; |
287 | LinksetRoot.UpdatePhysicalMassProperties(linksetMass, true); | 287 | LinksetRoot.UpdatePhysicalMassProperties(linksetMass, true); |
288 | 288 | ||
289 | // DEBUG: see of inter-linkset collisions are causing problems | ||
290 | // BulletSimAPI.SetCollisionFilterMask2(LinksetRoot.BSBody.ptr, | ||
291 | // (uint)CollisionFilterGroups.LinksetFilter, (uint)CollisionFilterGroups.LinksetMask); | ||
292 | DetailLog("{0},BSLinksetConstraint.RecomputeLinksetConstraints,set,rBody={1},linksetMass={2}", | 289 | DetailLog("{0},BSLinksetConstraint.RecomputeLinksetConstraints,set,rBody={1},linksetMass={2}", |
293 | LinksetRoot.LocalID, LinksetRoot.PhysBody.AddrString, linksetMass); | 290 | LinksetRoot.LocalID, LinksetRoot.PhysBody.AddrString, linksetMass); |
294 | 291 | ||
@@ -307,11 +304,7 @@ public sealed class BSLinksetConstraints : BSLinkset | |||
307 | } | 304 | } |
308 | constrain.RecomputeConstraintVariables(linksetMass); | 305 | constrain.RecomputeConstraintVariables(linksetMass); |
309 | 306 | ||
310 | // DEBUG: see of inter-linkset collisions are causing problems | 307 | // PhysicsScene.PE.DumpConstraint(PhysicsScene.World, constrain.Constraint); // DEBUG DEBUG |
311 | // BulletSimAPI.SetCollisionFilterMask2(child.BSBody.ptr, | ||
312 | // (uint)CollisionFilterGroups.LinksetFilter, (uint)CollisionFilterGroups.LinksetMask); | ||
313 | |||
314 | // BulletSimAPI.DumpConstraint2(PhysicsScene.World.ptr, constrain.Constraint.ptr); // DEBUG DEBUG | ||
315 | } | 308 | } |
316 | 309 | ||
317 | } | 310 | } |