TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix hard crash with too many solids per from collisionnode

Browse Source
This commit is contained in:
David Rose 2006-05-18 13:47:53 +00:00
parent df9ae1f69f
commit eb0757e5f7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/collide/collisionTraverser.cxx
View File

@ -470,6 +470,11 @@ prepare_colliders(CollisionTraverser::LevelStates &level_states,
int max_colliders = CollisionLevelState::get_max_colliders();
CollisionLevelState level_state(root);
// This reserve() call is only correct if there is exactly one solid
// per collider added to the traverser, which is the normal case.
// If there is more than one solid in any of the colliders, this
// reserve() call won't reserve enough, but the code is otherwise
// correct.
level_state.reserve(min(num_colliders, max_colliders));
OrderedColliders::iterator oci;
@ -500,7 +505,6 @@ prepare_colliders(CollisionTraverser::LevelStates &level_states,
CollisionSolid *collider = cnode->get_solid(s);
def._collider = collider;
level_state.prepare_collider(def);
--num_colliders;
if (level_state.get_num_colliders() == max_colliders) {
// That's the limit. Save off this level state and make a
@ -510,12 +514,15 @@ prepare_colliders(CollisionTraverser::LevelStates &level_states,
level_state.reserve(min(num_colliders, max_colliders));
}
}
--num_colliders;
nassertv(num_colliders >= 0);
}
}
if (level_state.get_num_colliders() != 0) {
level_states.push_back(level_state);
}
nassertv(num_colliders == 0);
}
////////////////////////////////////////////////////////////////////