Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (modified) (8 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp

@@ -1 +1 @@
 /*
 Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 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.
@@ -13 +13 @@
 3. This notice may not be removed or altered from any source distribution.
 */
+
 #include "btConvexTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btCollisionMargin.h"
@@ -21 +22 @@
 
 btConvexTriangleMeshShape ::btConvexTriangleMeshShape (btStridingMeshInterface* meshInterface, bool calcAabb)
-: btPolyhedralConvexShape(), m_stridingMesh(meshInterface)
+: btPolyhedralConvexAabbCachingShape(), m_stridingMesh(meshInterface)
 {
         m_shapeType = CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE;
@@ -44 +45 @@
         LocalSupportVertexCallback(const btVector3& supportVecLocal)
                 : m_supportVertexLocal(btScalar(0.),btScalar(0.),btScalar(0.)),
-                m_maxDot(btScalar(-1e30)),
+                m_maxDot(btScalar(-BT_LARGE_FLOAT)),
                 m_supportVecLocal(supportVecLocal)
         {
@@ -92 +93 @@
 
         LocalSupportVertexCallback      supportCallback(vec);
-        btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));
+        btVector3 aabbMax(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
         m_stridingMesh->InternalProcessAllTriangles(&supportCallback,-aabbMax,aabbMax);
         supVec = supportCallback.GetSupportVertexLocal();
@@ -105 +106 @@
                 for (int i=0;i<numVectors;i++)
                 {
-                        supportVerticesOut[i][3] = btScalar(-1e30);
+                        supportVerticesOut[i][3] = btScalar(-BT_LARGE_FLOAT);
                 }
         }
@@ -116 +117 @@
                 const btVector3& vec = vectors[j];
                 LocalSupportVertexCallback      supportCallback(vec);
-                btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));
+                btVector3 aabbMax(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
                 m_stridingMesh->InternalProcessAllTriangles(&supportCallback,-aabbMax,aabbMax);
                 supportVerticesOut[j] = supportCallback.GetSupportVertexLocal();
@@ -298 +299 @@
 
    CenterCallback centerCallback;
-   btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));
+   btVector3 aabbMax(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
    m_stridingMesh->InternalProcessAllTriangles(&centerCallback, -aabbMax, aabbMax);
    btVector3 center = centerCallback.getCenter();