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

fix compilation error (constant integer overflow)

Browse Source
This commit is contained in:
David Rose 2009-08-11 17:35:48 +00:00
parent 57e6e80491
commit 3dbd0672f7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/collide/collisionHandlerHighestEvent.cxx
View File

@ -48,10 +48,11 @@ begin_group() {
<< "begin_group.\n"; << "begin_group.\n";
} }
_last_colliding.clear(); _last_colliding.clear();
if(_closest_collider) if (_closest_collider) {
bool inserted = _last_colliding.insert(_closest_collider).second; bool inserted = _last_colliding.insert(_closest_collider).second;
}
_current_colliding.clear(); _current_colliding.clear();
_collider_distance = 10000000000; _collider_distance = 0;
_closest_collider = NULL; _closest_collider = NULL;
} }
@ -65,10 +66,10 @@ void CollisionHandlerHighestEvent::
add_entry(CollisionEntry *entry) { add_entry(CollisionEntry *entry) {
nassertv(entry != (CollisionEntry *)NULL); nassertv(entry != (CollisionEntry *)NULL);
LVector3f vec = LVector3f vec =
entry->get_surface_point(entry->get_from_node_path()) - entry->get_surface_point(entry->get_from_node_path()) -
entry->get_from()->get_collision_origin(); entry->get_from()->get_collision_origin();
double dist = vec.length_squared(); double dist = vec.length_squared();
if(dist < _collider_distance) { if (_closest_collider == NULL || dist < _collider_distance) {
_collider_distance = dist; _collider_distance = dist;
_closest_collider = entry; _closest_collider = entry;
} }
@ -84,7 +85,8 @@ add_entry(CollisionEntry *entry) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool CollisionHandlerHighestEvent:: bool CollisionHandlerHighestEvent::
end_group() { end_group() {
if(_closest_collider) if (_closest_collider) {
bool inserted = _current_colliding.insert(_closest_collider).second; bool inserted = _current_colliding.insert(_closest_collider).second;
}
return CollisionHandlerEvent::end_group(); return CollisionHandlerEvent::end_group();
} }