RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

whoops, logic error in clipping parabola to t1 and t2

This commit is contained in:
David Rose 2007-10-17 16:29:24 +00:00
parent b280d1253c
commit e9240cfe24
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
panda/src/collide/collisionPolygon.cxx
View File

@ -831,22 +831,24 @@ test_intersection_from_parabola(const CollisionEntry &entry) const {
return NULL;
}
// No guarantee that t1 < t2. Enforce this.
if (t2 < t1) {
float tx = t1;
t1 = t2;
t2 = tx;
}
float t;
if (t1 >= parabola->get_t1() && t1 <= parabola->get_t2()) {
if (t2 >= parabola->get_t1() && t2 <= parabola->get_t2()) {
// Both intersection points are within our segment of the
// parabola. Choose the first of the two.
t = min(t1, t2);
} else {
// Only t1 is within our segment.
t = t1;
}
if (t2 < parabola->get_t1() || t1 > parabola->get_t2()) {
// The intersection points are before the start of the parabola
// or after the end of the parabola.
return NULL;
}
float t = t1;
if (t < parabola->get_t1()) {
} else if (t2 >= parabola->get_t1() && t2 <= parabola->get_t2()) {
// Only t2 is within our segment.
t = t2;
} else {
// Neither intersection point is within our segment.
return NULL;
}
LPoint3f plane_point = local_p.calc_point(t);