This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
*/
+/*
+typedef struct link_s
+{
+ struct link_s *prev, *next;
+} link_t;
+*/
+
+
+void ClearLink (link_t *l);
+void RemoveLink (link_t *l);
+void InsertLinkBefore (link_t *l, link_t *before);
+void InsertLinkAfter (link_t *l, link_t *after);
+
+// (type *)STRUCT_FROM_LINK(link_t *link, type, member)
+// ent = STRUCT_FROM_LINK(link,entity_t,order)
+// FIXME: remove this mess!
+//#define STRUCT_FROM_LINK(l,t,m) ((t *)((qbyte *)l - (int)&(((t *)0)->m)))
+
+#define EDICT_FROM_AREA(l) ((edict_t *)((qbyte *)l - (int)&(((edict_t *)0)->area)))
+
+//============================================================================
+
+// ClearLink is used for new headnodes
+void ClearLink (link_t *l)
+{
+ l->prev = l->next = l;
+}
+
+void RemoveLink (link_t *l)
+{
+ l->next->prev = l->prev;
+ l->prev->next = l->next;
+}
+
+void InsertLinkBefore (link_t *l, link_t *before)
+{
+ l->next = before;
+ l->prev = before->prev;
+ l->prev->next = l;
+ l->next->prev = l;
+}
+void InsertLinkAfter (link_t *l, link_t *after)
+{
+ l->next = after->next;
+ l->prev = after;
+ l->prev->next = l;
+ l->next->prev = l;
+}
+
typedef struct
{
for (i=0 ; i<6 ; i++)
{
box_clipnodes[i].planenum = i;
-
+
side = i&1;
-
+
box_clipnodes[i].children[side] = CONTENTS_EMPTY;
if (i != 5)
box_clipnodes[i].children[side^1] = i + 1;
else
box_clipnodes[i].children[side^1] = CONTENTS_SOLID;
-
+
box_planes[i].type = i>>1;
box_planes[i].normal[i>>1] = 1;
}
-
}
Host_Error ("SOLID_BSP without MOVETYPE_PUSH");
model = sv.models[ (int)ent->v.modelindex ];
+ Mod_CheckLoaded(model);
// LordHavoc: fixed SOLID_BSP error message
if (!model || model->type != mod_brush)
VectorSubtract (maxs, mins, size);
// LordHavoc: FIXME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- if (hlbsp)
+ if (sv.worldmodel->ishlbsp)
{
if (size[0] < 3)
hull = &model->hulls[0]; // 0x0x0
VectorSubtract (ent->v.mins, maxs, hullmins);
VectorSubtract (ent->v.maxs, mins, hullmaxs);
hull = SV_HullForBox (hullmins, hullmaxs);
-
+
VectorCopy (ent->v.origin, offset);
}
ClearLink (&anode->trigger_edicts);
ClearLink (&anode->solid_edicts);
-
+
if (depth == AREA_DEPTH)
{
anode->axis = -1;
anode->children[0] = anode->children[1] = NULL;
return anode;
}
-
+
VectorSubtract (maxs, mins, size);
if (size[0] > size[1])
anode->axis = 0;
else
anode->axis = 1;
-
+
anode->dist = 0.5 * (maxs[anode->axis] + mins[anode->axis]);
- VectorCopy (mins, mins1);
- VectorCopy (mins, mins2);
- VectorCopy (maxs, maxs1);
- VectorCopy (maxs, maxs2);
-
+ VectorCopy (mins, mins1);
+ VectorCopy (mins, mins2);
+ VectorCopy (maxs, maxs1);
+ VectorCopy (maxs, maxs2);
+
maxs1[anode->axis] = mins2[anode->axis] = anode->dist;
-
+
anode->children[0] = SV_CreateAreaNode (depth+1, mins2, maxs2);
anode->children[1] = SV_CreateAreaNode (depth+1, mins1, maxs1);
void SV_ClearWorld (void)
{
SV_InitBoxHull ();
-
+
memset (sv_areanodes, 0, sizeof(sv_areanodes));
sv_numareanodes = 0;
- SV_CreateAreaNode (0, sv.worldmodel->mins, sv.worldmodel->maxs);
+ Mod_CheckLoaded(sv.worldmodel);
+ SV_CreateAreaNode (0, sv.worldmodel->normalmins, sv.worldmodel->normalmaxs);
}
if (!touch->v.touch || touch->v.solid != SOLID_TRIGGER)
continue;
if (ent->v.absmin[0] > touch->v.absmax[0]
- || ent->v.absmin[1] > touch->v.absmax[1]
- || ent->v.absmin[2] > touch->v.absmax[2]
- || ent->v.absmax[0] < touch->v.absmin[0]
- || ent->v.absmax[1] < touch->v.absmin[1]
- || ent->v.absmax[2] < touch->v.absmin[2] )
+ || ent->v.absmin[1] > touch->v.absmax[1]
+ || ent->v.absmin[2] > touch->v.absmax[2]
+ || ent->v.absmax[0] < touch->v.absmin[0]
+ || ent->v.absmax[1] < touch->v.absmin[1]
+ || ent->v.absmax[2] < touch->v.absmin[2])
continue;
old_self = pr_global_struct->self;
old_other = pr_global_struct->other;
pr_global_struct->self = old_self;
pr_global_struct->other = old_other;
}
-
+
// recurse down both sides
if (node->axis == -1)
return;
-
+
// LordHavoc: optimized recursion
// if (ent->v.absmax[node->axis] > node->dist) SV_TouchLinks (ent, node->children[0]);
// if (ent->v.absmin[node->axis] < node->dist) SV_TouchLinks (ent, node->children[1]);
}
-/*
-===============
-SV_FindTouchedLeafs
-
-===============
-*/
-void SV_FindTouchedLeafs (edict_t *ent, mnode_t *node)
-{
- mplane_t *splitplane;
- mleaf_t *leaf;
- int sides;
- int leafnum;
-
-loc0:
- if (node->contents == CONTENTS_SOLID)
- return;
-
-// add an efrag if the node is a leaf
-
- if ( node->contents < 0)
- {
- if (ent->num_leafs == MAX_ENT_LEAFS)
- {
- Con_DPrintf("FindTouchedLeafs overflow\n");
- return;
- }
-
- leaf = (mleaf_t *)node;
- leafnum = leaf - sv.worldmodel->leafs - 1;
-
- ent->leafnums[ent->num_leafs] = leafnum;
- ent->num_leafs++;
- return;
- }
-
-// NODE_MIXED
-
- splitplane = node->plane;
- sides = BOX_ON_PLANE_SIDE(ent->v.absmin, ent->v.absmax, splitplane);
-
-// recurse down the contacted sides
- // LordHavoc: optimized recursion
-// if (sides & 1) SV_FindTouchedLeafs (ent, node->children[0]);
-// if (sides & 2) SV_FindTouchedLeafs (ent, node->children[1]);
- switch (sides)
- {
- case 1:
- node = node->children[0];
- goto loc0;
- case 2:
- node = node->children[1];
- goto loc0;
- default: // 3
- if (node->children[0]->contents != CONTENTS_SOLID)
- SV_FindTouchedLeafs (ent, node->children[0]);
- node = node->children[1];
- goto loc0;
- }
-}
-
/*
===============
SV_LinkEdict
if (ent->area.prev)
SV_UnlinkEdict (ent); // unlink from old position
-
+
if (ent == sv.edicts)
return; // don't add the world
// LordHavoc: enabling rotating bmodels
if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))
- { // expand for rotation
+ {
+ // expand for rotation
float max, v;
int i;
}
else
{
- VectorAdd (ent->v.origin, ent->v.mins, ent->v.absmin);
+ VectorAdd (ent->v.origin, ent->v.mins, ent->v.absmin);
VectorAdd (ent->v.origin, ent->v.maxs, ent->v.absmax);
}
ent->v.absmax[1] += 15;
}
else
- { // because movement is clipped an epsilon away from an actual edge,
+ {
+ // because movement is clipped an epsilon away from an actual edge,
// we must fully check even when bounding boxes don't quite touch
ent->v.absmin[0] -= 1;
ent->v.absmin[1] -= 1;
ent->v.absmax[2] += 1;
}
-// link to PVS leafs
- ent->num_leafs = 0;
- if (ent->v.modelindex)
- SV_FindTouchedLeafs (ent, sv.worldmodel->nodes);
-
if (ent->v.solid == SOLID_NOT)
return;
break; // crosses the node
}
-// link it in
+// link it in
if (ent->v.solid == SOLID_TRIGGER)
InsertLinkBefore (&ent->area, &node->trigger_edicts);
else
InsertLinkBefore (&ent->area, &node->solid_edicts);
-
+
// if touch_triggers, touch all entities at this node and descend for more
if (touch_triggers)
SV_TouchLinks ( ent, sv_areanodes );
{
while (num >= 0)
num = hull->clipnodes[num].children[(hull->planes[hull->clipnodes[num].planenum].type < 3 ? p[hull->planes[hull->clipnodes[num].planenum].type] : DotProduct (hull->planes[hull->clipnodes[num].planenum].normal, p)) < hull->planes[hull->clipnodes[num].planenum].dist];
-
+
return num;
}
{
trace_t trace;
- trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, 0, ent);
-
+ trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent);
+
if (trace.startsolid)
return sv.edicts;
-
+
return NULL;
}
*/
// 1/32 epsilon to keep floating point happy
-#define DIST_EPSILON (0.03125)
+#define DIST_EPSILON (0.03125)
-/*
-==================
-SV_RecursiveHullCheck
+#define HULLCHECKSTATE_EMPTY 0
+#define HULLCHECKSTATE_SOLID 1
+#define HULLCHECKSTATE_DONE 2
-==================
-*/
-/*
-qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace)
-{
- dclipnode_t *node;
- mplane_t *plane;
- float t1, t2;
- float frac;
- int i;
- vec3_t mid;
- int side;
- float midf;
+// LordHavoc: FIXME: this is not thread safe, if threading matters here, pass
+// this as a struct to RecursiveHullCheck, RecursiveHullCheck_Impact, etc...
+RecursiveHullCheckTraceInfo_t RecursiveHullCheckInfo;
+#define RHC RecursiveHullCheckInfo
-loc0:
-// check for empty
- if (num < 0)
- {
- if (num != CONTENTS_SOLID)
- {
- trace->allsolid = false;
- if (num == CONTENTS_EMPTY)
- trace->inopen = true;
- else
- trace->inwater = true;
- }
- else
- trace->startsolid = true;
- return true; // empty
- }
-
- if (num < hull->firstclipnode || num > hull->lastclipnode)
- Sys_Error ("SV_RecursiveHullCheck: bad node number");
+void SV_RecursiveHullCheck_Impact (mplane_t *plane, int side)
+{
+ // LordHavoc: using doubles for extra accuracy
+ double t1, t2, frac;
-//
-// find the point distances
-//
- node = hull->clipnodes + num;
- plane = hull->planes + node->planenum;
-
- t1 = PlaneDiff(p1, plane);
- t2 = PlaneDiff(p2, plane);
-
-#if 1
- if (t1 >= 0 && t2 >= 0)
- // LordHavoc: optimized recursion
-// return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2, trace);
- {
- num = node->children[0];
- goto loc0;
- }
- if (t1 < 0 && t2 < 0)
-// return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1, p2, trace);
+ // LordHavoc: now that we have found the impact, recalculate the impact
+ // point from scratch for maximum accuracy, with an epsilon bias on the
+ // surface distance
+ frac = plane->dist;
+ if (side)
{
- num = node->children[1];
- goto loc0;
+ frac -= DIST_EPSILON;
+ VectorNegate (plane->normal, RHC.trace->plane.normal);
+ RHC.trace->plane.dist = -plane->dist;
}
-#else
- if ( (t1 >= DIST_EPSILON && t2 >= DIST_EPSILON) || (t2 > t1 && t1 >= 0) )
- return SV_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2, trace);
- if ( (t1 <= -DIST_EPSILON && t2 <= -DIST_EPSILON) || (t2 < t1 && t1 <= 0) )
- return SV_RecursiveHullCheck (hull, node->children[1], p1f, p2f, p1, p2, trace);
-#endif
-
-// put the crosspoint DIST_EPSILON pixels on the near side
- if (t1 < 0)
- frac = bound(0, (t1 + DIST_EPSILON)/(t1-t2), 1);
else
- frac = bound(0, (t1 - DIST_EPSILON)/(t1-t2), 1);
-
- midf = p1f + (p2f - p1f)*frac;
- mid[0] = p1[0] + frac*(p2[0] - p1[0]);
- mid[1] = p1[1] + frac*(p2[1] - p1[1]);
- mid[2] = p1[2] + frac*(p2[2] - p1[2]);
-
- side = (t1 < 0);
-
-// move up to the node
- if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) )
- return false;
-
-#ifdef PARANOID
- if (SV_HullPointContents (hull, node->children[side], mid) == CONTENTS_SOLID)
- {
- Con_Printf ("mid PointInHullSolid\n");
- return false;
- }
-#endif
-
- if (SV_HullPointContents (hull, node->children[side^1], mid) != CONTENTS_SOLID)
-// go past the node
- return SV_RecursiveHullCheck (hull, node->children[side^1], midf, p2f, mid, p2, trace);
- // mid would need to be duplicated during recursion...
-*/
- /*
{
- p1f = midf;
- p1 = mid;
- num = node->children[side^1];
- goto loc0;
+ frac += DIST_EPSILON;
+ VectorCopy (plane->normal, RHC.trace->plane.normal);
+ RHC.trace->plane.dist = plane->dist;
}
- */
-/*
- if (trace->allsolid)
- return false; // never got out of the solid area
-
-//==================
-// the other side of the node is solid, this is the impact point
-//==================
- if (!side)
+ if (plane->type < 3)
{
- VectorCopy (plane->normal, trace->plane.normal);
- trace->plane.dist = plane->dist;
+ t1 = RHC.start[plane->type] - frac;
+ t2 = RHC.start[plane->type] + RHC.dist[plane->type] - frac;
}
else
{
- VectorNegate (plane->normal, trace->plane.normal);
- trace->plane.dist = -plane->dist;
- }
-
- while (SV_HullPointContents (hull, hull->firstclipnode, mid) == CONTENTS_SOLID)
- { // shouldn't really happen, but does occasionally
- frac -= 0.1;
- if (frac < 0)
- {
- trace->fraction = midf;
- VectorCopy (mid, trace->endpos);
- Con_DPrintf ("backup past 0\n");
- return false;
- }
- midf = p1f + (p2f - p1f)*frac;
- for (i=0 ; i<3 ; i++)
- mid[i] = p1[i] + frac*(p2[i] - p1[i]);
+ t1 = plane->normal[0] * RHC.start[0] + plane->normal[1] * RHC.start[1] + plane->normal[2] * RHC.start[2] - frac;
+ t2 = plane->normal[0] * (RHC.start[0] + RHC.dist[0]) + plane->normal[1] * (RHC.start[1] + RHC.dist[1]) + plane->normal[2] * (RHC.start[2] + RHC.dist[2]) - frac;
}
- trace->fraction = midf;
- VectorCopy (mid, trace->endpos);
+ frac = t1 / (t1 - t2);
+ frac = bound(0.0f, frac, 1.0);
- return false;
+ RHC.trace->fraction = frac;
+ RHC.trace->endpos[0] = RHC.start[0] + frac * RHC.dist[0];
+ RHC.trace->endpos[1] = RHC.start[1] + frac * RHC.dist[1];
+ RHC.trace->endpos[2] = RHC.start[2] + frac * RHC.dist[2];
}
-*/
-// LordHavoc: backported from my optimizations to PM_RecursiveHullCheck in QuakeForge newtree (QW)
-qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace)
+int SV_RecursiveHullCheck (int num, double p1f, double p2f, double p1[3], double p2[3])
{
dclipnode_t *node;
- mplane_t *plane;
- float t1, t2;
- float frac;
- int i;
- vec3_t mid;
int side;
- float midf;
+ double midf, mid[3];
+ // LordHavoc: FIXME: this is not thread safe... if threading matters here,
+ // remove the static prefixes
+ static int ret;
+ static mplane_t *plane;
+ static double t1, t2, frac;
// LordHavoc: a goto! everyone flee in terror... :)
loc0:
-// check for empty
+ // check for empty
if (num < 0)
{
- if (num != CONTENTS_SOLID)
+ RHC.trace->endcontents = num;
+ if (RHC.trace->startcontents)
{
- trace->allsolid = false;
- if (num == CONTENTS_EMPTY)
- trace->inopen = true;
+ if (num == RHC.trace->startcontents)
+ RHC.trace->allsolid = false;
else
- trace->inwater = true;
+ {
+ // if the first leaf is solid, set startsolid
+ if (RHC.trace->allsolid)
+ RHC.trace->startsolid = true;
+ return HULLCHECKSTATE_SOLID;
+ }
+ return HULLCHECKSTATE_EMPTY;
}
else
- trace->startsolid = true;
- return true; // empty
+ {
+ if (num != CONTENTS_SOLID)
+ {
+ RHC.trace->allsolid = false;
+ if (num == CONTENTS_EMPTY)
+ RHC.trace->inopen = true;
+ else
+ RHC.trace->inwater = true;
+ }
+ else
+ {
+ // if the first leaf is solid, set startsolid
+ if (RHC.trace->allsolid)
+ RHC.trace->startsolid = true;
+ return HULLCHECKSTATE_SOLID;
+ }
+ return HULLCHECKSTATE_EMPTY;
+ }
}
-// find the point distances
- node = hull->clipnodes + num;
- plane = hull->planes + node->planenum;
+ // find the point distances
+ node = RHC.hull->clipnodes + num;
+ plane = RHC.hull->planes + node->planenum;
if (plane->type < 3)
{
t1 = p1[plane->type] - plane->dist;
t2 = DotProduct (plane->normal, p2) - plane->dist;
}
- // LordHavoc: recursion optimization
- if (t1 >= 0 && t2 >= 0)
- {
- num = node->children[0];
- goto loc0;
- }
- if (t1 < 0 && t2 < 0)
- {
- num = node->children[1];
- goto loc0;
- }
-
-// put the crosspoint DIST_EPSILON pixels on the near side
- side = (t1 < 0);
- if (side)
- frac = bound(0, (t1 + DIST_EPSILON) / (t1 - t2), 1);
- else
- frac = bound(0, (t1 - DIST_EPSILON) / (t1 - t2), 1);
-
- midf = p1f + (p2f - p1f)*frac;
- for (i=0 ; i<3 ; i++)
- mid[i] = p1[i] + frac*(p2[i] - p1[i]);
-
-// move up to the node
- if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) )
- return false;
-
-#ifdef PARANOID
- if (SV_HullPointContents (pm_hullmodel, mid, node->children[side]) == CONTENTS_SOLID)
- {
- Con_Printf ("mid PointInHullSolid\n");
- return false;
- }
-#endif
-
- // LordHavoc: warning to the clumsy, this recursion can not be optimized because mid would need to be duplicated on a stack
- if (SV_HullPointContents (hull, node->children[side^1], mid) != CONTENTS_SOLID)
-// go past the node
- return SV_RecursiveHullCheck (hull, node->children[side^1], midf, p2f, mid, p2, trace);
-
- if (trace->allsolid)
- return false; // never got out of the solid area
-
-//==================
-// the other side of the node is solid, this is the impact point
-//==================
- if (!side)
+ // LordHavoc: rearranged the side/frac code
+ if (t1 >= 0)
{
- VectorCopy (plane->normal, trace->plane.normal);
- trace->plane.dist = plane->dist;
+ if (t2 >= 0)
+ {
+ num = node->children[0];
+ goto loc0;
+ }
+ // put the crosspoint DIST_EPSILON pixels on the near side
+ side = 0;
}
else
{
- VectorNegate (plane->normal, trace->plane.normal);
- trace->plane.dist = -plane->dist;
- }
-
- while (SV_HullPointContents (hull, hull->firstclipnode, mid) == CONTENTS_SOLID)
- { // shouldn't really happen, but does occasionally
- frac -= 0.1;
- if (frac < 0)
+ if (t2 < 0)
{
- trace->fraction = midf;
- VectorCopy (mid, trace->endpos);
- Con_DPrintf ("backup past 0\n");
- return false;
+ num = node->children[1];
+ goto loc0;
}
- midf = p1f + (p2f - p1f)*frac;
- for (i=0 ; i<3 ; i++)
- mid[i] = p1[i] + frac*(p2[i] - p1[i]);
+ // put the crosspoint DIST_EPSILON pixels on the near side
+ side = 1;
}
- trace->fraction = midf;
- VectorCopy (mid, trace->endpos);
+ frac = t1 / (t1 - t2);
+ frac = bound(0.0f, frac, 1.0);
- return false;
-}
+ midf = p1f + ((p2f - p1f) * frac);
+ mid[0] = RHC.start[0] + midf * RHC.dist[0];
+ mid[1] = RHC.start[1] + midf * RHC.dist[1];
+ mid[2] = RHC.start[2] + midf * RHC.dist[2];
-qboolean SV_TestLine (hull_t *hull, int num, vec3_t p1, vec3_t p2)
-{
- dclipnode_t *node;
- mplane_t *plane;
- float t1, t2, frac;
- vec3_t mid;
- int side;
+ // front side first
+ ret = SV_RecursiveHullCheck (node->children[side], p1f, midf, p1, mid);
+ if (ret != HULLCHECKSTATE_EMPTY)
+ return ret; // solid or done
+ ret = SV_RecursiveHullCheck (node->children[!side], midf, p2f, mid, p2);
+ if (ret != HULLCHECKSTATE_SOLID)
+ return ret; // empty or done
-loc0:
-// check for empty
- if (num < 0)
- return num != CONTENTS_SOLID;
-
- if (num < hull->firstclipnode || num > hull->lastclipnode)
- Sys_Error ("SV_RecursiveHullCheck: bad node number");
-
-//
-// find the point distances
-//
- node = hull->clipnodes + num;
- plane = hull->planes + node->planenum;
+ // front is air and back is solid, this is the impact point...
+ SV_RecursiveHullCheck_Impact(RHC.hull->planes + node->planenum, side);
- t1 = PlaneDiff(p1, plane);
- t2 = PlaneDiff(p2, plane);
-
- if (t1 >= 0 && t2 >= 0)
- {
- num = node->children[0];
- goto loc0;
- }
- if (t1 < 0 && t2 < 0)
- {
- num = node->children[1];
- goto loc0;
- }
-
-// put the crosspoint DIST_EPSILON pixels on the near side
- side = (t1 < 0);
-
- if (side)
- frac = bound(0, (t1 + DIST_EPSILON)/(t1-t2), 1);
- else
- frac = bound(0, (t1 - DIST_EPSILON)/(t1-t2), 1);
-
- mid[0] = p1[0] + frac*(p2[0] - p1[0]);
- mid[1] = p1[1] + frac*(p2[1] - p1[1]);
- mid[2] = p1[2] + frac*(p2[2] - p1[2]);
-
- if (node->children[side] < 0)
- {
- if (node->children[side] == CONTENTS_SOLID)
- return false;
- return SV_TestLine(hull, node->children[!side], mid, p2);
- }
- else if (SV_TestLine(hull, node->children[side], p1, mid))
- return SV_TestLine(hull, node->children[!side], mid, p2);
- else
- return false;
+ return HULLCHECKSTATE_DONE;
}
-
/*
==================
SV_ClipMoveToEntity
*/
trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end)
{
- trace_t trace;
- vec3_t offset;
- vec3_t start_l, end_l;
- hull_t *hull;
+ trace_t trace;
+ vec3_t offset, forward, left, up;
+ double startd[3], endd[3], tempd[3];
+ hull_t *hull;
// fill in a default trace
memset (&trace, 0, sizeof(trace_t));
trace.fraction = 1;
trace.allsolid = true;
- VectorCopy (end, trace.endpos);
// get the clipping hull
hull = SV_HullForEntity (ent, mins, maxs, offset);
- VectorSubtract (start, offset, start_l);
- VectorSubtract (end, offset, end_l);
+ VectorSubtract(start, offset, startd);
+ VectorSubtract(end, offset, endd);
-// LordHavoc: enabling rotating bmodels
// rotate start and end into the models frame of reference
if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))
{
- vec3_t forward, right, up;
- vec3_t temp;
-
- AngleVectors (ent->v.angles, forward, right, up);
-
- VectorCopy (start_l, temp);
- start_l[0] = DotProduct (temp, forward);
- start_l[1] = -DotProduct (temp, right);
- start_l[2] = DotProduct (temp, up);
-
- VectorCopy (end_l, temp);
- end_l[0] = DotProduct (temp, forward);
- end_l[1] = -DotProduct (temp, right);
- end_l[2] = DotProduct (temp, up);
+ AngleVectorsFLU (ent->v.angles, forward, left, up);
+ VectorCopy(startd, tempd);
+ startd[0] = DotProduct (tempd, forward);
+ startd[1] = DotProduct (tempd, left);
+ startd[2] = DotProduct (tempd, up);
+ VectorCopy(endd, tempd);
+ endd[0] = DotProduct (tempd, forward);
+ endd[1] = DotProduct (tempd, left);
+ endd[2] = DotProduct (tempd, up);
}
-// trace a line through the apropriate clipping hull
- SV_RecursiveHullCheck (hull, hull->firstclipnode, 0, 1, start_l, end_l, &trace);
+ VectorCopy(end, trace.endpos);
-// LordHavoc: enabling rotating bmodels
- // rotate endpos back to world frame of reference
- if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))
- {
- vec3_t a;
- vec3_t forward, right, up;
- vec3_t temp;
+// trace a line through the appropriate clipping hull
+ VectorCopy(startd, RecursiveHullCheckInfo.start);
+ VectorSubtract(endd, startd, RecursiveHullCheckInfo.dist);
+ RecursiveHullCheckInfo.hull = hull;
+ RecursiveHullCheckInfo.trace = &trace;
+ SV_RecursiveHullCheck (hull->firstclipnode, 0, 1, startd, endd);
- if (trace.fraction != 1)
+ // if we hit, unrotate endpos and normal, and store the entity we hit
+ if (trace.fraction != 1)
+ {
+ // rotate endpos back to world frame of reference
+ if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))
{
- VectorNegate (ent->v.angles, a);
- AngleVectors (a, forward, right, up);
-
- VectorCopy (trace.endpos, temp);
- trace.endpos[0] = DotProduct (temp, forward);
- trace.endpos[1] = -DotProduct (temp, right);
- trace.endpos[2] = DotProduct (temp, up);
-
- VectorCopy (trace.plane.normal, temp);
- trace.plane.normal[0] = DotProduct (temp, forward);
- trace.plane.normal[1] = -DotProduct (temp, right);
- trace.plane.normal[2] = DotProduct (temp, up);
+ VectorNegate (ent->v.angles, offset);
+ AngleVectorsFLU (offset, forward, left, up);
+
+ VectorCopy (trace.endpos, tempd);
+ trace.endpos[0] = DotProduct (tempd, forward);
+ trace.endpos[1] = DotProduct (tempd, left);
+ trace.endpos[2] = DotProduct (tempd, up);
+
+ VectorCopy (trace.plane.normal, tempd);
+ trace.plane.normal[0] = DotProduct (tempd, forward);
+ trace.plane.normal[1] = DotProduct (tempd, left);
+ trace.plane.normal[2] = DotProduct (tempd, up);
}
- }
-
-// fix trace up by the offset
- if (trace.fraction != 1)
+ // fix offset
VectorAdd (trace.endpos, offset, trace.endpos);
-
-// did we clip the move?
- if (trace.fraction < 1 || trace.startsolid )
+ trace.ent = ent;
+ }
+ else if (trace.allsolid || trace.startsolid)
trace.ent = ent;
return trace;
trace_t trace;
loc0:
+ if (clip->trace.allsolid)
+ return;
// touch linked edicts
for (l = node->solid_edicts.next ; l != &node->solid_edicts ; l = next)
{
if (touch == clip->passedict)
continue;
if (touch->v.solid == SOLID_TRIGGER)
- Sys_Error ("Trigger in clipping list");
+ Host_Error ("Trigger in clipping list");
if (clip->type == MOVE_NOMONSTERS && touch->v.solid != SOLID_BSP)
continue;
if (clip->boxmins[0] > touch->v.absmax[0]
- || clip->boxmins[1] > touch->v.absmax[1]
- || clip->boxmins[2] > touch->v.absmax[2]
- || clip->boxmaxs[0] < touch->v.absmin[0]
- || clip->boxmaxs[1] < touch->v.absmin[1]
- || clip->boxmaxs[2] < touch->v.absmin[2] )
+ || clip->boxmaxs[0] < touch->v.absmin[0]
+ || clip->boxmins[1] > touch->v.absmax[1]
+ || clip->boxmaxs[1] < touch->v.absmin[1]
+ || clip->boxmins[2] > touch->v.absmax[2]
+ || clip->boxmaxs[2] < touch->v.absmin[2])
continue;
- if (clip->passedict!=0 && clip->passedict->v.size[0] && !touch->v.size[0])
- continue; // points never interact
-
- // might intersect, so do an exact clip
- if (clip->trace.allsolid)
- return;
if (clip->passedict)
{
+ if (clip->passedict->v.size[0] && !touch->v.size[0])
+ continue; // points never interact
if (PROG_TO_EDICT(touch->v.owner) == clip->passedict)
continue; // don't clip against own missiles
if (PROG_TO_EDICT(clip->passedict->v.owner) == touch)
continue; // don't clip against owner
// LordHavoc: corpse code
- if (clip->passedict->v.solid == SOLID_CORPSE && touch->v.solid == SOLID_SLIDEBOX)
+ if (clip->passedict->v.solid == SOLID_CORPSE && (touch->v.solid == SOLID_SLIDEBOX || touch->v.solid == SOLID_CORPSE))
continue;
if (clip->passedict->v.solid == SOLID_SLIDEBOX && touch->v.solid == SOLID_CORPSE)
continue;
}
+ // might interact, so do an exact clip
if ((int)touch->v.flags & FL_MONSTER)
trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2, clip->maxs2, clip->end);
else
trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs, clip->end);
- if (trace.allsolid || trace.startsolid || trace.fraction < clip->trace.fraction)
+ // LordHavoc: take the 'best' answers from the new trace and combine with existing data
+ if (trace.allsolid)
+ clip->trace.allsolid = true;
+ if (trace.startsolid)
+ {
+ clip->trace.startsolid = true;
+ if (!clip->trace.ent)
+ clip->trace.ent = trace.ent;
+ }
+ if (trace.inopen)
+ clip->trace.inopen = true;
+ if (trace.inwater)
+ clip->trace.inwater = true;
+ if (trace.fraction < clip->trace.fraction)
+ {
+ clip->trace.fraction = trace.fraction;
+ VectorCopy(trace.endpos, clip->trace.endpos);
+ clip->trace.plane = trace.plane;
+ clip->trace.endcontents = trace.endcontents;
+ clip->trace.ent = trace.ent;
+ }
+ /*
+ if (trace.allsolid)
+ {
+ clip->trace = trace;
+ return;
+ }
+ if (trace.startsolid || trace.fraction < clip->trace.fraction)
{
- trace.ent = touch;
- if (clip->trace.startsolid)
+ if (clip->trace.startsolid)
{
clip->trace = trace;
clip->trace.startsolid = true;
else
clip->trace = trace;
}
- else if (trace.startsolid)
- clip->trace.startsolid = true;
+ */
}
-
+
// recurse down both sides
if (node->axis == -1)
return;
boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 9999;
#else
int i;
-
+
for (i=0 ; i<3 ; i++)
{
if (end[i] > start[i])
memset ( &clip, 0, sizeof ( moveclip_t ) );
-// clip to world
- clip.trace = SV_ClipMoveToEntity ( sv.edicts, start, mins, maxs, end );
-
clip.start = start;
clip.end = end;
clip.mins = mins;
}
else
{
- VectorCopy (mins, clip.mins2);
- VectorCopy (maxs, clip.maxs2);
+ VectorCopy (clip.mins, clip.mins2);
+ VectorCopy (clip.maxs, clip.maxs2);
}
-
-// create the bounding box of the entire move
- SV_MoveBounds ( start, clip.mins2, clip.maxs2, end, clip.boxmins, clip.boxmaxs );
-// clip to entities
- SV_ClipToLinks ( sv_areanodes, &clip );
+ // clip to world
+ clip.trace = SV_ClipMoveToEntity (sv.edicts, start, mins, maxs, end);
+
+ // clip to entities
+ //if (!clip.trace.allsolid)
+ {
+ // create the bounding box of the entire move
+ SV_MoveBounds ( start, clip.mins2, clip.maxs2, end, clip.boxmins, clip.boxmaxs );
+
+ SV_ClipToLinks ( sv_areanodes, &clip );
+ }
return clip.trace;
}
projects / xonotic / darkplaces.git / blobdiff