diff options
author | Justin Clark-Casey (justincc) | 2012-10-11 23:56:03 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-11 23:56:03 +0100 |
commit | f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4 (patch) | |
tree | 73b56a7b8294cc55c5f33c30b52bcefbf7d24e60 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
parent | Extend "show stats" command to "show stats [list|all|<category name>]" (diff) | |
parent | BulletSim: update the DLLs and SOs (diff) | |
download | opensim-SC_OLD-f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4.zip opensim-SC_OLD-f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4.tar.gz opensim-SC_OLD-f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4.tar.bz2 opensim-SC_OLD-f5f5f2e3fbc34c2bb0688177ea9a91d7fe674fc4.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index a43880d..276111c 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -101,9 +101,8 @@ public struct BulletShape | |||
101 | } | 101 | } |
102 | public IntPtr ptr; | 102 | public IntPtr ptr; |
103 | public ShapeData.PhysicsShapeType type; | 103 | public ShapeData.PhysicsShapeType type; |
104 | public ulong shapeKey; | 104 | public System.UInt64 shapeKey; |
105 | public bool isNativeShape; | 105 | public bool isNativeShape; |
106 | // Hulls have an underlying mesh. A pointer to it is hidden here. | ||
107 | public override string ToString() | 106 | public override string ToString() |
108 | { | 107 | { |
109 | StringBuilder buff = new StringBuilder(); | 108 | StringBuilder buff = new StringBuilder(); |
@@ -192,8 +191,9 @@ public struct ShapeData | |||
192 | SHAPE_SPHERE = 5, | 191 | SHAPE_SPHERE = 5, |
193 | SHAPE_MESH = 6, | 192 | SHAPE_MESH = 6, |
194 | SHAPE_HULL = 7, | 193 | SHAPE_HULL = 7, |
195 | SHAPE_GROUNDPLANE = 8, | 194 | // following defined by BulletSim |
196 | SHAPE_TERRAIN = 9, | 195 | SHAPE_GROUNDPLANE = 20, |
196 | SHAPE_TERRAIN = 21, | ||
197 | }; | 197 | }; |
198 | public uint ID; | 198 | public uint ID; |
199 | public PhysicsShapeType Type; | 199 | public PhysicsShapeType Type; |
@@ -305,6 +305,8 @@ public struct ConfigurationParameters | |||
305 | public float linkConstraintCFM; | 305 | public float linkConstraintCFM; |
306 | public float linkConstraintSolverIterations; | 306 | public float linkConstraintSolverIterations; |
307 | 307 | ||
308 | public float physicsLoggingFrames; | ||
309 | |||
308 | public const float numericTrue = 1f; | 310 | public const float numericTrue = 1f; |
309 | public const float numericFalse = 0f; | 311 | public const float numericFalse = 0f; |
310 | } | 312 | } |
@@ -1037,18 +1039,6 @@ public static extern IntPtr GetConstraintRef2(IntPtr obj, int index); | |||
1037 | public static extern int GetNumConstraintRefs2(IntPtr obj); | 1039 | public static extern int GetNumConstraintRefs2(IntPtr obj); |
1038 | 1040 | ||
1039 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1041 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
1040 | public static extern Vector3 GetDeltaLinearVelocity2(IntPtr obj); | ||
1041 | |||
1042 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1043 | public static extern Vector3 GetDeltaAngularVelocity2(IntPtr obj); | ||
1044 | |||
1045 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1046 | public static extern Vector3 GetPushVelocity2(IntPtr obj); | ||
1047 | |||
1048 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1049 | public static extern Vector3 GetTurnVelocity2(IntPtr obj); | ||
1050 | |||
1051 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1052 | public static extern void SetCollisionFilterMask2(IntPtr body, uint filter, uint mask); | 1042 | public static extern void SetCollisionFilterMask2(IntPtr body, uint filter, uint mask); |
1053 | 1043 | ||
1054 | // ===================================================================================== | 1044 | // ===================================================================================== |
@@ -1108,6 +1098,15 @@ public static extern float GetMargin2(IntPtr shape); | |||
1108 | public static extern void DumpRigidBody2(IntPtr sim, IntPtr collisionObject); | 1098 | public static extern void DumpRigidBody2(IntPtr sim, IntPtr collisionObject); |
1109 | 1099 | ||
1110 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1100 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
1101 | public static extern void DumpCollisionShape2(IntPtr sim, IntPtr collisionShape); | ||
1102 | |||
1103 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1104 | public static extern void DumpConstraint2(IntPtr sim, IntPtr constrain); | ||
1105 | |||
1106 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1107 | public static extern void DumpAllInfo2(IntPtr sim); | ||
1108 | |||
1109 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
1111 | public static extern void DumpMapInfo2(IntPtr sim, IntPtr manInfo); | 1110 | public static extern void DumpMapInfo2(IntPtr sim, IntPtr manInfo); |
1112 | 1111 | ||
1113 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1112 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |