Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexShape.h

Timestamp:

Dec 13, 2008, 11:45:51 PM (17 years ago)

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexShape.h (modified) (4 diffs)

code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexShape.h

@@ -25 +25 @@
 #include "LinearMath/btAlignedAllocator.h"
 
-//todo: get rid of this btConvexCastResult thing!
-struct btConvexCastResult;
 #define MAX_PREFERRED_PENETRATION_DIRECTIONS 10
 
@@ -39 +37 @@
         BT_DECLARE_ALIGNED_ALLOCATOR();
 
-        btConvexShape ()
-        {
-        }
+        btConvexShape ();
 
-        virtual ~btConvexShape()
-        {
+        virtual ~btConvexShape();
 
-        }
+        virtual btVector3       localGetSupportingVertex(const btVector3& vec)const = 0;
 
-
-        virtual btVector3       localGetSupportingVertex(const btVector3& vec)const =0;
-#ifndef __SPU__
-        virtual btVector3       localGetSupportingVertexWithoutMargin(const btVector3& vec) const= 0;
-        
-        //notice that the vectors should be unit length
-        virtual void    batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
-#endif //#ifndef __SPU__
+        ////////
+        #ifndef __SPU__
+        virtual btVector3       localGetSupportingVertexWithoutMargin(const btVector3& vec) const=0;
+        #endif //#ifndef __SPU__
 
         btVector3 localGetSupportVertexWithoutMarginNonVirtual (const btVector3& vec) const;
@@ -61 +52 @@
         btScalar getMarginNonVirtual () const;
         void getAabbNonVirtual (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
+
+        
+        //notice that the vectors should be unit length
+        virtual void    batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
 
         ///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
@@ -78 +73 @@
         virtual void    getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const=0;
 
+
+        
+        
 };