diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2011-03-12 23:34:17 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2011-03-12 23:34:17 +0300 |
commit | 5e374328a87c1b418f8454d5ef38470484804961 (patch) | |
tree | 1d6de85165175c5192f74dbd423e1d5cb48f8ff6 /extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h | |
parent | 8c526e79e31d40d56a6fecce9343c74bd9fe62d8 (diff) |
update Bullet physics sdk to latest trunk/version 2.78
add PhysicsConstraints.exportBulletFile(char* fileName) python command
I'll be checking the bf-committers mailing list, in case this commit broke stuff
scons needs to be updated, I'll do that in a second.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h')
-rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h index 583c6b99eb6..07b3500f994 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h @@ -1,13 +1,11 @@ /* -btShapeHull implemented by John McCutchan. - Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2008 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -15,6 +13,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ +///btShapeHull implemented by John McCutchan. + #ifndef _SHAPE_HULL_H #define _SHAPE_HULL_H @@ -27,6 +27,15 @@ subject to the following restrictions: ///It approximates the convex hull using the supporting vertex of 42 directions. class btShapeHull { +protected: + + btAlignedObjectArray<btVector3> m_vertices; + btAlignedObjectArray<unsigned int> m_indices; + unsigned int m_numIndices; + const btConvexShape* m_shape; + + static btVector3* getUnitSpherePoints(); + public: btShapeHull (const btConvexShape* shape); ~btShapeHull (); @@ -45,12 +54,6 @@ public: { return &m_indices[0]; } - -protected: - btAlignedObjectArray<btVector3> m_vertices; - btAlignedObjectArray<unsigned int> m_indices; - unsigned int m_numIndices; - const btConvexShape* m_shape; }; #endif //_SHAPE_HULL_H |