ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it

Browse Source 
conflicts with PhysicsShape type defined in later libOMV
This commit is contained in:
Melanie
2012-11-22 14:45:41 +00:00
parent 3ce00e97cc
commit 3b2caa63b0
11 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
View File

@@ -88,11 +88,11 @@ public struct BulletShape
public BulletShape(IntPtr xx)
{
ptr = xx;
type=PhysicsShapeType.SHAPE_UNKNOWN;
type=BSPhysicsShapeType.SHAPE_UNKNOWN;
shapeKey = (System.UInt64)FixedShapeKey.KEY_NONE;
isNativeShape = false;
}
public BulletShape(IntPtr xx, PhysicsShapeType typ)
public BulletShape(IntPtr xx, BSPhysicsShapeType typ)
{
ptr = xx;
type = typ;
@@ -100,7 +100,7 @@ public struct BulletShape
isNativeShape = false;
}
public IntPtr ptr;
public PhysicsShapeType type;
public BSPhysicsShapeType type;
public System.UInt64 shapeKey;
public bool isNativeShape;
public override string ToString()
@@ -178,7 +178,7 @@ public struct ConvexHull
int VertexCount;
Vector3[] Vertices;
}
public enum PhysicsShapeType
public enum BSPhysicsShapeType
{
SHAPE_UNKNOWN = 0,
SHAPE_CAPSULE = 1,
@@ -210,7 +210,7 @@ public enum FixedShapeKey : ulong
public struct ShapeData
{
public uint ID;
public PhysicsShapeType Type;
public BSPhysicsShapeType Type;
public Vector3 Position;
public Quaternion Rotation;
public Vector3 Velocity;