diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h index b69b5c5b0c8..5966ae48f11 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h @@ -20,7 +20,7 @@ subject to the following restrictions: #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types ///The btConeShape implements a cone shape primitive, centered around the origin and aligned with the Y axis. The btConeShapeX is aligned around the X axis and btConeShapeZ around the Z axis. -class btConeShape : public btConvexInternalShape +ATTRIBUTE_ALIGNED16(class) btConeShape : public btConvexInternalShape { @@ -32,6 +32,8 @@ class btConeShape : public btConvexInternalShape public: + BT_DECLARE_ALIGNED_ALLOCATOR(); + btConeShape (btScalar radius,btScalar height); virtual btVector3 localGetSupportingVertex(const btVector3& vec) const; @@ -82,6 +84,11 @@ public: return m_coneIndices[1]; } + virtual btVector3 getAnisotropicRollingFrictionDirection() const + { + return btVector3 (0,1,0); + } + virtual void setLocalScaling(const btVector3& scaling); }; @@ -91,6 +98,12 @@ class btConeShapeX : public btConeShape { public: btConeShapeX(btScalar radius,btScalar height); + + virtual btVector3 getAnisotropicRollingFrictionDirection() const + { + return btVector3 (1,0,0); + } + }; ///btConeShapeZ implements a Cone shape, around the Z axis @@ -98,6 +111,12 @@ class btConeShapeZ : public btConeShape { public: btConeShapeZ(btScalar radius,btScalar height); + + virtual btVector3 getAnisotropicRollingFrictionDirection() const + { + return btVector3 (0,0,1); + } + }; #endif //BT_CONE_MINKOWSKI_H |