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

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2001-02-20 04:18:56 +00:00
parent 9e9defff7e
commit ac8e41503c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
panda/src/collide/collisionHandlerFloor.cxx
View File

@ -68,10 +68,8 @@ handle_entries() {
nassertv(entry != (CollisionEntry *)NULL); nassertv(entry != (CollisionEntry *)NULL);
nassertv(from_node == entry->get_from_node()); nassertv(from_node == entry->get_from_node());
if (entry->has_into_intersection_point()) { if (entry->has_from_intersection_point()) {
LPoint3f point = LPoint3f point = entry->get_from_intersection_point();
entry->get_into_intersection_point() *
entry->get_into_space();
if (collide_cat.is_debug()) { if (collide_cat.is_debug()) {
collide_cat.debug() collide_cat.debug()
<< "Intersection point detected at " << point << "\n"; << "Intersection point detected at " << point << "\n";
@ -86,21 +84,19 @@ handle_entries() {
} }
// Now set our height accordingly. // Now set our height accordingly.
LMatrix4f mat; if (!IS_THRESHOLD_ZERO(max_height + _offset, 0.001)) {
def.get_mat(mat);
if (!IS_THRESHOLD_EQUAL(mat(3, 2), max_height + _offset, 0.001)) {
if (collide_cat.is_debug()) { if (collide_cat.is_debug()) {
collide_cat.debug() collide_cat.debug()
<< "Resetting height to " << max_height << " + " << "Adjusting height by " << max_height + _offset << "\n";
<< _offset << "\n";
} }
mat(3, 2) = max_height + _offset; LMatrix4f mat;
def.get_mat(mat);
mat(3, 2) += max_height + _offset;
def.set_mat(mat); def.set_mat(mat);
} else { } else {
if (collide_cat.is_spam()) { if (collide_cat.is_spam()) {
collide_cat.spam() collide_cat.spam()
<< "Height is already at " << max_height << " + " << "Leaving height unchanged.\n";
<< _offset << "\n";
} }
} }
} }