some minor comment-renames, and moved some data from box/sphere into common convex.

This commit is contained in:
ejcoumans
2006-09-28 20:14:10 +00:00
parent 839c9b01c0
commit 21482e4cab
13 changed files with 39 additions and 29 deletions

View File

@@ -33,6 +33,16 @@ struct btConvexCastResult;
/// used in combination with GJK or btConvexCast
class btConvexShape : public btCollisionShape
{
protected:
//local scaling. collisionMargin is not scaled !
btVector3 m_localScaling;
btVector3 m_implicitShapeDimensions;
btScalar m_collisionMargin;
public:
btConvexShape();
@@ -42,7 +52,10 @@ public:
//notice that the vectors should be unit length
virtual void batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
// testing for hullnode code
const btVector3& getImplicitShapeDimensions() const
{
return m_implicitShapeDimensions;
}
///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
@@ -70,11 +83,7 @@ public:
{
return m_collisionMargin;
}
private:
btScalar m_collisionMargin;
//local scaling. collisionMargin is not scaled !
protected:
btVector3 m_localScaling;
};