nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-29 23:22:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix non-rotating q3 bsp objects.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4094 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-07-23 02:34:20 +00:00
parent 8d3f45587e
commit 846a2264ba
1 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
engine/common/gl_q2bsp.c
View file

@ -5406,16 +5406,58 @@ trace_t CM_BoxTrace (model_t *mod, vec3_t start, vec3_t end,
qboolean CM_NativeTrace(model_t *model, int forcehullnum, int frame, vec3_t axis[3], vec3_t start, vec3_t end, vec3_t mins, vec3_t maxs, unsigned int contents, trace_t *trace) qboolean CM_NativeTrace(model_t *model, int forcehullnum, int frame, vec3_t axis[3], vec3_t start, vec3_t end, vec3_t mins, vec3_t maxs, unsigned int contents, trace_t *trace)
{ {
*trace = CM_BoxTrace(model, start, end, mins, maxs, contents); if (axis)
#ifdef TERRAIN
if (model->terrain)
{ {
trace_t hmt; vec3_t start_l;
Heightmap_Trace(model, forcehullnum, frame, axis, start, end, mins, maxs, contents, &hmt); vec3_t end_l;
if (hmt.fraction < trace->fraction) start_l[0] = DotProduct(start, axis[0]);
*trace = hmt; start_l[1] = DotProduct(start, axis[1]);
} start_l[2] = DotProduct(start, axis[2]);
end_l[0] = DotProduct(end, axis[0]);
end_l[1] = DotProduct(end, axis[1]);
end_l[2] = DotProduct(end, axis[2]);
*trace = CM_BoxTrace(model, start_l, end_l, mins, maxs, contents);
#ifdef TERRAIN
if (model->terrain)
{
trace_t hmt;
Heightmap_Trace(model, forcehullnum, frame, NULL, start, end, mins, maxs, contents, &hmt);
if (hmt.fraction < trace->fraction)
*trace = hmt;
}
#endif #endif
if (trace->fraction == 1)
{
VectorCopy (end, trace->endpos);
}
else
{
vec3_t iaxis[3];
vec3_t norm;
Matrix3x3_RM_Invert_Simple((void *)axis, iaxis);
VectorCopy(trace->plane.normal, norm);
trace->plane.normal[0] = DotProduct(norm, iaxis[0]);
trace->plane.normal[1] = DotProduct(norm, iaxis[1]);
trace->plane.normal[2] = DotProduct(norm, iaxis[2]);
/*just interpolate it, its easier than inverse matrix rotations*/
VectorInterpolate(start, trace->fraction, end, trace->endpos);
}
}
else
{
*trace = CM_BoxTrace(model, start, end, mins, maxs, contents);
#ifdef TERRAIN
if (model->terrain)
{
trace_t hmt;
Heightmap_Trace(model, forcehullnum, frame, NULL, start, end, mins, maxs, contents, &hmt);
if (hmt.fraction < trace->fraction)
*trace = hmt;
}
#endif
}
return trace->fraction != 1; return trace->fraction != 1;
} }