diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h index ee2e1e28277..961d001a9dd 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h @@ -22,7 +22,7 @@ class btConvexPolyhedron; ///The btPolyhedralConvexShape is an internal interface class for polyhedral convex shapes. -class btPolyhedralConvexShape : public btConvexInternalShape +ATTRIBUTE_ALIGNED16(class) btPolyhedralConvexShape : public btConvexInternalShape { @@ -31,13 +31,17 @@ protected: btConvexPolyhedron* m_polyhedron; public: + + BT_DECLARE_ALIGNED_ALLOCATOR(); + btPolyhedralConvexShape(); virtual ~btPolyhedralConvexShape(); ///optional method mainly used to generate multiple contact points by clipping polyhedral features (faces/edges) - virtual bool initializePolyhedralFeatures(); + ///experimental/work-in-progress + virtual bool initializePolyhedralFeatures(int shiftVerticesByMargin=0); const btConvexPolyhedron* getConvexPolyhedron() const { |