diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h')
-rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h index c78890c887a..30938acf7c7 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h @@ -17,10 +17,10 @@ subject to the following restrictions: #define CYLINDER_MINKOWSKI_H #include "btBoxShape.h" -#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types -#include "../../LinearMath/btVector3.h" +#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types +#include "LinearMath/btVector3.h" -/// implements cylinder shape interface +/// The btCylinderShape class implements a cylinder shape primitive, centered around the origin. Its central axis aligned with the Y axis. btCylinderShapeX is aligned with the X axis and btCylinderShapeZ around the Z axis. class btCylinderShape : public btBoxShape { @@ -60,7 +60,7 @@ public: //use box inertia - // virtual void calculateLocalInertia(btScalar mass,btVector3& inertia); + // virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const; virtual int getShapeType() const { @@ -74,11 +74,11 @@ public: virtual btScalar getRadius() const { - return getHalfExtents().getX(); + return getHalfExtentsWithMargin().getX(); } //debugging - virtual char* getName()const + virtual const char* getName()const { return "CylinderY"; } @@ -96,14 +96,14 @@ public: virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const; //debugging - virtual char* getName()const + virtual const char* getName()const { return "CylinderX"; } virtual btScalar getRadius() const { - return getHalfExtents().getY(); + return getHalfExtentsWithMargin().getY(); } }; @@ -121,14 +121,14 @@ public: return 2; } //debugging - virtual char* getName()const + virtual const char* getName()const { return "CylinderZ"; } virtual btScalar getRadius() const { - return getHalfExtents().getX(); + return getHalfExtentsWithMargin().getX(); } }; |