diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h index 125bfc78a77..6f796950e1d 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h @@ -21,7 +21,7 @@ subject to the following restrictions: #include "LinearMath/btVector3.h" /// 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 btConvexInternalShape +ATTRIBUTE_ALIGNED16(class) btCylinderShape : public btConvexInternalShape { @@ -31,6 +31,8 @@ protected: public: +BT_DECLARE_ALIGNED_ALLOCATOR(); + btVector3 getHalfExtentsWithMargin() const { btVector3 halfExtents = getHalfExtentsWithoutMargin(); @@ -95,6 +97,13 @@ public: return m_upAxis; } + virtual btVector3 getAnisotropicRollingFrictionDirection() const + { + btVector3 aniDir(0,0,0); + aniDir[getUpAxis()]=1; + return aniDir; + } + virtual btScalar getRadius() const { return getHalfExtentsWithMargin().getX(); @@ -128,6 +137,8 @@ public: class btCylinderShapeX : public btCylinderShape { public: + BT_DECLARE_ALIGNED_ALLOCATOR(); + btCylinderShapeX (const btVector3& halfExtents); virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec)const; @@ -149,6 +160,8 @@ public: class btCylinderShapeZ : public btCylinderShape { public: + BT_DECLARE_ALIGNED_ALLOCATOR(); + btCylinderShapeZ (const btVector3& halfExtents); virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec)const; |