diff options
author | Robert Adams | 2012-12-30 14:26:57 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-31 19:57:23 -0800 |
commit | c2a7af18b639646b647eb4cdff4168a2b9746ee4 (patch) | |
tree | afe36195792b9990f7defd18bc29791f7527dcff /OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | |
parent | BulletSim: remove all the debug printing of pointer formatting (.ToString(X))... (diff) | |
download | opensim-SC_OLD-c2a7af18b639646b647eb4cdff4168a2b9746ee4.zip opensim-SC_OLD-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.gz opensim-SC_OLD-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.bz2 opensim-SC_OLD-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.xz |
BulletSim: nearly complete in conversion from BulletSimAPI to BSAPITemplate. Only initialization and debug fuctions left.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs index 423e700..c75eb9b 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | |||
@@ -151,12 +151,12 @@ public class BSShapeNative : BSShape | |||
151 | /* | 151 | /* |
152 | if (shapeType == BSPhysicsShapeType.SHAPE_CAPSULE) | 152 | if (shapeType == BSPhysicsShapeType.SHAPE_CAPSULE) |
153 | { | 153 | { |
154 | ptr = BulletSimAPI.BuildCapsuleShape2(physicsScene.World.ptr, 1f, 1f, prim.Scale); | 154 | ptr = PhysicsScene.PE.BuildCapsuleShape(physicsScene.World, 1f, 1f, prim.Scale); |
155 | physicsScene.DetailLog("{0},BSShapeCollection.BuiletPhysicalNativeShape,capsule,scale={1}", prim.LocalID, prim.Scale); | 155 | physicsScene.DetailLog("{0},BSShapeCollection.BuiletPhysicalNativeShape,capsule,scale={1}", prim.LocalID, prim.Scale); |
156 | } | 156 | } |
157 | else | 157 | else |
158 | { | 158 | { |
159 | ptr = BulletSimAPI.BuildNativeShape2(physicsScene.World.ptr, nativeShapeData); | 159 | ptr = PhysicsScene.PE.BuildNativeShape(physicsScene.World, nativeShapeData); |
160 | } | 160 | } |
161 | if (ptr == IntPtr.Zero) | 161 | if (ptr == IntPtr.Zero) |
162 | { | 162 | { |
@@ -173,7 +173,7 @@ public class BSShapeNative : BSShape | |||
173 | /* | 173 | /* |
174 | // Native shapes are not tracked and are released immediately | 174 | // Native shapes are not tracked and are released immediately |
175 | physicsScene.DetailLog("{0},BSShapeCollection.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this); | 175 | physicsScene.DetailLog("{0},BSShapeCollection.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this); |
176 | BulletSimAPI.DeleteCollisionShape2(physicsScene.World.ptr, ptr); | 176 | PhysicsScene.PE.DeleteCollisionShape(physicsScene.World, this); |
177 | ptr = IntPtr.Zero; | 177 | ptr = IntPtr.Zero; |
178 | // Garbage collection will free up this instance. | 178 | // Garbage collection will free up this instance. |
179 | */ | 179 | */ |