diff options
author | Robert Adams | 2013-01-28 15:11:20 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-28 15:11:20 -0800 |
commit | e4c6a19940fe0bb4dfce7fa53de282bdd6fbfb08 (patch) | |
tree | 73de72c718f4401db717662bccebf25108b626a1 | |
parent | BulletSim: fix the trimming of colliders so only the top 25 are returned. (diff) | |
download | opensim-SC_OLD-e4c6a19940fe0bb4dfce7fa53de282bdd6fbfb08.zip opensim-SC_OLD-e4c6a19940fe0bb4dfce7fa53de282bdd6fbfb08.tar.gz opensim-SC_OLD-e4c6a19940fe0bb4dfce7fa53de282bdd6fbfb08.tar.bz2 opensim-SC_OLD-e4c6a19940fe0bb4dfce7fa53de282bdd6fbfb08.tar.xz |
BulletSim: rename 'uint' to 'UInt32' to make clear the type that is passed to unmanaged code.
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index f25b447..abbd22c 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
@@ -87,7 +87,7 @@ public enum FixedShapeKey : ulong | |||
87 | [StructLayout(LayoutKind.Sequential)] | 87 | [StructLayout(LayoutKind.Sequential)] |
88 | public struct ShapeData | 88 | public struct ShapeData |
89 | { | 89 | { |
90 | public uint ID; | 90 | public UInt32 ID; |
91 | public BSPhysicsShapeType Type; | 91 | public BSPhysicsShapeType Type; |
92 | public Vector3 Position; | 92 | public Vector3 Position; |
93 | public Quaternion Rotation; | 93 | public Quaternion Rotation; |
@@ -111,7 +111,7 @@ public struct ShapeData | |||
111 | [StructLayout(LayoutKind.Sequential)] | 111 | [StructLayout(LayoutKind.Sequential)] |
112 | public struct SweepHit | 112 | public struct SweepHit |
113 | { | 113 | { |
114 | public uint ID; | 114 | public UInt32 ID; |
115 | public float Fraction; | 115 | public float Fraction; |
116 | public Vector3 Normal; | 116 | public Vector3 Normal; |
117 | public Vector3 Point; | 117 | public Vector3 Point; |
@@ -119,15 +119,15 @@ public struct SweepHit | |||
119 | [StructLayout(LayoutKind.Sequential)] | 119 | [StructLayout(LayoutKind.Sequential)] |
120 | public struct RaycastHit | 120 | public struct RaycastHit |
121 | { | 121 | { |
122 | public uint ID; | 122 | public UInt32 ID; |
123 | public float Fraction; | 123 | public float Fraction; |
124 | public Vector3 Normal; | 124 | public Vector3 Normal; |
125 | } | 125 | } |
126 | [StructLayout(LayoutKind.Sequential)] | 126 | [StructLayout(LayoutKind.Sequential)] |
127 | public struct CollisionDesc | 127 | public struct CollisionDesc |
128 | { | 128 | { |
129 | public uint aID; | 129 | public UInt32 aID; |
130 | public uint bID; | 130 | public UInt32 bID; |
131 | public Vector3 point; | 131 | public Vector3 point; |
132 | public Vector3 normal; | 132 | public Vector3 normal; |
133 | public float penetration; | 133 | public float penetration; |
@@ -135,7 +135,7 @@ public struct CollisionDesc | |||
135 | [StructLayout(LayoutKind.Sequential)] | 135 | [StructLayout(LayoutKind.Sequential)] |
136 | public struct EntityProperties | 136 | public struct EntityProperties |
137 | { | 137 | { |
138 | public uint ID; | 138 | public UInt32 ID; |
139 | public Vector3 Position; | 139 | public Vector3 Position; |
140 | public Quaternion Rotation; | 140 | public Quaternion Rotation; |
141 | public Vector3 Velocity; | 141 | public Vector3 Velocity; |
@@ -325,7 +325,7 @@ public abstract BulletWorld Initialize(Vector3 maxPosition, ConfigurationParamet | |||
325 | public abstract int PhysicsStep(BulletWorld world, float timeStep, int maxSubSteps, float fixedTimeStep, | 325 | public abstract int PhysicsStep(BulletWorld world, float timeStep, int maxSubSteps, float fixedTimeStep, |
326 | out int updatedEntityCount, out int collidersCount); | 326 | out int updatedEntityCount, out int collidersCount); |
327 | 327 | ||
328 | public abstract bool UpdateParameter(BulletWorld world, uint localID, String parm, float value); | 328 | public abstract bool UpdateParameter(BulletWorld world, UInt32 localID, String parm, float value); |
329 | 329 | ||
330 | public abstract void Shutdown(BulletWorld sim); | 330 | public abstract void Shutdown(BulletWorld sim); |
331 | 331 | ||
@@ -366,24 +366,24 @@ public abstract void UpdateChildTransform(BulletShape pShape, int childIndex, Ve | |||
366 | 366 | ||
367 | public abstract void RecalculateCompoundShapeLocalAabb(BulletShape cShape); | 367 | public abstract void RecalculateCompoundShapeLocalAabb(BulletShape cShape); |
368 | 368 | ||
369 | public abstract BulletShape DuplicateCollisionShape(BulletWorld sim, BulletShape srcShape, uint id); | 369 | public abstract BulletShape DuplicateCollisionShape(BulletWorld sim, BulletShape srcShape, UInt32 id); |
370 | 370 | ||
371 | public abstract bool DeleteCollisionShape(BulletWorld world, BulletShape shape); | 371 | public abstract bool DeleteCollisionShape(BulletWorld world, BulletShape shape); |
372 | 372 | ||
373 | public abstract CollisionObjectTypes GetBodyType(BulletBody obj); | 373 | public abstract CollisionObjectTypes GetBodyType(BulletBody obj); |
374 | 374 | ||
375 | public abstract BulletBody CreateBodyFromShape(BulletWorld sim, BulletShape shape, uint id, Vector3 pos, Quaternion rot); | 375 | public abstract BulletBody CreateBodyFromShape(BulletWorld sim, BulletShape shape, UInt32 id, Vector3 pos, Quaternion rot); |
376 | 376 | ||
377 | public abstract BulletBody CreateBodyWithDefaultMotionState(BulletShape shape, uint id, Vector3 pos, Quaternion rot); | 377 | public abstract BulletBody CreateBodyWithDefaultMotionState(BulletShape shape, UInt32 id, Vector3 pos, Quaternion rot); |
378 | 378 | ||
379 | public abstract BulletBody CreateGhostFromShape(BulletWorld sim, BulletShape shape, uint id, Vector3 pos, Quaternion rot); | 379 | public abstract BulletBody CreateGhostFromShape(BulletWorld sim, BulletShape shape, UInt32 id, Vector3 pos, Quaternion rot); |
380 | 380 | ||
381 | public abstract void DestroyObject(BulletWorld sim, BulletBody obj); | 381 | public abstract void DestroyObject(BulletWorld sim, BulletBody obj); |
382 | 382 | ||
383 | // ===================================================================================== | 383 | // ===================================================================================== |
384 | public abstract BulletShape CreateGroundPlaneShape(uint id, float height, float collisionMargin); | 384 | public abstract BulletShape CreateGroundPlaneShape(UInt32 id, float height, float collisionMargin); |
385 | 385 | ||
386 | public abstract BulletShape CreateTerrainShape(uint id, Vector3 size, float minHeight, float maxHeight, float[] heightMap, | 386 | public abstract BulletShape CreateTerrainShape(UInt32 id, Vector3 size, float minHeight, float maxHeight, float[] heightMap, |
387 | float scaleFactor, float collisionMargin); | 387 | float scaleFactor, float collisionMargin); |
388 | 388 | ||
389 | // ===================================================================================== | 389 | // ===================================================================================== |
@@ -629,7 +629,7 @@ public abstract BulletConstraint GetConstraintRef(BulletBody obj, int index); | |||
629 | 629 | ||
630 | public abstract int GetNumConstraintRefs(BulletBody obj); | 630 | public abstract int GetNumConstraintRefs(BulletBody obj); |
631 | 631 | ||
632 | public abstract bool SetCollisionGroupMask(BulletBody body, uint filter, uint mask); | 632 | public abstract bool SetCollisionGroupMask(BulletBody body, UInt32 filter, UInt32 mask); |
633 | 633 | ||
634 | // ===================================================================================== | 634 | // ===================================================================================== |
635 | // btCollisionShape entries | 635 | // btCollisionShape entries |