From 9218748321519ed04da5cdffa1f29e69030171b5 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 30 Dec 2012 10:21:47 -0800
Subject: BulletSim: another round of conversion: dynamics world and collision
 object functions.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index e7d8d14..6f819d8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -143,7 +143,7 @@ public sealed class BSShapeCollection : IDisposable
             {
                 if (!BulletSimAPI.IsInWorld2(body.ptr))
                 {
-                    BulletSimAPI.AddObjectToWorld2(PhysicsScene.World.ptr, body.ptr);
+                    PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, body);
                     if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,addedToWorld,ref={1}", body.ID, body);
                 }
             });
@@ -168,12 +168,12 @@ public sealed class BSShapeCollection : IDisposable
 
                 if (BulletSimAPI.IsInWorld2(body.ptr))
                 {
-                    BulletSimAPI.RemoveObjectFromWorld2(PhysicsScene.World.ptr, body.ptr);
+                    PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, body);
                     if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,removingFromWorld. Body={1}", body.ID, body);
                 }
 
                 // Zero any reference to the shape so it is not freed when the body is deleted.
-                BulletSimAPI.SetCollisionShape2(PhysicsScene.World.ptr, body.ptr, IntPtr.Zero);
+                PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, body, new BulletShape());
                 PhysicsScene.PE.DestroyObject(PhysicsScene.World, body);
             });
         }
-- 
cgit v1.1