entities never clip against themselves, or their owner
-line of sight checks trace->crosscontent, but bullets don't
+line of sight checks trace->inopen and trace->inwater, but bullets don't
*/
-cvar_t sv_useareanodes = {CVAR_NOTIFY, "sv_useareanodes", "1"};
+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_useareanodes);
+ 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;
-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);
+ // size of the moving object
+ vec3_t mins, maxs;
-#define EDICT_FROM_AREA(l) ((edict_t *)((qbyte *)l - (int)&(((edict_t *)0)->area)))
+ // 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
-void ClearLink (link_t *l)
+static void ClearLink (link_t *l)
{
+ l->entitynumber = 0;
l->prev = l->next = l;
}
-void RemoveLink (link_t *l)
+static void RemoveLink (link_t *l)
{
l->next->prev = l->prev;
l->prev->next = l->next;
}
-void InsertLinkBefore (link_t *l, link_t *before)
+static void InsertLinkBefore (link_t *l, link_t *before, int entitynumber)
{
+ l->entitynumber = entitynumber;
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
-{
- // 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;
/*
===============================================================================
*/
-typedef struct areanode_s
-{
- int axis; // -1 = leaf node
- float dist;
- struct areanode_s *children[2];
- link_t trigger_edicts;
- link_t solid_edicts;
-} areanode_t;
-
-#define AREA_DEPTH 4
-#define AREA_NODES 32
-
-static areanode_t sv_areanodes[AREA_NODES];
-static int sv_numareanodes;
+int sv_areagrid_stats_calls = 0;
+int sv_areagrid_stats_nodechecks = 0;
+int sv_areagrid_stats_entitychecks = 0;
-/*
-===============
-SV_CreateAreaNode
+void SV_AreaStats_f(void)
+{
+ Con_Printf("areagrid check stats: %d calls %d nodes (%f per call) %d entities (%f per call)\n", sv_areagrid_stats_calls, sv_areagrid_stats_nodechecks, (double) sv_areagrid_stats_nodechecks / (double) sv_areagrid_stats_calls, sv_areagrid_stats_entitychecks, (double) sv_areagrid_stats_entitychecks / (double) sv_areagrid_stats_calls);
+ sv_areagrid_stats_calls = 0;
+ sv_areagrid_stats_nodechecks = 0;
+ sv_areagrid_stats_entitychecks = 0;
+}
-===============
-*/
-areanode_t *SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
+typedef struct areagrid_s
{
- areanode_t *anode;
- vec3_t size;
- vec3_t mins1, maxs1, mins2, maxs2;
+ link_t trigger_edicts;
+ link_t solid_edicts;
+}
+areagrid_t;
- anode = &sv_areanodes[sv_numareanodes];
- sv_numareanodes++;
+#define AREA_GRID 512
+#define AREA_GRIDNODES (AREA_GRID * AREA_GRID)
- ClearLink (&anode->trigger_edicts);
- ClearLink (&anode->solid_edicts);
+static areagrid_t sv_areagrid[AREA_GRIDNODES], sv_areagrid_outside;
+static vec3_t sv_areagrid_bias, sv_areagrid_scale, sv_areagrid_mins, sv_areagrid_maxs, sv_areagrid_size;
+static int sv_areagrid_marknumber = 1;
- if (depth == AREA_DEPTH)
+void SV_CreateAreaGrid (vec3_t mins, vec3_t maxs)
+{
+ int i;
+ ClearLink (&sv_areagrid_outside.trigger_edicts);
+ ClearLink (&sv_areagrid_outside.solid_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_size[2] = max(maxs[2] - mins[2], AREA_GRID * sv_areagrid_mingridsize.value);
+ // figure out the corners of such a box, centered at the center of the world box
+ sv_areagrid_mins[0] = (mins[0] + maxs[0] - sv_areagrid_size[0]) * 0.5f;
+ sv_areagrid_mins[1] = (mins[1] + maxs[1] - sv_areagrid_size[1]) * 0.5f;
+ sv_areagrid_mins[2] = (mins[2] + maxs[2] - sv_areagrid_size[2]) * 0.5f;
+ sv_areagrid_maxs[0] = (mins[0] + maxs[0] + sv_areagrid_size[0]) * 0.5f;
+ sv_areagrid_maxs[1] = (mins[1] + maxs[1] + sv_areagrid_size[1]) * 0.5f;
+ sv_areagrid_maxs[2] = (mins[2] + maxs[2] + sv_areagrid_size[2]) * 0.5f;
+ // now calculate the actual useful info from that
+ VectorNegate(sv_areagrid_mins, sv_areagrid_bias);
+ sv_areagrid_scale[0] = AREA_GRID / sv_areagrid_size[0];
+ sv_areagrid_scale[1] = AREA_GRID / sv_areagrid_size[1];
+ sv_areagrid_scale[2] = AREA_GRID / sv_areagrid_size[2];
+ for (i = 0;i < AREA_GRIDNODES;i++)
{
- anode->axis = -1;
- anode->children[0] = anode->children[1] = NULL;
- return anode;
+ ClearLink (&sv_areagrid[i].trigger_edicts);
+ ClearLink (&sv_areagrid[i].solid_edicts);
}
-
- 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);
-
- 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);
-
- return anode;
+ 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_ClearWorld (void)
{
- Collision_Init ();
-
- memset (sv_areanodes, 0, sizeof(sv_areanodes));
- sv_numareanodes = 0;
Mod_CheckLoaded(sv.worldmodel);
- SV_CreateAreaNode (0, sv.worldmodel->normalmins, sv.worldmodel->normalmaxs);
+ SV_CreateAreaGrid(sv.worldmodel->normalmins, sv.worldmodel->normalmaxs);
}
*/
void SV_UnlinkEdict (edict_t *ent)
{
- if (!ent->area.prev)
- return; // not linked in anywhere
- RemoveLink (&ent->area);
- ent->area.prev = ent->area.next = NULL;
+ int i;
+ for (i = 0;i < ENTITYGRIDAREAS;i++)
+ {
+ if (ent->e->areagrid[i].prev)
+ {
+ RemoveLink (&ent->e->areagrid[i]);
+ ent->e->areagrid[i].prev = ent->e->areagrid[i].next = NULL;
+ }
+ }
}
-/*
-====================
-SV_TouchLinks
-====================
-*/
-void SV_TouchLinks ( edict_t *ent, areanode_t *node )
+void SV_TouchAreaGrid(edict_t *ent)
{
- link_t *l, *next;
- edict_t *touch;
- int old_self, old_other;
-
-loc0:
-// touch linked edicts
- for (l = node->trigger_edicts.next ; l != &node->trigger_edicts ; l = next)
+ link_t *l, *next;
+ edict_t *touch;
+ areagrid_t *grid;
+ int old_self, old_other, igrid[3], igridmins[3], igridmaxs[3];
+
+ 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] = 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]);
+
+ for (l = sv_areagrid_outside.trigger_edicts.next;l != &sv_areagrid_outside.trigger_edicts;l = next)
{
next = l->next;
- touch = EDICT_FROM_AREA(l);
- if (touch == ent)
+ 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->v.touch || touch->v.solid != SOLID_TRIGGER)
+ if (touch == ent)
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])
+ 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_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;
+ 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)
+ {
+ 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;
+ 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;
+ }
+ }
+ }
+}
- if (ent->v.absmax[node->axis] > node->dist)
+void SV_LinkEdict_AreaGrid(edict_t *ent)
+{
+ areagrid_t *grid;
+ int igrid[3], igridmins[3], igridmaxs[3], gridnum;
+
+ 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;
+ if (igridmins[0] < 0 || igridmaxs[0] > AREA_GRID || igridmins[1] < 0 || igridmaxs[1] > AREA_GRID || ((igridmaxs[0] - igridmins[0]) * (igridmaxs[1] - igridmins[1])) > ENTITYGRIDAREAS)
{
- if (ent->v.absmin[node->axis] < node->dist)
- SV_TouchLinks(ent, node->children[1]); // order reversed to reduce code
- node = node->children[0];
- goto loc0;
+ // 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));
+ return;
}
- else
+
+ gridnum = 0;
+ for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
{
- if (ent->v.absmin[node->axis] < node->dist)
+ grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
+ for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++, gridnum++)
{
- node = node->children[1];
- goto loc0;
+ 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));
}
}
}
-
/*
===============
SV_LinkEdict
*/
void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
{
- model_t *model;
- areanode_t *node;
+ model_t *model;
- if (ent->area.prev)
+ if (ent->e->areagrid[0].prev)
SV_UnlinkEdict (ent); // unlink from old position
if (ent == sv.edicts)
return; // don't add the world
- if (ent->free)
+ if (ent->e->free)
return;
// set the abs box
- if (ent->v.solid == SOLID_BSP)
+ 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 (ent->v->modelindex < 0 || ent->v->modelindex > MAX_MODELS)
+ Host_Error("SOLID_BSP with invalid modelindex!\n");
+ model = sv.models[(int) ent->v->modelindex];
if (model != NULL)
{
if (model->type != mod_brush)
- PR_RunError("SOLID_BSP with non-BSP model\n");
+ Host_Error("SOLID_BSP with non-BSP model\n");
- if (ent->v.angles[0] || ent->v.angles[2] || ent->v.avelocity[0] || ent->v.avelocity[2])
+ 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);
+ 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])
+ 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);
+ 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);
+ VectorAdd(ent->v->origin, model->normalmins, ent->v->absmin);
+ VectorAdd(ent->v->origin, model->normalmaxs, ent->v->absmax);
}
}
else
{
// 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);
+ 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.maxs, ent->v.absmax);
+ VectorAdd(ent->v->origin, ent->v->mins, ent->v->absmin);
+ VectorAdd(ent->v->origin, ent->v->maxs, ent->v->absmax);
}
//
// to make items easier to pick up and allow them to be grabbed off
// of shelves, the abs sizes are expanded
//
- if ((int)ent->v.flags & FL_ITEM)
+ if ((int)ent->v->flags & FL_ITEM)
{
- 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;
+ 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,
// we must fully check even when bounding boxes don't quite touch
- ent->v.absmin[0] -= 1;
- ent->v.absmin[1] -= 1;
- ent->v.absmin[2] -= 1;
- ent->v.absmax[0] += 1;
- ent->v.absmax[1] += 1;
- ent->v.absmax[2] += 1;
+ ent->v->absmin[0] -= 1;
+ ent->v->absmin[1] -= 1;
+ ent->v->absmin[2] -= 1;
+ ent->v->absmax[0] += 1;
+ ent->v->absmax[1] += 1;
+ ent->v->absmax[2] += 1;
}
- if (ent->v.solid == SOLID_NOT)
+ if (ent->v->solid == SOLID_NOT)
return;
-// find the first node that the ent's box crosses
- node = sv_areanodes;
- while (1)
- {
- if (node->axis == -1)
- break;
- if (ent->v.absmin[node->axis] > node->dist)
- node = node->children[0];
- else if (ent->v.absmax[node->axis] < node->dist)
- node = node->children[1];
- else
- break; // crosses the node
- }
-
-// link it in
-
- if (ent->v.solid == SOLID_TRIGGER)
- InsertLinkBefore (&ent->area, &node->trigger_edicts);
- else
- InsertLinkBefore (&ent->area, &node->solid_edicts);
+ SV_LinkEdict_AreaGrid(ent);
// if touch_triggers, touch all entities at this node and descend for more
if (touch_triggers)
- SV_TouchLinks ( ent, sv_areanodes );
+ SV_TouchAreaGrid(ent);
}
*/
int SV_TestEntityPosition (edict_t *ent)
{
- return SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent).startsolid;
+ return SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, ent->v->origin, MOVE_NORMAL, ent).startsolid;
}
trace_t trace;
model_t *model;
- i = ent->v.modelindex;
+ i = ent->v->modelindex;
if ((unsigned int) i >= MAX_MODELS)
- PR_RunError("SV_ClipMoveToEntity: invalid modelindex\n");
+ Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
model = sv.models[i];
if (i != 0 && model == NULL)
- PR_RunError("SV_ClipMoveToEntity: invalid modelindex\n");
+ Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
- if ((int) ent->v.solid == SOLID_BSP)
+ if ((int) ent->v->solid == SOLID_BSP)
{
Mod_CheckLoaded(model);
if (model->type != mod_brush)
ED_Print (ent);
Host_Error ("SV_ClipMoveToEntity: SOLID_BSP with a non bsp model\n");
}
- if (ent->v.movetype != MOVETYPE_PUSH)
+ if (ent->v->movetype != MOVETYPE_PUSH)
Host_Error ("SV_ClipMoveToEntity: SOLID_BSP without MOVETYPE_PUSH");
}
- Collision_ClipTrace(&trace, ent, model, ent->v.origin, ent->v.angles, ent->v.mins, ent->v.maxs, start, mins, maxs, end);
+ 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);
+ else
+ Collision_ClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end);
return trace;
}
//===========================================================================
-/*
-====================
-SV_ClipToLinks
-
-Mins and maxs enclose the entire area swept by the move
-====================
-*/
-void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip )
+void SV_ClipToNode(moveclip_t *clip, link_t *list)
{
- link_t *l, *next;
- edict_t *touch;
- trace_t trace;
+ link_t *l, *next;
+ edict_t *touch;
+ trace_t trace;
-loc0:
- if (clip->trace.allsolid)
- return;
-// touch linked edicts
- for (l = node->solid_edicts.next ; l != &node->solid_edicts ; l = next)
+ sv_areagrid_stats_nodechecks++;
+ for (l = list->next;l != list;l = next)
{
next = l->next;
- touch = EDICT_FROM_AREA(l);
- if (touch->v.solid == SOLID_NOT)
+ touch = EDICT_NUM(l->entitynumber);
+ if (touch->e->areagridmarknumber == sv_areagrid_marknumber)
continue;
- if (touch == clip->passedict)
+ 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;
- if (touch->v.solid == SOLID_TRIGGER)
- Host_Error ("Trigger in clipping list");
- if (clip->type == MOVE_NOMONSTERS && touch->v.solid != SOLID_BSP)
+ if (clip->type == MOVE_NOMONSTERS && touch->v->solid != SOLID_BSP)
continue;
- 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])
+ if (touch->v->solid == SOLID_NOT)
continue;
if (clip->passedict)
{
- if (clip->passedict->v.size[0] && !touch->v.size[0])
+ if (clip->passedict->v->size[0] && !touch->v->size[0])
continue; // points never interact
- if (PROG_TO_EDICT(touch->v.owner) == clip->passedict)
+ 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)
+ 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))
+ 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)
+ if (clip->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)
+ 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)
+ 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);
clip->trace.endcontents = trace.endcontents;
clip->trace.ent = trace.ent;
}
+ if (clip->trace.allsolid)
+ return;
}
+}
+
+/*
+====================
+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];
-// recurse down both sides
- if (node->axis == -1)
+ if (clip->trace.allsolid)
return;
- if (clip->boxmaxs[node->axis] > node->dist)
- {
- if (clip->boxmins[node->axis] < node->dist)
- SV_ClipToLinks(node->children[1], clip);
- node = node->children[0];
- goto loc0;
- }
- else if (clip->boxmins[node->axis] < node->dist)
- {
- node = node->children[1];
- goto loc0;
- }
+ 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);
}
*/
void SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, vec3_t boxmins, vec3_t boxmaxs)
{
- if (sv_useareanodes.integer)
+ if (!sv_debugmove.integer)
{
int i;
// create the bounding box of the entire move
SV_MoveBounds ( start, bigmins, bigmaxs, end, clip.boxmins, clip.boxmaxs );
- SV_ClipToLinks ( sv_areanodes, &clip );
+ SV_ClipToAreaGrid(&clip);
return clip.trace;
}
projects / xonotic / darkplaces.git / blobdiff