aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2012-09-14 11:13:05 -0700
committerRobert Adams2012-09-15 15:32:11 -0700
commit1826b2b18e8d82a91ca34787e17cf4ef0d1f46a6 (patch)
tree60535cb78fbbde0587145049a0d30c2d79c2e654
parentBulletSim: another attempt at computing physics FPS correctly. (diff)
downloadopensim-SC_OLD-1826b2b18e8d82a91ca34787e17cf4ef0d1f46a6.zip
opensim-SC_OLD-1826b2b18e8d82a91ca34787e17cf4ef0d1f46a6.tar.gz
opensim-SC_OLD-1826b2b18e8d82a91ca34787e17cf4ef0d1f46a6.tar.bz2
opensim-SC_OLD-1826b2b18e8d82a91ca34787e17cf4ef0d1f46a6.tar.xz
BulletSim: add the debugging routine DumpRigidBody2() to API2.
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs9
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]
561public static extern void DumpMapInfo(IntPtr sim, IntPtr manInfo);
562
563[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
564public static extern IntPtr CreateHeightMapInfo2(IntPtr sim, uint id, Vector3 minCoords, Vector3 maxCoords, 561public 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]
1023public static extern void DumpRigidBody2(IntPtr sim, IntPtr collisionObject);
1024
1025[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
1026public static extern void DumpMapInfo2(IntPtr sim, IntPtr manInfo);
1027
1028[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
1026public static extern void DumpPhysicsStatistics2(IntPtr sim); 1029public static extern void DumpPhysicsStatistics2(IntPtr sim);
1027 1030
1028} 1031}