diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 087c61b..9221cdb 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -558,9 +558,6 @@ public static extern void DestroyObject2(IntPtr sim, IntPtr obj); | |||
558 | // ===================================================================================== | 558 | // ===================================================================================== |
559 | // Terrain creation and helper routines | 559 | // Terrain creation and helper routines |
560 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 560 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
561 | public static extern void DumpMapInfo(IntPtr sim, IntPtr manInfo); | ||
562 | |||
563 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
564 | public static extern IntPtr CreateHeightMapInfo2(IntPtr sim, uint id, Vector3 minCoords, Vector3 maxCoords, | 561 | public static extern IntPtr CreateHeightMapInfo2(IntPtr sim, uint id, Vector3 minCoords, Vector3 maxCoords, |
565 | [MarshalAs(UnmanagedType.LPArray)] float[] heightMap, float collisionMargin); | 562 | [MarshalAs(UnmanagedType.LPArray)] float[] heightMap, float collisionMargin); |
566 | 563 | ||
@@ -1023,6 +1020,12 @@ public static extern void SetCollisionFilterMask(IntPtr shape, uint filter, uint | |||
1023 | // ===================================================================================== | 1020 | // ===================================================================================== |
1024 | // Debugging | 1021 | // Debugging |
1025 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1022 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
1023 | public static extern void DumpRigidBody2(IntPtr sim, IntPtr collisionObject); | ||
1024 | |||
1025 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1026 | public static extern void DumpMapInfo2(IntPtr sim, IntPtr manInfo); | ||
1027 | |||
1028 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1026 | public static extern void DumpPhysicsStatistics2(IntPtr sim); | 1029 | public static extern void DumpPhysicsStatistics2(IntPtr sim); |
1027 | 1030 | ||
1028 | } | 1031 | } |