diff options
| author | Robert Adams | 2012-09-13 10:10:29 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-09-15 15:31:34 -0700 |
| commit | c0fec70b1ad3047b8e543558a6aaee2916bd7b3f (patch) | |
| tree | a0aae7fbd1a3ee7df67c4b6280286acfa42a3221 /OpenSim/Region | |
| parent | BulletSim: Way too many changes in one commit. (diff) | |
| download | opensim-SC-c0fec70b1ad3047b8e543558a6aaee2916bd7b3f.zip opensim-SC-c0fec70b1ad3047b8e543558a6aaee2916bd7b3f.tar.gz opensim-SC-c0fec70b1ad3047b8e543558a6aaee2916bd7b3f.tar.bz2 opensim-SC-c0fec70b1ad3047b8e543558a6aaee2916bd7b3f.tar.xz | |
BulletSim: Add 'IsNativeShape2' call
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 043423e..087c61b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -523,10 +523,7 @@ public static extern IntPtr BuildNativeShape2(IntPtr world, | |||
| 523 | float shapeType, float collisionMargin, Vector3 scale); | 523 | float shapeType, float collisionMargin, Vector3 scale); |
| 524 | 524 | ||
| 525 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 525 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 526 | public static extern bool DeleteCollisionShape2(IntPtr world, IntPtr shape); | 526 | public static extern bool IsNativeShape2(IntPtr shape); |
| 527 | |||
| 528 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
| 529 | public static extern IntPtr CreateBodyFromShape2(IntPtr sim, IntPtr shape, Vector3 pos, Quaternion rot); | ||
| 530 | 527 | ||
| 531 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 528 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 532 | public static extern IntPtr CreateCompoundShape2(IntPtr sim); | 529 | public static extern IntPtr CreateCompoundShape2(IntPtr sim); |
| @@ -541,6 +538,12 @@ public static extern void RemoveChildFromCompoundShape2(IntPtr cShape, IntPtr re | |||
| 541 | public static extern IntPtr CreateBodyFromShapeAndInfo2(IntPtr sim, IntPtr shape, IntPtr constructionInfo); | 538 | public static extern IntPtr CreateBodyFromShapeAndInfo2(IntPtr sim, IntPtr shape, IntPtr constructionInfo); |
| 542 | 539 | ||
| 543 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 540 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 541 | public static extern bool DeleteCollisionShape2(IntPtr world, IntPtr shape); | ||
| 542 | |||
| 543 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
| 544 | public static extern IntPtr CreateBodyFromShape2(IntPtr sim, IntPtr shape, Vector3 pos, Quaternion rot); | ||
| 545 | |||
| 546 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
| 544 | public static extern IntPtr CreateBodyWithDefaultMotionState2(IntPtr shape, Vector3 pos, Quaternion rot); | 547 | public static extern IntPtr CreateBodyWithDefaultMotionState2(IntPtr shape, Vector3 pos, Quaternion rot); |
| 545 | 548 | ||
| 546 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 549 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |