*/
cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0"};
-cvar_t sv_polygoncollisions = {CVAR_NOTIFY, "sv_polygoncollisions", "0"};
cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64"};
void SV_AreaStats_f(void);
void SV_World_Init(void)
{
Cvar_RegisterVariable(&sv_debugmove);
- Cvar_RegisterVariable(&sv_polygoncollisions);
Cvar_RegisterVariable(&sv_areagrid_mingridsize);
Cmd_AddCommand("sv_areastats", SV_AreaStats_f);
Collision_Init();
}
-typedef struct
-{
- // bounding box of entire move area
- vec3_t boxmins, boxmaxs;
-
- // size of the moving object
- vec3_t mins, maxs;
-
- // size when clipping against monsters
- vec3_t mins2, maxs2;
-
- // size when clipping against brush models
- vec3_t hullmins, hullmaxs;
-
- // start and end origin of move
- vec3_t start, end;
-
- // trace results
- trace_t trace;
-
- // type of move (like ignoring monsters, or similar)
- int type;
-
- // the edict that is moving (if any)
- edict_t *passedict;
-}
-moveclip_t;
-
//============================================================================
// ClearLink is used for new headnodes
typedef struct areagrid_s
{
- link_t trigger_edicts;
- link_t solid_edicts;
+ link_t edicts;
}
areagrid_t;
void SV_CreateAreaGrid (vec3_t mins, vec3_t maxs)
{
int i;
- ClearLink (&sv_areagrid_outside.trigger_edicts);
- ClearLink (&sv_areagrid_outside.solid_edicts);
+ ClearLink (&sv_areagrid_outside.edicts);
// choose either the world box size, or a larger box to ensure the grid isn't too fine
sv_areagrid_size[0] = max(maxs[0] - mins[0], AREA_GRID * sv_areagrid_mingridsize.value);
sv_areagrid_size[1] = max(maxs[1] - mins[1], AREA_GRID * sv_areagrid_mingridsize.value);
sv_areagrid_scale[2] = AREA_GRID / sv_areagrid_size[2];
for (i = 0;i < AREA_GRIDNODES;i++)
{
- ClearLink (&sv_areagrid[i].trigger_edicts);
- ClearLink (&sv_areagrid[i].solid_edicts);
+ ClearLink (&sv_areagrid[i].edicts);
}
Con_DPrintf("sv_areagrid settings: divisions %ix%ix1 : box %f %f %f : %f %f %f size %f %f %f grid %f %f %f (mingrid %f)\n", AREA_GRID, AREA_GRID, sv_areagrid_mins[0], sv_areagrid_mins[1], sv_areagrid_mins[2], sv_areagrid_maxs[0], sv_areagrid_maxs[1], sv_areagrid_maxs[2], sv_areagrid_size[0], sv_areagrid_size[1], sv_areagrid_size[2], 1.0f / sv_areagrid_scale[0], 1.0f / sv_areagrid_scale[1], 1.0f / sv_areagrid_scale[2], sv_areagrid_mingridsize.value);
}
}
}
-
-void SV_TouchAreaGrid(edict_t *ent)
+int SV_EntitiesInBox(vec3_t mins, vec3_t maxs, int maxlist, edict_t **list)
{
- link_t *l, *next;
- edict_t *touch;
+ int numlist;
areagrid_t *grid;
- int old_self, old_other, igrid[3], igridmins[3], igridmaxs[3];
+ link_t *l;
+ edict_t *ent;
+ int igrid[3], igridmins[3], igridmaxs[3];
+ sv_areagrid_stats_calls++;
sv_areagrid_marknumber++;
- igridmins[0] = (int) ((ent->v->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
- igridmins[1] = (int) ((ent->v->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
- //igridmins[2] = (int) ((ent->v->absmin[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
- igridmaxs[0] = (int) ((ent->v->absmax[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
- igridmaxs[1] = (int) ((ent->v->absmax[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
- //igridmaxs[2] = (int) ((ent->v->absmax[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
+ igridmins[0] = (int) ((mins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
+ igridmins[1] = (int) ((mins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
+ //igridmins[2] = (int) ((mins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
+ igridmaxs[0] = (int) ((maxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
+ igridmaxs[1] = (int) ((maxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
+ //igridmaxs[2] = (int) ((maxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
igridmins[0] = max(0, igridmins[0]);
igridmins[1] = max(0, igridmins[1]);
//igridmins[2] = max(0, igridmins[2]);
igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
//igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
- for (l = sv_areagrid_outside.trigger_edicts.next;l != &sv_areagrid_outside.trigger_edicts;l = next)
+ numlist = 0;
+ // add entities not linked into areagrid because they are too big or
+ // outside the grid bounds
+ if (sv_areagrid_outside.edicts.next != &sv_areagrid_outside.edicts)
{
- next = l->next;
- touch = EDICT_NUM(l->entitynumber);
- if (ent->v->absmin[0] > touch->v->absmax[0]
- || ent->v->absmax[0] < touch->v->absmin[0]
- || ent->v->absmin[1] > touch->v->absmax[1]
- || ent->v->absmax[1] < touch->v->absmin[1]
- || ent->v->absmin[2] > touch->v->absmax[2]
- || ent->v->absmax[2] < touch->v->absmin[2])
- continue;
- if (touch == ent)
- continue;
- if (!touch->v->touch || touch->v->solid != SOLID_TRIGGER)
- 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_global_struct->self = old_self;
- pr_global_struct->other = old_other;
+ for (l = sv_areagrid_outside.edicts.next;l != &sv_areagrid_outside.edicts;l = l->next)
+ {
+ ent = EDICT_NUM_UNSIGNED(l->entitynumber);
+ if (ent->e->areagridmarknumber != sv_areagrid_marknumber)
+ {
+ ent->e->areagridmarknumber = sv_areagrid_marknumber;
+ if (!ent->e->free && BoxesOverlap(mins, maxs, ent->v->absmin, ent->v->absmax))
+ {
+ if (numlist < maxlist)
+ list[numlist] = ent;
+ numlist++;
+ }
+ sv_areagrid_stats_entitychecks++;
+ }
+ }
}
-
+ // add grid linked entities
for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
{
grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
{
- for (l = grid->trigger_edicts.next;l != &grid->trigger_edicts;l = next)
+ if (grid->edicts.next != &grid->edicts)
{
- next = l->next;
- touch = EDICT_NUM(l->entitynumber);
- if (touch->e->areagridmarknumber == sv_areagrid_marknumber)
- continue;
- touch->e->areagridmarknumber = sv_areagrid_marknumber;
- if (ent->v->absmin[0] > touch->v->absmax[0]
- || ent->v->absmax[0] < touch->v->absmin[0]
- || ent->v->absmin[1] > touch->v->absmax[1]
- || ent->v->absmax[1] < touch->v->absmin[1]
- || ent->v->absmin[2] > touch->v->absmax[2]
- || ent->v->absmax[2] < touch->v->absmin[2])
- continue;
- // LordHavoc: id bug that won't be fixed: triggers do not ignore their owner like solid objects do
- if (touch == ent)
- continue;
- if (!touch->v->touch || touch->v->solid != SOLID_TRIGGER)
- 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_global_struct->self = old_self;
- pr_global_struct->other = old_other;
+ for (l = grid->edicts.next;l != &grid->edicts;l = l->next)
+ {
+ ent = EDICT_NUM_UNSIGNED(l->entitynumber);
+ if (ent->e->areagridmarknumber != sv_areagrid_marknumber)
+ {
+ ent->e->areagridmarknumber = sv_areagrid_marknumber;
+ if (!ent->e->free && BoxesOverlap(mins, maxs, ent->v->absmin, ent->v->absmax))
+ {
+ if (numlist < maxlist)
+ list[numlist] = ent;
+ numlist++;
+ }
+ }
+ sv_areagrid_stats_entitychecks++;
+ }
}
}
}
+ return numlist;
+}
+
+void SV_TouchAreaGrid(edict_t *ent)
+{
+ int i, numtouchedicts, old_self, old_other;
+ edict_t *touch, *touchedicts[MAX_EDICTS];
+
+ // build a list of edicts to touch, because the link loop can be corrupted
+ // by SV_IncreaseEdicts called during touch functions
+ numtouchedicts = SV_EntitiesInBox(ent->v->absmin, ent->v->absmax, MAX_EDICTS, touchedicts);
+ if (numtouchedicts > MAX_EDICTS)
+ {
+ // this never happens
+ Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+ numtouchedicts = MAX_EDICTS;
+ }
+
+ old_self = pr_global_struct->self;
+ old_other = pr_global_struct->other;
+ for (i = 0;i < numtouchedicts;i++)
+ {
+ touch = touchedicts[i];
+ if (touch != ent && (int)touch->v->solid == SOLID_TRIGGER && touch->v->touch)
+ {
+ 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, "QC function self.touch is missing");
+ }
+ }
+ pr_global_struct->self = old_self;
+ pr_global_struct->other = old_other;
}
void SV_LinkEdict_AreaGrid(edict_t *ent)
{
areagrid_t *grid;
- int igrid[3], igridmins[3], igridmaxs[3], gridnum;
+ int igrid[3], igridmins[3], igridmaxs[3], gridnum, entitynumber = NUM_FOR_EDICT(ent);
+
+ if (entitynumber <= 0 || entitynumber >= sv.max_edicts || EDICT_NUM(entitynumber) != ent)
+ Host_Error("SV_LinkEdict_AreaGrid: invalid edict %p (sv.edicts is %p, edict compared to sv.edicts is %i)\n", ent, sv.edicts, entitynumber);
igridmins[0] = (int) ((ent->v->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
igridmins[1] = (int) ((ent->v->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
if (igridmins[0] < 0 || igridmaxs[0] > AREA_GRID || igridmins[1] < 0 || igridmaxs[1] > AREA_GRID || ((igridmaxs[0] - igridmins[0]) * (igridmaxs[1] - igridmins[1])) > ENTITYGRIDAREAS)
{
// wow, something outside the grid, store it as such
- if (ent->v->solid == SOLID_TRIGGER)
- InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.trigger_edicts, NUM_FOR_EDICT(ent));
- else
- InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.solid_edicts, NUM_FOR_EDICT(ent));
+ InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.edicts, entitynumber);
return;
}
{
grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++, gridnum++)
- {
- if (ent->v->solid == SOLID_TRIGGER)
- InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->trigger_edicts, NUM_FOR_EDICT(ent));
- else
- InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->solid_edicts, NUM_FOR_EDICT(ent));
- }
+ InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->edicts, entitynumber);
}
}
if (ent->v->solid == SOLID_BSP)
{
- if (ent->v->modelindex < 0 || ent->v->modelindex > MAX_MODELS)
- Host_Error("SOLID_BSP with invalid modelindex!\n");
- model = sv.models[(int) ent->v->modelindex];
+ int modelindex = ent->v->modelindex;
+ if (modelindex < 0 || modelindex > MAX_MODELS)
+ {
+ Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", NUM_FOR_EDICT(ent));
+ modelindex = 0;
+ }
+ model = sv.models[modelindex];
if (model != NULL)
{
- if (model->type != mod_brush)
- Host_Error("SOLID_BSP with non-BSP model\n");
+ Mod_CheckLoaded(model);
+ if (!model->TraceBox)
+ Con_Printf("edict %i: SOLID_BSP with non-collidable model\n", NUM_FOR_EDICT(ent));
if (ent->v->angles[0] || ent->v->angles[2] || ent->v->avelocity[0] || ent->v->avelocity[2])
{
eventually rotation) of the end points
==================
*/
-trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end)
+trace_t SV_ClipMoveToEntity(edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype)
{
- int i;
trace_t trace;
model_t *model = NULL;
+ matrix4x4_t matrix, imatrix;
+ float tempnormal[3], starttransformed[3], endtransformed[3];
+ float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
+
+ memset(&trace, 0, sizeof(trace));
+ trace.fraction = trace.realfraction = 1;
+ VectorCopy(end, trace.endpos);
- if ((int) ent->v->solid == SOLID_BSP)
+ if ((int) ent->v->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
{
- i = ent->v->modelindex;
- if ((unsigned int) i >= MAX_MODELS)
- Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
- model = sv.models[i];
- if (i != 0 && model == NULL)
- Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
+ unsigned int modelindex = ent->v->modelindex;
+ // if the modelindex is 0, it shouldn't be SOLID_BSP!
+ if (modelindex == 0)
+ {
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with no model\n", NUM_FOR_EDICT(ent));
+ return trace;
+ }
+ if (modelindex >= MAX_MODELS)
+ {
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", NUM_FOR_EDICT(ent));
+ return trace;
+ }
+ model = sv.models[modelindex];
+ if (modelindex != 0 && model == NULL)
+ {
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", NUM_FOR_EDICT(ent));
+ return trace;
+ }
Mod_CheckLoaded(model);
- if (model->type != mod_brush)
+ if ((int) ent->v->solid == SOLID_BSP)
{
- 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 (!model->TraceBox)
+ {
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with a non-collidable model\n", NUM_FOR_EDICT(ent));
+ return trace;
+ }
+ //if (ent->v->movetype != MOVETYPE_PUSH)
+ //{
+ // Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP without MOVETYPE_PUSH\n", NUM_FOR_EDICT(ent));
+ // return trace;
+ //}
}
- if (ent->v->movetype != MOVETYPE_PUSH)
- Host_Error ("SV_ClipMoveToEntity: SOLID_BSP without MOVETYPE_PUSH");
+ Matrix4x4_CreateFromQuakeEntity(&matrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], 1);
+ }
+ else
+ Matrix4x4_CreateTranslate(&matrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2]);
+
+ Matrix4x4_Invert_Simple(&imatrix, &matrix);
+ Matrix4x4_Transform(&imatrix, start, starttransformed);
+ Matrix4x4_Transform(&imatrix, end, endtransformed);
+#if COLLISIONPARANOID >= 3
+ Con_Printf("trans(%f %f %f -> %f %f %f, %f %f %f -> %f %f %f)", start[0], start[1], start[2], starttransformed[0], starttransformed[1], starttransformed[2], end[0], end[1], end[2], endtransformed[0], endtransformed[1], endtransformed[2]);
+#endif
+
+ if (model && model->TraceBox)
+ {
+ int frame;
+ frame = (int)ent->v->frame;
+ frame = bound(0, frame, (model->numframes - 1));
+ VectorAdd(starttransformed, maxs, starttransformedmaxs);
+ VectorAdd(endtransformed, maxs, endtransformedmaxs);
+ VectorAdd(starttransformed, mins, starttransformedmins);
+ VectorAdd(endtransformed, mins, endtransformedmins);
+ model->TraceBox(model, frame, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, SUPERCONTENTS_SOLID);
}
+ else
+ Collision_ClipTrace_Box(&trace, ent->v->mins, ent->v->maxs, starttransformed, mins, maxs, endtransformed, SUPERCONTENTS_SOLID, SUPERCONTENTS_SOLID);
- if (sv_polygoncollisions.integer && (mins[0] != maxs[0] || mins[1] != maxs[1] || mins[2] != maxs[2]))
- Collision_PolygonClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end);
+ if (trace.fraction < 1)
+ {
+ VectorLerp(start, trace.fraction, end, trace.endpos);
+ VectorCopy(trace.plane.normal, tempnormal);
+ Matrix4x4_Transform3x3(&matrix, tempnormal, trace.plane.normal);
+ // FIXME: should recalc trace.plane.dist
+ }
else
- Collision_ClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end);
+ VectorCopy(end, trace.endpos);
return trace;
}
//===========================================================================
-void SV_ClipToNode(moveclip_t *clip, link_t *list)
+/*
+==================
+SV_Move
+==================
+*/
+#if COLLISIONPARANOID >= 1
+trace_t SV_Move_(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict)
+#else
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict)
+#endif
{
- link_t *l, *next;
- edict_t *touch;
+ vec3_t hullmins, hullmaxs;
+ int i;
+ int passedictprog;
+ qboolean pointtrace;
+ edict_t *traceowner, *touch;
trace_t trace;
+ // bounding box of entire move area
+ vec3_t clipboxmins, clipboxmaxs;
+ // size of the moving object
+ vec3_t clipmins, clipmaxs;
+ // size when clipping against monsters
+ vec3_t clipmins2, clipmaxs2;
+ // start and end origin of move
+ vec3_t clipstart, clipend;
+ // trace results
+ trace_t cliptrace;
+ int numtouchedicts;
+ edict_t *touchedicts[MAX_EDICTS];
+
+ VectorCopy(start, clipstart);
+ VectorCopy(end, clipend);
+ VectorCopy(mins, clipmins);
+ VectorCopy(maxs, clipmaxs);
+ VectorCopy(mins, clipmins2);
+ VectorCopy(maxs, clipmaxs2);
+#if COLLISIONPARANOID >= 3
+ Con_Printf("move(%f %f %f,%f %f %f)", clipstart[0], clipstart[1], clipstart[2], clipend[0], clipend[1], clipend[2]);
+#endif
- sv_areagrid_stats_nodechecks++;
- for (l = list->next;l != list;l = next)
+ // clip to world
+ cliptrace = SV_ClipMoveToEntity(sv.edicts, clipstart, clipmins, clipmaxs, clipend, type);
+ if (cliptrace.startsolid || cliptrace.fraction < 1)
+ cliptrace.ent = sv.edicts;
+ if (type == MOVE_WORLDONLY)
+ return cliptrace;
+
+ if (type == MOVE_MISSILE)
{
- next = l->next;
- touch = EDICT_NUM(l->entitynumber);
- if (touch->e->areagridmarknumber == sv_areagrid_marknumber)
- continue;
- touch->e->areagridmarknumber = sv_areagrid_marknumber;
- sv_areagrid_stats_entitychecks++;
-
- if (clip->boxmins[0] > touch->v->absmax[0]
- || 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;
+ // LordHavoc: modified this, was = -15, now -= 15
+ for (i = 0;i < 3;i++)
+ {
+ clipmins2[i] -= 15;
+ clipmaxs2[i] += 15;
+ }
+ }
- if (clip->type == MOVE_NOMONSTERS && touch->v->solid != SOLID_BSP)
- continue;
+ // get adjusted box for bmodel collisions if the world is q1bsp or hlbsp
+ if (sv.worldmodel && sv.worldmodel->brush.RoundUpToHullSize)
+ sv.worldmodel->brush.RoundUpToHullSize(sv.worldmodel, clipmins, clipmaxs, hullmins, hullmaxs);
+ else
+ {
+ VectorCopy(clipmins, hullmins);
+ VectorCopy(clipmaxs, hullmaxs);
+ }
- if (touch->v->solid == SOLID_NOT)
+ // create the bounding box of the entire move
+ for (i = 0;i < 3;i++)
+ {
+ clipboxmins[i] = min(clipstart[i], cliptrace.endpos[i]) + min(hullmins[i], clipmins2[i]) - 1;
+ clipboxmaxs[i] = max(clipstart[i], cliptrace.endpos[i]) + max(hullmaxs[i], clipmaxs2[i]) + 1;
+ }
+
+ // debug override to test against everything
+ if (sv_debugmove.integer)
+ {
+ clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
+ clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = 999999999;
+ }
+
+ // if the passedict is world, make it NULL (to avoid two checks each time)
+ if (passedict == sv.edicts)
+ passedict = NULL;
+ // precalculate prog value for passedict for comparisons
+ passedictprog = EDICT_TO_PROG(passedict);
+ // figure out whether this is a point trace for comparisons
+ pointtrace = VectorCompare(clipmins, clipmaxs);
+ // precalculate passedict's owner edict pointer for comparisons
+ traceowner = passedict ? PROG_TO_EDICT(passedict->v->owner) : 0;
+
+ // clip to enttiies
+ numtouchedicts = SV_EntitiesInBox(clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts);
+ if (numtouchedicts > MAX_EDICTS)
+ {
+ // this never happens
+ Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+ numtouchedicts = MAX_EDICTS;
+ }
+ for (i = 0;i < numtouchedicts;i++)
+ {
+ touch = touchedicts[i];
+
+ if (touch->v->solid < SOLID_BBOX)
+ continue;
+ if (type == MOVE_NOMONSTERS && touch->v->solid != SOLID_BSP)
continue;
- if (clip->passedict)
+ if (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 || touch->v->solid == SOLID_CORPSE))
+ // don't clip against self
+ if (passedict == touch)
continue;
- if (clip->passedict->v->solid == SOLID_SLIDEBOX && touch->v->solid == SOLID_CORPSE)
+ // don't clip owned entities against owner
+ if (traceowner == touch)
+ continue;
+ // don't clip owner against owned entities
+ if (passedictprog == touch->v->owner)
+ continue;
+ // don't clip points against points (they can't collide)
+ if (pointtrace && VectorCompare(touch->v->mins, touch->v->maxs) && (type != MOVE_MISSILE || !((int)touch->v->flags & FL_MONSTER)))
+ continue;
+ // don't clip corpse against character
+ if (passedict->v->solid == SOLID_CORPSE && (touch->v->solid == SOLID_SLIDEBOX || touch->v->solid == SOLID_CORPSE))
+ continue;
+ // don't clip character against corpse
+ if (passedict->v->solid == SOLID_SLIDEBOX && touch->v->solid == SOLID_CORPSE)
continue;
- }
-
- if (touch == clip->passedict)
- continue;
- if (touch->v->solid == SOLID_TRIGGER)
- {
- ED_Print(touch);
- Host_Error ("Trigger in clipping list");
}
// 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);
+ if ((int)touch->v->flags & FL_MONSTER)
+ trace = SV_ClipMoveToEntity(touch, clipstart, clipmins2, clipmaxs2, clipend, type);
else
- trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs, clip->end);
+ trace = SV_ClipMoveToEntity(touch, clipstart, clipmins, clipmaxs, clipend, type);
// LordHavoc: take the 'best' answers from the new trace and combine with existing data
if (trace.allsolid)
- clip->trace.allsolid = true;
+ cliptrace.allsolid = true;
if (trace.startsolid)
{
- clip->trace.startsolid = true;
- if (!clip->trace.ent)
- clip->trace.ent = trace.ent;
+ cliptrace.startsolid = true;
+ if (cliptrace.realfraction == 1)
+ cliptrace.ent = touch;
}
- if (trace.inopen)
- clip->trace.inopen = true;
+ // don't set this except on the world, because it can easily confuse
+ // monsters underwater if there's a bmodel involved in the trace
+ // (inopen && inwater is how they check water visibility)
+ //if (trace.inopen)
+ // cliptrace.inopen = true;
if (trace.inwater)
- clip->trace.inwater = true;
- if (trace.fraction < clip->trace.fraction)
+ cliptrace.inwater = true;
+ if (trace.realfraction < cliptrace.realfraction)
{
- 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;
+ cliptrace.fraction = trace.fraction;
+ cliptrace.realfraction = trace.realfraction;
+ VectorCopy(trace.endpos, cliptrace.endpos);
+ cliptrace.plane = trace.plane;
+ cliptrace.ent = touch;
}
- if (clip->trace.allsolid)
- return;
+ cliptrace.startsupercontents |= trace.startsupercontents;
}
-}
-
-/*
-====================
-SV_ClipToAreaGrid
-
-Mins and maxs enclose the entire area swept by the move
-====================
-*/
-void SV_ClipToAreaGrid(moveclip_t *clip)
-{
- areagrid_t *grid;
- int igrid[3], igridmins[3], igridmaxs[3];
-
- if (clip->trace.allsolid)
- return;
-
- sv_areagrid_stats_calls++;
- sv_areagrid_marknumber++;
- igridmins[0] = (int) ((clip->boxmins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
- igridmins[1] = (int) ((clip->boxmins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
- //igridmins[2] = (int) ((clip->boxmins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
- igridmaxs[0] = (int) ((clip->boxmaxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
- igridmaxs[1] = (int) ((clip->boxmaxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
- //igridmaxs[2] = (int) ((clip->boxmaxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
- igridmins[0] = max(0, igridmins[0]);
- igridmins[1] = max(0, igridmins[1]);
- //igridmins[2] = max(0, igridmins[2]);
- igridmaxs[0] = min(AREA_GRID, igridmaxs[0]);
- igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
- //igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
-
- if (sv_areagrid_outside.solid_edicts.next != &sv_areagrid_outside.solid_edicts)
- SV_ClipToNode(clip, &sv_areagrid_outside.solid_edicts);
- for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
- for (grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0], igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
- if (grid->solid_edicts.next != &grid->solid_edicts)
- SV_ClipToNode(clip, &grid->solid_edicts);
+ return cliptrace;
}
-
-/*
-==================
-SV_MoveBounds
-==================
-*/
-void SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, vec3_t boxmins, vec3_t boxmaxs)
+#if COLLISIONPARANOID >= 1
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict)
{
- if (!sv_debugmove.integer)
- {
- int i;
-
- for (i=0 ; i<3 ; i++)
- {
- 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;
- }
- }
- }
- else
+ int endstuck;
+ trace_t trace;
+ vec3_t temp;
+ trace = SV_Move_(start, mins, maxs, end, type, passedict);
+ if (passedict)
{
- // debug to test against everything
- boxmins[0] = boxmins[1] = boxmins[2] = -999999999;
- boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 999999999;
+ VectorCopy(trace.endpos, temp);
+ endstuck = SV_Move_(temp, mins, maxs, temp, type, passedict).startsolid;
+#if COLLISIONPARANOID < 3
+ if (trace.startsolid || endstuck)
+#endif
+ Con_Printf("%s{e%i:%f %f %f:%f %f %f:%f:%f %f %f%s%s}\n", (trace.startsolid || endstuck) ? "\002" : "", passedict ? passedict - sv.edicts : -1, passedict->v->origin[0], passedict->v->origin[1], passedict->v->origin[2], end[0] - passedict->v->origin[0], end[1] - passedict->v->origin[1], end[2] - passedict->v->origin[2], trace.fraction, trace.endpos[0] - passedict->v->origin[0], trace.endpos[1] - passedict->v->origin[1], trace.endpos[2] - passedict->v->origin[2], trace.startsolid ? " startstuck" : "", endstuck ? " endstuck" : "");
}
+ return trace;
}
+#endif
-/*
-==================
-SV_Move
-==================
-*/
-trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict)
+int SV_PointSuperContents(const vec3_t point)
{
- moveclip_t clip;
- vec3_t bigmins, bigmaxs;
- int i;
-
- memset ( &clip, 0, sizeof ( moveclip_t ) );
-
- 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] = clip.mins[i] - 15;
- clip.maxs2[i] = clip.maxs[i] + 15;
- }
- }
- else
- {
- VectorCopy (clip.mins, clip.mins2);
- VectorCopy (clip.maxs, clip.maxs2);
- }
-
- 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_ClipToAreaGrid(&clip);
+ return SV_Move(point, vec3_origin, vec3_origin, point, sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents;
+}
- return clip.trace;
+int SV_PointQ1Contents(const vec3_t point)
+{
+ return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(point));
}
+
projects / xonotic / darkplaces.git / blobdiff