qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-18 09:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the last few bugs breaking the distance code.

Browse source 
The code itself seems to work now. There are still some problems: the box
faces are using unit vectors for the edges, or I should go back to unit
vectors for the portal edges; starting in a solid corner won't always work;
etc. However, that's just mopping up: the main algorithm seems to be
working.
This commit is contained in:
Bill Currie 2011-11-28 09:24:13 +09:00
parent 996859c367
commit 60dbc0e342
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/models/trace.c
View file

@ -224,8 +224,8 @@ edge_portal_dist (const plane_t *plane, const clipport_t *portal,
t1 = PlaneDiff (p1, plane); t1 = PlaneDiff (p1, plane);
t2 = PlaneDiff (p2, plane); t2 = PlaneDiff (p2, plane);
// ensure p1 is the closest point to the plane // ensure p1 is the closest point to the plane
if ((0 < t1 && t1 > t2) if ((0 < t2 && t2 < t1)
|| (0 > t1 && t1 < t2)) { || (0 > t2 && t2 > t1)) {
// p2 is closer to the plane, so swap the points and times // p2 is closer to the plane, so swap the points and times
const vec_t *r = p2; const vec_t *r = p2;
vec_t t = t2; vec_t t = t2;
@ -242,8 +242,8 @@ edge_portal_dist (const plane_t *plane, const clipport_t *portal,
vec3_t x, c; vec3_t x, c;
vec3_t imp; vec3_t imp;
t1 /= -vn; t1 /= vn;
if (t1 >= 1) { if (t1 <= -1) {
// the edge doesn't make it as far as the portal's plane // the edge doesn't make it as far as the portal's plane
return 1; return 1;
} }
@ -257,7 +257,7 @@ edge_portal_dist (const plane_t *plane, const clipport_t *portal,
if (i == winding->numpoints) { if (i == winding->numpoints) {
// the closer end of the edge hit the portal, so t1 is the // the closer end of the edge hit the portal, so t1 is the
// fraction // fraction
return t1; return -t1;
} }
// the closer end of the edge missed the portal, check the farther // the closer end of the edge missed the portal, check the farther
// end, but only with this portal edge. // end, but only with this portal edge.
@ -294,7 +294,7 @@ edge_portal_dist (const plane_t *plane, const clipport_t *portal,
if (!vn) // FIXME epsilon if (!vn) // FIXME epsilon
continue; // portal edge is parallel to the plane continue; // portal edge is parallel to the plane
t = PlaneDiff (r, &ep) / vn; t = PlaneDiff (r, &ep) / vn;
if (t < -1) if (t < -1 || t > 0)
continue; // portal edge does not reach the plane continue; // portal edge does not reach the plane
// impact point of portal edge with the plane // impact point of portal edge with the plane
VectorMultSub (r, t, v, x); VectorMultSub (r, t, v, x);