Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp
- Timestamp:
- May 3, 2011, 5:07:42 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp
r8351 r8393 86 86 } 87 87 88 void btCompoundShape::updateChildTransform(int childIndex, const btTransform& newChildTransform )88 void btCompoundShape::updateChildTransform(int childIndex, const btTransform& newChildTransform,bool shouldRecalculateLocalAabb) 89 89 { 90 90 m_children[childIndex].m_transform = newChildTransform; … … 100 100 } 101 101 102 recalculateLocalAabb(); 102 if (shouldRecalculateLocalAabb) 103 { 104 recalculateLocalAabb(); 105 } 103 106 } 104 107 … … 284 287 m_children[i].m_childShape->setLocalScaling(childScale); 285 288 childTrans.setOrigin((childTrans.getOrigin())*scaling); 286 updateChildTransform(i, childTrans );287 recalculateLocalAabb();288 }289 updateChildTransform(i, childTrans,false); 290 } 291 289 292 m_localScaling = scaling; 293 recalculateLocalAabb(); 294 290 295 } 291 296
Note: See TracChangeset
for help on using the changeset viewer.