Changeset 1972 for code/branches/physics/src/bullet/BulletCollision/CollisionShapes

Timestamp:

Oct 20, 2008, 5:40:38 PM (16 years ago)

Author:

rgrieder

Message:

Downgraded Bullet to latest tagged version: 2.72
That should give us more stability.

Location:

code/branches/physics/src/bullet/BulletCollision/CollisionShapes

Files:

• btConvexPointCloudShape.cpp (modified) (3 diffs)
• btConvexPointCloudShape.h (modified) (2 diffs)
• btPolyhedralConvexShape.cpp (modified) (2 diffs)
• btPolyhedralConvexShape.h (modified) (1 diff)
• btSphereShape.cpp (modified) (1 diff)
• btSphereShape.h (modified) (1 diff)

code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp

@@ -18 +18 @@
 #include "LinearMath/btQuaternion.h"
 
+btConvexPointCloudShape::btConvexPointCloudShape (btVector3* points,int numPoints) : btPolyhedralConvexShape ()
+{
+        m_shapeType = CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE;
+        m_points = points;
+        m_numPoints = numPoints;
+
+        recalcLocalAabb();
+}
+
+void btConvexPointCloudShape::setPoints (btVector3* points, int numPoints)
+{
+        m_points = points;
+        m_numPoints = numPoints;
+
+        recalcLocalAabb();
+}
+
+
 void btConvexPointCloudShape::setLocalScaling(const btVector3& scaling)
 {
@@ -24 +42 @@
 }
 
-#ifndef __SPU__
 btVector3       btConvexPointCloudShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0)const
 {
@@ -108 +125 @@
 
 
-#endif
+
 
 

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

@@ -29 +29 @@
         BT_DECLARE_ALIGNED_ALLOCATOR();
 
-        btConvexPointCloudShape(btVector3* points,int numPoints, bool computeAabb = true)
-        {
-                m_shapeType = CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE;
-                m_points = points;
-                m_numPoints = numPoints;
+        btConvexPointCloudShape(btVector3* points,int numPoints);
 
-                if (computeAabb)
-                        recalcLocalAabb();
-        }
-
-        void setPoints (btVector3* points, int numPoints, bool computeAabb = true)
-        {
-                m_points = points;
-                m_numPoints = numPoints;
-
-                if (computeAabb)
-                        recalcLocalAabb();
-        }
+        void setPoints (btVector3* points, int numPoints);
 
         btPoint3* getPoints()
@@ -63 +48 @@
         }
 
-#ifndef __SPU__
         virtual btVector3       localGetSupportingVertex(const btVector3& vec)const;
         virtual btVector3       localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
         virtual void    batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
-#endif
 
 

code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp

@@ -16 +16 @@
 #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
 
-btPolyhedralConvexShape::btPolyhedralConvexShape() :btConvexInternalShape(),
+btPolyhedralConvexShape::btPolyhedralConvexShape()
+:btConvexInternalShape(),
 m_localAabbMin(1,1,1),
 m_localAabbMax(-1,-1,-1),
@@ -24 +25 @@
 
 }
+
 
 

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

@@ -32 +32 @@
         bool            m_isLocalAabbValid;
 
+        btPolyhedralConvexShape();
 public:
 
-        btPolyhedralConvexShape();
+        
 
         //brute force implementations
-
         virtual btVector3       localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
         virtual void    batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
-
         
         virtual void    calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
-
-        void setCachedLocalAabb (const btVector3& aabbMin, const btVector3& aabbMax)
-        {
-                m_isLocalAabbValid = true;
-                m_localAabbMin = aabbMin;
-                m_localAabbMax = aabbMax;
-        }
-
-        inline void getCachedLocalAabb (btVector3& aabbMin, btVector3& aabbMax) const
-        {
-                btAssert(m_isLocalAabbValid);
-                aabbMin = m_localAabbMin;
-                aabbMax = m_localAabbMax;
-        }
 
         inline void getNonvirtualAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax, btScalar margin) const

code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp

@@ -18 +18 @@
 
 #include "LinearMath/btQuaternion.h"
+
+
+btSphereShape ::btSphereShape (btScalar radius) : btConvexInternalShape ()
+{
+        m_shapeType = SPHERE_SHAPE_PROXYTYPE;
+        m_implicitShapeDimensions.setX(radius);
+        m_collisionMargin = radius;
+}
 
 btVector3       btSphereShape::localGetSupportingVertexWithoutMargin(const btVector3& vec)const

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

@@ -28 +28 @@
         BT_DECLARE_ALIGNED_ALLOCATOR();
 
-        btSphereShape (btScalar radius) : btConvexInternalShape ()
-        {
-                m_shapeType = SPHERE_SHAPE_PROXYTYPE;
-                m_implicitShapeDimensions.setX(radius);
-                m_collisionMargin = radius;
-        }
+        btSphereShape (btScalar radius);
+        
         
         virtual btVector3       localGetSupportingVertex(const btVector3& vec)const;