Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to examples/Collision and RealTimeBullet3Collision

Browse Source
This commit is contained in:
erwin coumans
2015-10-18 23:43:37 -07:00
parent 7ac497d6f2
commit 5a21424662
7 changed files with 273 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Bullet3Collision/NarrowPhaseCollision/shared/b3Collidable.h
View File

@@ -15,9 +15,6 @@ enum b3ShapeTypes
SHAPE_CONCAVE_TRIMESH=5,
SHAPE_COMPOUND_OF_CONVEX_HULLS=6,
SHAPE_SPHERE=7,
SHAPE_CAPSULE=8,
SHAPE_COMPOUND_OF_SPHERES=9,
SHAPE_COMPOUND_OF_CAPSULES=10,
MAX_NUM_SHAPE_TYPES,
};
@@ -37,7 +34,11 @@ struct b3Collidable
};
int m_shapeType;
int m_shapeIndex;
union
{
int m_shapeIndex;
float m_height;
};
};
typedef struct b3GpuChildShape b3GpuChildShape_t;
@@ -46,9 +47,17 @@ struct b3GpuChildShape
b3Float4 m_childPosition;
b3Quat m_childOrientation;
int m_shapeIndex;//used for SHAPE_COMPOUND_OF_CONVEX_HULLS
float m_radius;//used for SHAPE_COMPOUND_OF_SPHERES or SHAPE_COMPOUND_OF_CAPSULES
float m_height;//used for SHAPE_COMPOUND_OF_CAPSULES
int m_unused2;
union
{
float m_radius;//used for childshape of SHAPE_COMPOUND_OF_SPHERES or SHAPE_COMPOUND_OF_CAPSULES
int m_numChildShapes;//used for compound shape
};
union
{
float m_height;//used for childshape of SHAPE_COMPOUND_OF_CAPSULES
int m_collidableShapeIndex;
};
int m_shapeType;
};
struct b3CompoundOverlappingPair