Changeset 1972 for code/branches/physics/src/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp

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.

File:

• code/branches/physics/src/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp (modified) (4 diffs)

code/branches/physics/src/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp

@@ -30 +30 @@
         mem = btAlignedAlloc(sizeof(btSoftSoftCollisionAlgorithm::CreateFunc),16);
         m_softSoftCreateFunc = new(mem) btSoftSoftCollisionAlgorithm::CreateFunc;
-
+        
         mem = btAlignedAlloc(sizeof(btSoftRigidCollisionAlgorithm::CreateFunc),16);
         m_softRigidConvexCreateFunc = new(mem) btSoftRigidCollisionAlgorithm::CreateFunc;
-
+        
         mem = btAlignedAlloc(sizeof(btSoftRigidCollisionAlgorithm::CreateFunc),16);
         m_swappedSoftRigidConvexCreateFunc = new(mem) btSoftRigidCollisionAlgorithm::CreateFunc;
@@ -41 +41 @@
         mem = btAlignedAlloc(sizeof(btSoftBodyConcaveCollisionAlgorithm::CreateFunc),16);
         m_softRigidConcaveCreateFunc = new(mem) btSoftBodyConcaveCollisionAlgorithm::CreateFunc;
-
+        
         mem = btAlignedAlloc(sizeof(btSoftBodyConcaveCollisionAlgorithm::CreateFunc),16);
         m_swappedSoftRigidConcaveCreateFunc = new(mem) btSoftBodyConcaveCollisionAlgorithm::SwappedCreateFunc;
@@ -48 +48 @@
 
         //replace pool by a new one, with potential larger size
-
+        
         if (m_ownsCollisionAlgorithmPool && m_collisionAlgorithmPool)
         {
                 int curElemSize = m_collisionAlgorithmPool->getElementSize();
                 ///calculate maximum element size, big enough to fit any collision algorithm in the memory pool
-
-
+                
+                
                 int maxSize0 = sizeof(btSoftSoftCollisionAlgorithm);
                 int maxSize1 = sizeof(btSoftRigidCollisionAlgorithm);
@@ -93 +93 @@
 #endif
 }
-
+        
 ///creation of soft-soft and soft-rigid, and otherwise fallback to base class implementation
 btCollisionAlgorithmCreateFunc* btSoftBodyRigidBodyCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1)