diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-03-07 21:53:16 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-03-07 21:53:16 +0400 |
| commit | 643b0be4cb3f73bd876493d2a7bd6f76ef27cf06 (patch) | |
| tree | 33fa8c08a902176f4204b6cc6a18702997bd90ba /extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h | |
| parent | 46d32c89f6df911120579d00dd6e1246536cb6d8 (diff) | |
bullet: Update to current svn, r2636
Apply patches in patches directory, remove patches that were applied
upstream.
If you made changes without adding a patch, please check.
Fixes [#32233] exporting bullet format results in corrupt files.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h index 08db39a33c8..d3cd066ac8d 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h @@ -34,9 +34,12 @@ struct btFace }; -class btConvexPolyhedron +ATTRIBUTE_ALIGNED16(class) btConvexPolyhedron { public: + + BT_DECLARE_ALIGNED_ALLOCATOR(); + btConvexPolyhedron(); virtual ~btConvexPolyhedron(); @@ -53,7 +56,7 @@ class btConvexPolyhedron void initialize(); bool testContainment() const; - void project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const; + void project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin,btVector3& witnesPtMax) const; }; |