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.
*/
+cvar_t sv_useareanodes = {CVAR_NOTIFY, "sv_useareanodes", "1"};
-typedef struct
+void SV_World_Init(void)
{
- vec3_t boxmins, boxmaxs;// enclose the test object along entire move
- float *mins, *maxs; // size of the moving object
- vec3_t mins2, maxs2; // size when clipping against mosnters
- float *start, *end;
- trace_t trace;
- int type;
- edict_t *passedict;
-} moveclip_t;
-
-
-/*
-===============================================================================
+ Cvar_RegisterVariable(&sv_useareanodes);
+}
-HULL BOXES
-===============================================================================
-*/
+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);
+#define EDICT_FROM_AREA(l) ((edict_t *)((qbyte *)l - (int)&(((edict_t *)0)->area)))
-static hull_t box_hull;
-static dclipnode_t box_clipnodes[6];
-static mplane_t box_planes[6];
+//============================================================================
-/*
-===================
-SV_InitBoxHull
-
-Set up the planes and clipnodes so that the six floats of a bounding box
-can just be stored out and get a proper hull_t structure.
-===================
-*/
-void SV_InitBoxHull (void)
+// ClearLink is used for new headnodes
+void ClearLink (link_t *l)
{
- int i;
- int side;
-
- box_hull.clipnodes = box_clipnodes;
- box_hull.planes = box_planes;
- box_hull.firstclipnode = 0;
- box_hull.lastclipnode = 5;
-
- 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;
- }
-
+ l->prev = l->next = l;
}
-
-/*
-===================
-SV_HullForBox
-
-To keep everything totally uniform, bounding boxes are turned into small
-BSP trees instead of being compared directly.
-===================
-*/
-hull_t *SV_HullForBox (vec3_t mins, vec3_t maxs)
+void RemoveLink (link_t *l)
{
- box_planes[0].dist = maxs[0];
- box_planes[1].dist = mins[0];
- box_planes[2].dist = maxs[1];
- box_planes[3].dist = mins[1];
- box_planes[4].dist = maxs[2];
- box_planes[5].dist = mins[2];
-
- return &box_hull;
+ 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;
+}
-/*
-================
-SV_HullForEntity
-
-Returns a hull that can be used for testing or clipping an object of mins/maxs
-size.
-Offset is filled in to contain the adjustment that must be added to the
-testing object's origin to get a point to use with the returned hull.
-================
-*/
-hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
+typedef struct
{
- model_t *model;
- vec3_t size;
- vec3_t hullmins, hullmaxs;
- hull_t *hull;
-
-// decide which clipping hull to use, based on the size
- if (ent->v.solid == SOLID_BSP)
- { // explicit hulls in the BSP model
- if (ent->v.movetype != MOVETYPE_PUSH)
- Host_Error ("SOLID_BSP without MOVETYPE_PUSH");
+ // bounding box of entire move area
+ vec3_t boxmins, boxmaxs;
- model = sv.models[ (int)ent->v.modelindex ];
+ // size of the moving object
+ vec3_t mins, maxs;
- // LordHavoc: fixed SOLID_BSP error message
- if (!model || model->type != mod_brush)
- {
- Con_Printf ("SOLID_BSP with a non bsp model, entity dump:\n");
- ED_Print (ent);
- Host_Error ("SOLID_BSP with a non bsp model\n");
- }
+ // size when clipping against monsters
+ vec3_t mins2, maxs2;
- VectorSubtract (maxs, mins, size);
- // LordHavoc: FIXME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- if (size[0] < 3)
- hull = &model->hulls[0];
- else if (size[0] <= 32)
- hull = &model->hulls[1];
- else
- hull = &model->hulls[2];
+ // size when clipping against brush models
+ vec3_t hullmins, hullmaxs;
-// calculate an offset value to center the origin
- VectorSubtract (hull->clip_mins, mins, offset);
- VectorAdd (offset, ent->v.origin, offset);
- }
- else
- { // create a temp hull from bounding box sizes
+ // start and end origin of move
+ vec3_t start, end;
- VectorSubtract (ent->v.mins, maxs, hullmins);
- VectorSubtract (ent->v.maxs, mins, hullmaxs);
- hull = SV_HullForBox (hullmins, hullmaxs);
-
- VectorCopy (ent->v.origin, offset);
- }
+ // trace results
+ trace_t trace;
+ // type of move (like ignoring monsters, or similar)
+ int type;
- return hull;
+ // the edict that is moving (if any)
+ edict_t *passedict;
}
+moveclip_t;
+
/*
===============================================================================
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 ();
-
+ Collision_Init ();
+
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 = EDICT_TO_PROG(touch);
pr_global_struct->other = EDICT_TO_PROG(ent);
pr_global_struct->time = sv.time;
- PR_ExecuteProgram (touch->v.touch);
+ PR_ExecuteProgram (touch->v.touch, "");
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]);
+
if (ent->v.absmax[node->axis] > node->dist)
{
if (ent->v.absmin[node->axis] < node->dist)
}
-/*
-===============
-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)
- 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
*/
void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
{
+ model_t *model;
areanode_t *node;
if (ent->area.prev)
SV_UnlinkEdict (ent); // unlink from old position
-
+
if (ent == sv.edicts)
return; // don't add the world
// set the abs box
-// 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
- float max, v;
- int i;
-
- max = 0;
- for (i=0 ; i<3 ; i++)
+ if (ent->v.solid == SOLID_BSP)
+ {
+ if (ent->v.modelindex < 0 || ent->v.modelindex > MAX_MODELS)
+ PR_RunError("SOLID_BSP with invalid modelindex!\n");
+ model = sv.models[(int) ent->v.modelindex];
+ if (model != NULL)
{
- v =fabs( ent->v.mins[i]);
- if (v > max)
- max = v;
- v =fabs( ent->v.maxs[i]);
- if (v > max)
- max = v;
+ if (model->type != mod_brush)
+ PR_RunError("SOLID_BSP with non-BSP model\n");
+
+ if (ent->v.angles[0] || ent->v.angles[2] || ent->v.avelocity[0] || ent->v.avelocity[2])
+ {
+ VectorAdd(ent->v.origin, model->rotatedmins, ent->v.absmin);
+ VectorAdd(ent->v.origin, model->rotatedmaxs, ent->v.absmax);
+ }
+ else if (ent->v.angles[1] || ent->v.avelocity[1])
+ {
+ VectorAdd(ent->v.origin, model->yawmins, ent->v.absmin);
+ VectorAdd(ent->v.origin, model->yawmaxs, ent->v.absmax);
+ }
+ else
+ {
+ VectorAdd(ent->v.origin, model->normalmins, ent->v.absmin);
+ VectorAdd(ent->v.origin, model->normalmaxs, ent->v.absmax);
+ }
}
- for (i=0 ; i<3 ; i++)
+ else
{
- ent->v.absmin[i] = ent->v.origin[i] - max;
- ent->v.absmax[i] = ent->v.origin[i] + max;
+ // SOLID_BSP with no model is valid, mainly because some QC setup code does so temporarily
+ VectorAdd (ent->v.origin, ent->v.mins, ent->v.absmin);
+ VectorAdd (ent->v.origin, ent->v.maxs, ent->v.absmax);
}
}
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.absmin[0] -= 15;
ent->v.absmin[1] -= 15;
+ ent->v.absmin[2] -= 1;
ent->v.absmax[0] += 15;
ent->v.absmax[1] += 15;
+ ent->v.absmax[2] += 1;
}
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[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;
else
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 );
===============================================================================
*/
-// SV_HullPointContents moved to cpu_noasm.c
-
/*
============
SV_TestEntityPosition
This could be a lot more efficient...
============
*/
-edict_t *SV_TestEntityPosition (edict_t *ent)
+int SV_TestEntityPosition (edict_t *ent)
{
- trace_t trace;
-
- trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, 0, ent);
-
- if (trace.startsolid)
- return sv.edicts;
-
- return NULL;
+ return SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent).startsolid;
}
===============================================================================
*/
-// 1/32 epsilon to keep floating point happy
-#define DIST_EPSILON (0.03125)
-
-/*
-==================
-SV_RecursiveHullCheck
-
-==================
-*/
-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;
-
-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");
-
-//
-// 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);
- {
- num = node->children[1];
- goto loc0;
- }
-#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;
- }
- */
-
- 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)
- {
- VectorCopy (plane->normal, trace->plane.normal);
- trace->plane.dist = plane->dist;
- }
- else
- {
- // LordHavoc: unrolled vector operation because the compiler can't be sure vec3_origin is 0
-// VectorSubtract (vec3_origin, plane->normal, trace->plane.normal);
- trace->plane.normal[0] = -plane->normal[0];
- trace->plane.normal[1] = -plane->normal[1];
- trace->plane.normal[2] = -plane->normal[2];
- 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]);
- }
-
- trace->fraction = midf;
- VectorCopy (mid, trace->endpos);
-
- return false;
-}
-
-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;
-
-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;
-
- 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);
-// num = node->children[!side];
-// VectorCopy(mid, p1);
-// goto loc0;
- }
- else if (SV_TestLine(hull, node->children[side], p1, mid))
- {
- return SV_TestLine(hull, node->children[!side], mid, p2);
-// num = node->children[!side];
-// VectorCopy(mid, p1);
-// goto loc0;
- }
- else
- return false;
-}
-
-
/*
==================
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;
-
-// 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);
-
-// 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);
- }
-
-// trace a line through the apropriate clipping hull
- SV_RecursiveHullCheck (hull, hull->firstclipnode, 0, 1, start_l, end_l, &trace);
-
-// 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]) )
+ int i;
+ trace_t trace;
+ model_t *model;
+
+ i = ent->v.modelindex;
+ if ((unsigned int) i >= MAX_MODELS)
+ PR_RunError("SV_ClipMoveToEntity: invalid modelindex\n");
+ model = sv.models[i];
+ if (i != 0 && model == NULL)
+ PR_RunError("SV_ClipMoveToEntity: invalid modelindex\n");
+
+ if ((int) ent->v.solid == SOLID_BSP)
{
- vec3_t a;
- vec3_t forward, right, up;
- vec3_t temp;
-
- if (trace.fraction != 1)
+ Mod_CheckLoaded(model);
+ if (model->type != mod_brush)
{
- VectorSubtract (vec3_origin, 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);
+ Con_Printf ("SV_ClipMoveToEntity: SOLID_BSP with a non bsp model, entity dump:\n");
+ ED_Print (ent);
+ Host_Error ("SV_ClipMoveToEntity: SOLID_BSP with a non bsp model\n");
}
+ if (ent->v.movetype != MOVETYPE_PUSH)
+ Host_Error ("SV_ClipMoveToEntity: SOLID_BSP without MOVETYPE_PUSH");
}
-// fix trace up by the offset
- if (trace.fraction != 1)
- VectorAdd (trace.endpos, offset, trace.endpos);
-
-// did we clip the move?
- if (trace.fraction < 1 || trace.startsolid )
- trace.ent = ent;
+ Collision_ClipTrace(&trace, ent, model, ent->v.origin, ent->v.angles, ent->v.mins, ent->v.maxs, start, mins, maxs, end);
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");
+ {
+ ED_Print(touch);
+ 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;
}
- if ((int)touch->v.flags & FL_MONSTER)
+ // might interact, so do an exact clip
+ if (touch->v.solid == SOLID_BSP)
+ trace = SV_ClipMoveToEntity (touch, clip->start, clip->hullmins, clip->hullmaxs, clip->end);
+ else 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)
{
- trace.ent = touch;
- if (clip->trace.startsolid)
- {
- clip->trace = trace;
- clip->trace.startsolid = true;
- }
- else
- clip->trace = trace;
- }
- else 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;
+ }
}
-
+
// recurse down both sides
if (node->axis == -1)
return;
- // LordHavoc: optimized recursion
-// if (clip->boxmaxs[node->axis] > node->dist) SV_ClipToLinks(node->children[0], clip);
-// if (clip->boxmins[node->axis] < node->dist) SV_ClipToLinks(node->children[1], clip);
if (clip->boxmaxs[node->axis] > node->dist)
{
if (clip->boxmins[node->axis] < node->dist)
*/
void SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, vec3_t boxmins, vec3_t boxmaxs)
{
-#if 0
-// debug to test against everything
-boxmins[0] = boxmins[1] = boxmins[2] = -9999;
-boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 9999;
-#else
- int i;
-
- for (i=0 ; i<3 ; i++)
+ if (sv_useareanodes.integer)
{
- if (end[i] > start[i])
- {
- boxmins[i] = start[i] + mins[i] - 1;
- boxmaxs[i] = end[i] + maxs[i] + 1;
- }
- else
+ int i;
+
+ for (i=0 ; i<3 ; i++)
{
- boxmins[i] = end[i] + mins[i] - 1;
- boxmaxs[i] = start[i] + maxs[i] + 1;
+ if (end[i] > start[i])
+ {
+ boxmins[i] = start[i] + mins[i] - 1;
+ boxmaxs[i] = end[i] + maxs[i] + 1;
+ }
+ else
+ {
+ boxmins[i] = end[i] + mins[i] - 1;
+ boxmaxs[i] = start[i] + maxs[i] + 1;
+ }
}
}
-#endif
+ else
+ {
+ // debug to test against everything
+ boxmins[0] = boxmins[1] = boxmins[2] = -999999999;
+ boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 999999999;
+ }
}
/*
trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict)
{
moveclip_t clip;
+ vec3_t bigmins, bigmaxs;
int 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;
- clip.maxs = maxs;
+ VectorCopy(start, clip.start);
+ VectorCopy(end, clip.end);
+ VectorCopy(mins, clip.mins);
+ VectorCopy(maxs, clip.maxs);
clip.type = type;
clip.passedict = passedict;
+ Collision_RoundUpToHullSize(sv.worldmodel, clip.mins, clip.maxs, clip.hullmins, clip.hullmaxs);
+
if (type == MOVE_MISSILE)
{
+ // LordHavoc: modified this, was = -15, now = clip.mins[i] - 15
for (i=0 ; i<3 ; i++)
{
- clip.mins2[i] = -15;
- clip.maxs2[i] = 15;
+ clip.mins2[i] = clip.mins[i] - 15;
+ clip.maxs2[i] = clip.maxs[i] + 15;
}
}
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
+ bigmins[0] = min(clip.mins2[0], clip.hullmins[0]);
+ bigmaxs[0] = max(clip.maxs2[0], clip.hullmaxs[0]);
+ bigmins[1] = min(clip.mins2[1], clip.hullmins[1]);
+ bigmaxs[1] = max(clip.maxs2[1], clip.hullmaxs[1]);
+ bigmins[2] = min(clip.mins2[2], clip.hullmins[2]);
+ bigmaxs[2] = max(clip.maxs2[2], clip.hullmaxs[2]);
+
+ // clip to world
+ clip.trace = SV_ClipMoveToEntity (sv.edicts, start, mins, maxs, end);
+
+ // clip to entities
+ // create the bounding box of the entire move
+ SV_MoveBounds ( start, bigmins, bigmaxs, end, clip.boxmins, clip.boxmaxs );
+
SV_ClipToLinks ( sv_areanodes, &clip );
return clip.trace;
}
+