Changeset 2908 for code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified) (9 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp

@@ -23 +23 @@
 m_collisionMargin(btScalar(0.)),
 m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)),
-m_dynamicAabbTree(0),
-m_updateRevision(1)
+m_dynamicAabbTree(0)
 {
         m_shapeType = COMPOUND_SHAPE_PROXYTYPE;
@@ -48 +47 @@
 void    btCompoundShape::addChildShape(const btTransform& localTransform,btCollisionShape* shape)
 {
-        m_updateRevision++;
         //m_childTransforms.push_back(localTransform);
         //m_childShapes.push_back(shape);
@@ -57 +55 @@
         child.m_childMargin = shape->getMargin();
 
-        
+        m_children.push_back(child);
+
         //extend the local aabbMin/aabbMax
         btVector3 localAabbMin,localAabbMax;
@@ -76 +75 @@
         {
                 const btDbvtVolume      bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax);
-                int index = m_children.size();
+                int index = m_children.size()-1;
                 child.m_node = m_dynamicAabbTree->insert(bounds,(void*)index);
         }
-
-        m_children.push_back(child);
 
 }
@@ -103 +100 @@
 void btCompoundShape::removeChildShapeByIndex(int childShapeIndex)
 {
-        m_updateRevision++;
         btAssert(childShapeIndex >=0 && childShapeIndex < m_children.size());
         if (m_dynamicAabbTree)
@@ -118 +114 @@
 void btCompoundShape::removeChildShape(btCollisionShape* shape)
 {
-        m_updateRevision++;
         // Find the children containing the shape specified, and remove those children.
         //note: there might be multiple children using the same shape!
@@ -145 +140 @@
         // Recalculate the local aabb
         // Brute force, it iterates over all the shapes left.
-
         m_localAabbMin = btVector3(btScalar(1e30),btScalar(1e30),btScalar(1e30));
         m_localAabbMax = btVector3(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30));
@@ -168 +162 @@
 {
         btVector3 localHalfExtents = btScalar(0.5)*(m_localAabbMax-m_localAabbMin);
+        localHalfExtents += btVector3(getMargin(),getMargin(),getMargin());
         btVector3 localCenter = btScalar(0.5)*(m_localAabbMax+m_localAabbMin);
-        
-        //avoid an illegal AABB when there are no children
-        if (!m_children.size())
-        {
-                localHalfExtents.setValue(0,0,0);
-                localCenter.setValue(0,0,0);
-        }
-        localHalfExtents += btVector3(getMargin(),getMargin(),getMargin());
-                
 
         btMatrix3x3 abs_b = trans.getBasis().absolute();  
@@ -188 +174 @@
         aabbMin = center-extent;
         aabbMax = center+extent;
-        
+
 }