diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2007-06-23 09:28:07 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2007-06-23 09:28:07 +0400 |
| commit | ca26aeb7b23e37e65f49d907ea53fcaeee77ad4e (patch) | |
| tree | b6530195a8ef5d874b9fc2bbb9574f1484781be5 /extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h | |
| parent | 14ad8c9941ac1e6f5252a843c6ad17653cbbd689 (diff) | |
upgrade to latest Bullet 2.53. cross the fingers it doesn't break one of the exotic or less exotic platforms
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h index 2db6a872b40..66521664087 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h @@ -17,10 +17,10 @@ subject to the following restrictions: #define SPHERE_MINKOWSKI_H #include "btConvexShape.h" -#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types +#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types ///btSphereShape implements an implicit (getSupportingVertex) Sphere -class btSphereShape : public btConvexShape +ATTRIBUTE_ALIGNED16(class) btSphereShape : public btConvexShape { @@ -45,11 +45,11 @@ public: //debugging virtual char* getName()const {return "SPHERE";} - virtual void setMargin(float margin) + virtual void setMargin(btScalar margin) { btConvexShape::setMargin(margin); } - virtual float getMargin() const + virtual btScalar getMargin() const { //to improve gjk behaviour, use radius+margin as the full margin, so never get into the penetration case //this means, non-uniform scaling is not supported anymore |