diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 804d2ea..a0bad3a 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -90,6 +90,8 @@ public class BulletHeightMapInfo | |||
90 | public Vector3 maxCoords; | 90 | public Vector3 maxCoords; |
91 | public float sizeX, sizeY; | 91 | public float sizeX, sizeY; |
92 | public float minZ, maxZ; | 92 | public float minZ, maxZ; |
93 | public BulletShape terrainShape; | ||
94 | public BulletBody terrainBody; | ||
93 | } | 95 | } |
94 | 96 | ||
95 | // =============================================================================== | 97 | // =============================================================================== |
@@ -462,14 +464,14 @@ public static extern IntPtr CreateBodyFromShape2(IntPtr sim, IntPtr shape, Vecto | |||
462 | public static extern IntPtr CreateBodyWithDefaultMotionState2(IntPtr shape, Vector3 pos, Quaternion rot); | 464 | public static extern IntPtr CreateBodyWithDefaultMotionState2(IntPtr shape, Vector3 pos, Quaternion rot); |
463 | 465 | ||
464 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 466 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
465 | public static extern bool ReplaceBodyShape2(IntPtr sim, IntPtr obj, IntPtr shape); | 467 | public static extern bool SetBodyShape2(IntPtr sim, IntPtr obj, IntPtr shape); |
466 | // ===================================================================================== | 468 | // ===================================================================================== |
467 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 469 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
468 | public static extern IntPtr CreateHeightMapInfo2(uint id, Vector3 minCoords, Vector3 maxCoords, | 470 | public static extern IntPtr CreateHeightMapInfo2(IntPtr sim, uint id, Vector3 minCoords, Vector3 maxCoords, |
469 | [MarshalAs(UnmanagedType.LPArray)] float[] heightMap, float collisionMargin); | 471 | [MarshalAs(UnmanagedType.LPArray)] float[] heightMap, float collisionMargin); |
470 | 472 | ||
471 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 473 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
472 | public static extern IntPtr FillHeightMapInfo2(IntPtr mapInfo, uint id, Vector3 minCoords, Vector3 maxCoords, | 474 | public static extern IntPtr FillHeightMapInfo2(IntPtr sim, IntPtr mapInfo, uint id, Vector3 minCoords, Vector3 maxCoords, |
473 | [MarshalAs(UnmanagedType.LPArray)] float[] heightMap, float collisionMargin); | 475 | [MarshalAs(UnmanagedType.LPArray)] float[] heightMap, float collisionMargin); |
474 | 476 | ||
475 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 477 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |