reverted 'getActiveObjects', island management will be improved for Bullet 2.74 release.
The implementation was error-prone and could lead to crashes. See http://code.google.com/p/bullet/issues/detail?id=128
This commit is contained in:
@@ -117,28 +117,15 @@ void btCollisionWorld::addCollisionObject(btCollisionObject* collisionObject,sho
|
||||
}
|
||||
|
||||
|
||||
void btCollisionWorld::findActiveObjects()
|
||||
{
|
||||
m_activeObjects.resize(0);
|
||||
|
||||
for ( int i=0;i<m_collisionObjects.size();i++)
|
||||
{
|
||||
btCollisionObject* colObj = m_collisionObjects[i];
|
||||
if (colObj->isActive())
|
||||
{
|
||||
m_activeObjects.push_back(colObj);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void btCollisionWorld::updateAabbs()
|
||||
{
|
||||
BT_PROFILE("updateAabbs");
|
||||
|
||||
btTransform predictedTrans;
|
||||
for ( int i=0;i<m_activeObjects.size();i++)
|
||||
for ( int i=0;i<m_collisionObjects.size();i++)
|
||||
{
|
||||
btCollisionObject* colObj = m_activeObjects[i];
|
||||
btCollisionObject* colObj = m_collisionObjects[i];
|
||||
|
||||
//only update aabb of active objects
|
||||
if (colObj->isActive())
|
||||
|
||||
Reference in New Issue
Block a user