qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move the trace into the leaf before testing the contents.

Browse source 
The trace is moved as far into the leaf as possible without leaving the
other side of the leaf. This ensures that trace_contents is started from a
good location. There is currently a problem with traces that stradle a
plane getting, but this has cleared up all the current contents related
tests.
This commit is contained in:
Bill Currie 2011-12-05 21:47:21 +09:00
parent c588d28b96
commit 4419d4c4ad
1 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
libs/models/trace.c
View file

@ -65,7 +65,7 @@ typedef struct {
} tracestack_t;
static inline float
calc_offset (trace_t *trace, plane_t *plane)
calc_offset (const trace_t *trace, const plane_t *plane)
{
vec_t d = 0;
vec3_t Rn;
@ -636,12 +636,41 @@ typedef struct {
qboolean seen_solid;
qboolean moved;
plane_t *split_plane;
vec3_t vel;
vec3_t dist;
const vec_t *origin;
const vec_t *start_point;
const vec_t *end_point;
} trace_state_t;
static void
trace_to_leaf (const hull_t *hull, const clipleaf_t *leaf,
const trace_t *trace, const trace_state_t *state, vec3_t stop)
{
clipport_t *portal;
plane_t *plane;
int side;
vec_t frac = 1;
vec_t t1, t2, offset, f;
qboolean clipped = false;
for (portal = leaf->portals; portal; portal = portal->next[side]) {
side = portal->leafs[1] == leaf;
plane = hull->planes + portal->planenum;
t1 = PlaneDiff (state->start_point, plane);
t2 = PlaneDiff (state->end_point, plane);
offset = calc_offset (trace, plane);
f = (t1 + (t1 < 0 ? offset : -offset)) / (t1 - t2);
if (f > 0) {
clipped = true;
if (f < frac)
frac = f;
}
}
if (!clipped)
frac = 0;
VectorMultAdd (state->start_point, frac, state->dist, stop);
}
static int
visit_leaf (hull_t *hull, int num, clipleaf_t *leaf, trace_t *trace,
trace_state_t *state)
@ -652,14 +681,17 @@ visit_leaf (hull_t *hull, int num, clipleaf_t *leaf, trace_t *trace,
// if leaf is null, assume we're in the leaf
// if plane is null, the trace did not cross the last node plane
if (trace->type != tr_point) {
vec3_t origin;
if (state->split_plane
&& !trace_enters_leaf (hull, trace, leaf, state->split_plane,
state->vel, state->origin))
state->dist, state->origin))
return 0; // we're not here
//FIXME this is probably slow
trace_to_leaf (hull, leaf, trace, state, origin);
test_count++;
trace->contents = 0;
contents = trace_contents (hull, trace, leaf, state->origin);
contents = trace_contents (hull, trace, leaf, origin);
} else {
contents = num;
}
@ -715,8 +747,7 @@ MOD_TraceLine (hull_t *hull, int num,
VectorCopy (start_point, start);
VectorCopy (end_point, end);
VectorSubtract (end, start, trace_state.vel);
VectorNormalize (trace_state.vel);
VectorSubtract (end, start, trace_state.dist);
tstack = tracestack;
trace_state.start_point = start_point;