From bbc5a5089f79a4c5543f4a3f1cd4ffaf1de8c07e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 24 Dec 2012 20:18:06 -0800
Subject: BulletSim: Rename some of the interface structures (BulletWorld, ...)
 to get ready for... Start creation of BulletAPITemplate. This defines the
 abstract interface functions. Following commits will move over to the new
 interface. This will enable switching between the managed and unmanaged
 version of Bullet.

---
 OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
index a9fd826..2aeff25 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
@@ -41,9 +41,9 @@ public sealed class BSConstraintCollection : IDisposable
     delegate bool ConstraintAction(BSConstraint constrain);
 
     private List<BSConstraint> m_constraints;
-    private BulletSim m_world;
+    private BulletWorld m_world;
 
-    public BSConstraintCollection(BulletSim world)
+    public BSConstraintCollection(BulletWorld world)
     {
         m_world = world;
         m_constraints = new List<BSConstraint>();
-- 
cgit v1.1


From 1d7276235ace0ed6b7701efa36a7fd7f1b552bab Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 17 Feb 2013 20:07:04 -0800
Subject: BulletSim: add calls for creating all the different Bullet constraint
 types. Updated the DLLs and SOs and code for BulletXNA to create the types.
 All the detailed control calls are not all in place yet.

---
 .../Region/Physics/BulletSPlugin/BSConstraintCollection.cs  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
index 2aeff25..5c8d94e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
@@ -117,8 +117,7 @@ public sealed class BSConstraintCollection : IDisposable
             if (this.TryGetConstraint(body1, body2, out constrain))
             {
                 // remove the constraint from our collection
-                RemoveAndDestroyConstraint(constrain);
-                ret = true;
+                ret = RemoveAndDestroyConstraint(constrain);
             }
         }
 
@@ -126,17 +125,19 @@ public sealed class BSConstraintCollection : IDisposable
     }
 
     // The constraint MUST exist in the collection
+    // Could be called if the constraint was previously removed.
+    // Return 'true' if the constraint was actually removed and disposed.
     public bool RemoveAndDestroyConstraint(BSConstraint constrain)
     {
+        bool removed = false;
         lock (m_constraints)
         {
             // remove the constraint from our collection
-            m_constraints.Remove(constrain);
+            removed = m_constraints.Remove(constrain);
         }
-        // tell the engine that all its structures need to be freed
+        // Dispose() is safe to call multiple times
         constrain.Dispose();
-        // we destroyed something
-        return true;
+        return removed;
     }
 
     // Remove all constraints that reference the passed body.
-- 
cgit v1.1