diff options
author | Robert Adams | 2012-10-05 15:33:17 -0700 |
---|---|---|
committer | Robert Adams | 2012-10-11 14:01:03 -0700 |
commit | 87825b0abee76c28dcffdaa2c532779b813b6d14 (patch) | |
tree | 1028e20a0c2cd8ddea9a60b0b013fa1db69daa74 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
parent | Updated Robust.HG.ini.example. Thanks Austin Tate. (diff) | |
download | opensim-SC-87825b0abee76c28dcffdaa2c532779b813b6d14.zip opensim-SC-87825b0abee76c28dcffdaa2c532779b813b6d14.tar.gz opensim-SC-87825b0abee76c28dcffdaa2c532779b813b6d14.tar.bz2 opensim-SC-87825b0abee76c28dcffdaa2c532779b813b6d14.tar.xz |
BulletSim: Fix crash when linking large physical linksets.
Properly remove and restore linkage constraints when upgrading
a prim's mesh to a hull.
Lots more debug logging.
Definitions and use of Bullet structure dumping.
Centralize detail logging so a Flush() can be added for debugging.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index a43880d..bb4d399 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -192,8 +192,9 @@ public struct ShapeData | |||
192 | SHAPE_SPHERE = 5, | 192 | SHAPE_SPHERE = 5, |
193 | SHAPE_MESH = 6, | 193 | SHAPE_MESH = 6, |
194 | SHAPE_HULL = 7, | 194 | SHAPE_HULL = 7, |
195 | SHAPE_GROUNDPLANE = 8, | 195 | // following defined by BulletSim |
196 | SHAPE_TERRAIN = 9, | 196 | SHAPE_GROUNDPLANE = 20, |
197 | SHAPE_TERRAIN = 21, | ||
197 | }; | 198 | }; |
198 | public uint ID; | 199 | public uint ID; |
199 | public PhysicsShapeType Type; | 200 | public PhysicsShapeType Type; |
@@ -1108,6 +1109,15 @@ public static extern float GetMargin2(IntPtr shape); | |||
1108 | public static extern void DumpRigidBody2(IntPtr sim, IntPtr collisionObject); | 1109 | public static extern void DumpRigidBody2(IntPtr sim, IntPtr collisionObject); |
1109 | 1110 | ||
1110 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1111 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
1112 | public static extern void DumpCollisionShape2(IntPtr sim, IntPtr collisionShape); | ||
1113 | |||
1114 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1115 | public static extern void DumpConstraint2(IntPtr sim, IntPtr constrain); | ||
1116 | |||
1117 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1118 | public static extern void DumpAllInfo2(IntPtr sim); | ||
1119 | |||
1120 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1111 | public static extern void DumpMapInfo2(IntPtr sim, IntPtr manInfo); | 1121 | public static extern void DumpMapInfo2(IntPtr sim, IntPtr manInfo); |
1112 | 1122 | ||
1113 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1123 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |