aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs24
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index bb63b0a..75e7f99 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -89,7 +89,7 @@ public struct BulletShape
89 { 89 {
90 ptr = xx; 90 ptr = xx;
91 type=PhysicsShapeType.SHAPE_UNKNOWN; 91 type=PhysicsShapeType.SHAPE_UNKNOWN;
92 shapeKey = 0; 92 shapeKey = (System.UInt64)FixedShapeKey.KEY_NONE;
93 isNativeShape = false; 93 isNativeShape = false;
94 } 94 }
95 public BulletShape(IntPtr xx, PhysicsShapeType typ) 95 public BulletShape(IntPtr xx, PhysicsShapeType typ)
@@ -194,6 +194,18 @@ public enum PhysicsShapeType
194 SHAPE_COMPOUND = 22, 194 SHAPE_COMPOUND = 22,
195 SHAPE_HEIGHTMAP = 23, 195 SHAPE_HEIGHTMAP = 23,
196}; 196};
197
198// The native shapes have predefined shape hash keys
199public enum FixedShapeKey : ulong
200{
201 KEY_NONE = 0,
202 KEY_BOX = 1,
203 KEY_SPHERE = 2,
204 KEY_CONE = 3,
205 KEY_CYLINDER = 4,
206 KEY_CAPSULE = 5,
207}
208
197[StructLayout(LayoutKind.Sequential)] 209[StructLayout(LayoutKind.Sequential)]
198public struct ShapeData 210public struct ShapeData
199{ 211{
@@ -217,16 +229,6 @@ public struct ShapeData
217 // note that bools are passed as floats since bool size changes by language and architecture 229 // note that bools are passed as floats since bool size changes by language and architecture
218 public const float numericTrue = 1f; 230 public const float numericTrue = 1f;
219 public const float numericFalse = 0f; 231 public const float numericFalse = 0f;
220
221 // The native shapes have predefined shape hash keys
222 public enum FixedShapeKey : ulong
223 {
224 KEY_BOX = 1,
225 KEY_SPHERE = 2,
226 KEY_CONE = 3,
227 KEY_CYLINDER = 4,
228 KEY_CAPSULE = 5,
229 }
230} 232}
231[StructLayout(LayoutKind.Sequential)] 233[StructLayout(LayoutKind.Sequential)]
232public struct SweepHit 234public struct SweepHit