From 5ffec1cd648bc8dcc333fc528707c09bb8dce27d Mon Sep 17 00:00:00 2001
From: Robert.Adams
Date: Fri, 22 Jul 2011 10:22:21 -0700
Subject: Pass collisions and updates in pinned memory (saves marshaling). Fix
 folding feet by using collision normals. Add constraint specification.

---
 OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index b2bc0d7..ace8158 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -78,7 +78,13 @@ public struct RaycastHit
     public float Fraction;
     public Vector3 Normal;
 }
-
+public struct CollisionDesc
+{
+    public uint aID;
+    public uint bID;
+    public Vector3 point;
+    public Vector3 normal;
+}
 public struct EntityProperties
 {
     public uint ID;
@@ -92,7 +98,8 @@ public struct EntityProperties
 static class BulletSimAPI {
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
-public static extern uint Initialize(Vector3 maxPosition);
+public static extern uint Initialize(Vector3 maxPosition, int maxCollisions, IntPtr collisionArray, 
+                        int maxUpdates, IntPtr updateArray);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern void SetHeightmap(uint worldID, [MarshalAs(UnmanagedType.LPArray)] float[] heightMap);
@@ -124,7 +131,12 @@ public static extern void CreateLinkset(uint worldID, int objectCount, ShapeData
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern void AddConstraint(uint worldID, uint id1, uint id2, 
-    Vector3 frame1, Vector3 frame2, Vector3 lowLinear, Vector3 hiLinear, Vector3 lowAngular, Vector3 hiAngular);
+    Vector3 frame1, Quaternion frame1rot,
+    Vector3 frame2, Quaternion frame2rot,
+    Vector3 lowLinear, Vector3 hiLinear, Vector3 lowAngular, Vector3 hiAngular);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool RemoveConstraintByID(uint worldID, uint id1);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern bool RemoveConstraint(uint worldID, uint id1, uint id2);
-- 
cgit v1.1