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

prevent infinite recursion

Browse Source
This commit is contained in:
David Rose 2008-03-24 23:05:47 +00:00
parent 81bef7355c
commit 336fb90627
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/collide/collisionSphere.cxx
View File

@ -767,6 +767,7 @@ intersects_parabola(double &t, const Parabolaf &parabola,
// point and comparing its distance from the linear intervening // point and comparing its distance from the linear intervening
// point. // point.
double tmid = (t1 + t2) * 0.5; double tmid = (t1 + t2) * 0.5;
if (tmid != t1 && tmid != t2) {
LPoint3f pmid = parabola.calc_point(tmid); LPoint3f pmid = parabola.calc_point(tmid);
LPoint3f pmid2 = (p1 + p2) * 0.5f; LPoint3f pmid2 = (p1 + p2) * 0.5f;
@ -777,6 +778,7 @@ intersects_parabola(double &t, const Parabolaf &parabola,
} }
return intersects_parabola(t, parabola, tmid, t2, pmid, p2); return intersects_parabola(t, parabola, tmid, t2, pmid, p2);
} }
}
// The line segment is sufficiently close; compare the segment itself. // The line segment is sufficiently close; compare the segment itself.
double t1a, t2a; double t1a, t2a;

3
panda/src/collide/collisionTube.cxx
View File

@ -853,6 +853,8 @@ intersects_parabola(double &t, const Parabolaf &parabola,
// point and comparing its distance from the linear intervening // point and comparing its distance from the linear intervening
// point. // point.
double tmid = (t1 + t2) * 0.5; double tmid = (t1 + t2) * 0.5;
if (tmid != t1 && tmid != t2) {
LPoint3f pmid = parabola.calc_point(tmid); LPoint3f pmid = parabola.calc_point(tmid);
LPoint3f pmid2 = (p1 + p2) * 0.5f; LPoint3f pmid2 = (p1 + p2) * 0.5f;
@ -863,6 +865,7 @@ intersects_parabola(double &t, const Parabolaf &parabola,
} }
return intersects_parabola(t, parabola, tmid, t2, pmid, p2); return intersects_parabola(t, parabola, tmid, t2, pmid, p2);
} }
}
// The line segment is sufficiently close; compare the segment itself. // The line segment is sufficiently close; compare the segment itself.
double t1a, t2a; double t1a, t2a;