qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

check if the physent bbox (if there is one available) interects with the

Browse source 
bbox of the move and don't bother calling PM_RecursiveHullCheck if it
doesn't. Results in PM_RecursiveHullCheck getting about 5% of the calls it
used to (for overkill).
This commit is contained in:
Bill Currie 2004-02-17 04:29:26 +00:00
parent 526605c99c
commit 46a3f91146
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
qw/source/pmovetst.c
View file

@ -410,15 +410,29 @@ PM_TestPlayerPosition (const vec3_t pos)
return true; return true;
} }
static inline int
bboxes_touch (const vec3_t min1, const vec3_t max1,
const vec3_t min2, const vec3_t max2)
{
if (min1[0] > max2[0] || max1[0] < min2[0])
return 0;
if (min1[1] > max2[1] || max1[1] < min2[1])
return 0;
if (min1[2] > max2[2] || max1[2] < min2[2])
return 0;
return 1;
}
/* PM_PlayerMove */ /* PM_PlayerMove */
pmtrace_t pmtrace_t
PM_PlayerMove (const vec3_t start, const vec3_t end) PM_PlayerMove (const vec3_t start, const vec3_t end)
{ {
hull_t *hull; hull_t *hull;
int i; int i, check_box;
physent_t *pe; physent_t *pe;
pmtrace_t trace, total; pmtrace_t trace, total;
vec3_t maxs, mins, offset, start_l, end_l; vec3_t maxs, mins, offset, start_l, end_l;
vec3_t move[2];
// fill in a default trace // fill in a default trace
memset (&total, 0, sizeof (pmtrace_t)); memset (&total, 0, sizeof (pmtrace_t));
@ -432,9 +446,13 @@ PM_PlayerMove (const vec3_t start, const vec3_t end)
// get the clipping hull // get the clipping hull
if (pe->hull) { if (pe->hull) {
hull = pe->hull; hull = pe->hull;
check_box = 0;
} else { } else {
check_box = 1;
if (pe->model) { if (pe->model) {
hull = &pmove.physents[i].model->hulls[1]; hull = &pe->model->hulls[1];
VectorSubtract (pe->model->mins, player_maxs, mins);
VectorSubtract (pe->model->maxs, player_mins, maxs);
} else { } else {
VectorSubtract (pe->mins, player_maxs, mins); VectorSubtract (pe->mins, player_maxs, mins);
VectorSubtract (pe->maxs, player_mins, maxs); VectorSubtract (pe->maxs, player_mins, maxs);
@ -448,6 +466,15 @@ PM_PlayerMove (const vec3_t start, const vec3_t end)
VectorSubtract (start, offset, start_l); VectorSubtract (start, offset, start_l);
VectorSubtract (end, offset, end_l); VectorSubtract (end, offset, end_l);
move[0][0] = min (start_l[0], end_l[0]);
move[0][1] = min (start_l[1], end_l[1]);
move[0][2] = min (start_l[2], end_l[2]);
move[1][0] = max (start_l[0], end_l[0]);
move[1][1] = max (start_l[1], end_l[1]);
move[1][2] = max (start_l[2], end_l[2]);
if (check_box && !bboxes_touch (move[0], move[1], mins, maxs))
continue;
// fill in a default trace // fill in a default trace
memset (&trace, 0, sizeof (pmtrace_t)); memset (&trace, 0, sizeof (pmtrace_t));