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

remove unneeded and troublesome CollisionSolid == CollisionSolid optimization

Browse Source
This commit is contained in:
David Rose 2011-01-18 22:37:58 +00:00
parent a8b7f6bc85
commit 97feb6bd97
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1195,21 +1195,24 @@ compare_collider_to_node(CollisionEntry &entry,
<< " which has " << num_solids << " collision solids.\n";
for (int s = 0; s < num_solids; ++s) {
entry._into = cnode->get_solid(s);
if (entry._from != entry._into) {
CPT(BoundingVolume) solid_bv = entry._into->get_bounds();
const GeometricBoundingVolume *solid_gbv = NULL;
if (num_solids > 1 &&
solid_bv->is_of_type(GeometricBoundingVolume::get_class_type())) {
// Only bother to test against each solid's bounding
// volume if we have more than one solid in the node, as a
// slight optimization. (If the node contains just one
// solid, then the node's bounding volume, which we just
// tested, is the same as the solid's bounding volume.)
DCAST_INTO_V(solid_gbv, solid_bv);
}
compare_collider_to_solid(entry, from_node_gbv, solid_gbv);
// We should allow a collision test for solid into itself,
// because the solid might be simply instanced into multiple
// different CollisionNodes. We are already filtering out tests
// for a CollisionNode into itself.
CPT(BoundingVolume) solid_bv = entry._into->get_bounds();
const GeometricBoundingVolume *solid_gbv = NULL;
if (num_solids > 1 &&
solid_bv->is_of_type(GeometricBoundingVolume::get_class_type())) {
// Only bother to test against each solid's bounding
// volume if we have more than one solid in the node, as a
// slight optimization. (If the node contains just one
// solid, then the node's bounding volume, which we just
// tested, is the same as the solid's bounding volume.)
DCAST_INTO_V(solid_gbv, solid_bv);
}
compare_collider_to_solid(entry, from_node_gbv, solid_gbv);
}
}
}