*/
-cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0", "disables collision detection optimizations for debugging purposes"};
-cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64", "minimum areagrid cell size, smaller values work better for lots of small objects, higher values for large objects"};
-
-void SV_AreaStats_f(void);
-
-void SV_World_Init(void)
+void World_Init(void)
{
- Cvar_RegisterVariable(&sv_debugmove);
- Cvar_RegisterVariable(&sv_areagrid_mingridsize);
- Cmd_AddCommand("sv_areastats", SV_AreaStats_f, "prints information on culling grid system");
Collision_Init();
}
//============================================================================
-// ClearLink is used for new headnodes
-static void ClearLink (link_t *l)
+/// World_ClearLink is used for new headnodes
+void World_ClearLink (link_t *l)
{
l->entitynumber = 0;
l->prev = l->next = l;
}
-static void RemoveLink (link_t *l)
+void World_RemoveLink (link_t *l)
{
l->next->prev = l->prev;
l->prev->next = l->next;
}
-static void InsertLinkBefore (link_t *l, link_t *before, int entitynumber)
+void World_InsertLinkBefore (link_t *l, link_t *before, int entitynumber)
{
l->entitynumber = entitynumber;
l->next = before;
l->next->prev = l;
}
-
/*
===============================================================================
===============================================================================
*/
-int sv_areagrid_stats_calls = 0;
-int sv_areagrid_stats_nodechecks = 0;
-int sv_areagrid_stats_entitychecks = 0;
-
-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;
-}
-
-typedef struct areagrid_s
+void World_PrintAreaStats(world_t *world, const char *worldname)
{
- link_t edicts;
+ Con_Printf("%s areagrid check stats: %d calls %d nodes (%f per call) %d entities (%f per call)\n", worldname, world->areagrid_stats_calls, world->areagrid_stats_nodechecks, (double) world->areagrid_stats_nodechecks / (double) world->areagrid_stats_calls, world->areagrid_stats_entitychecks, (double) world->areagrid_stats_entitychecks / (double) world->areagrid_stats_calls);
+ world->areagrid_stats_calls = 0;
+ world->areagrid_stats_nodechecks = 0;
+ world->areagrid_stats_entitychecks = 0;
}
-areagrid_t;
-
-#define AREA_GRID 512
-#define AREA_GRIDNODES (AREA_GRID * AREA_GRID)
-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;
+/*
+===============
+World_SetSize
-void SV_CreateAreaGrid (vec3_t mins, vec3_t maxs)
+===============
+*/
+void World_SetSize(world_t *world, const char *filename, const vec3_t mins, const vec3_t maxs)
{
int i;
- ClearLink (&sv_areagrid_outside.edicts);
+
+ strlcpy(world->filename, filename, sizeof(world->filename));
+ VectorCopy(mins, world->mins);
+ VectorCopy(maxs, world->maxs);
+
+ // the areagrid_marknumber is not allowed to be 0
+ if (world->areagrid_marknumber < 1)
+ world->areagrid_marknumber = 1;
// 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);
+ world->areagrid_size[0] = max(world->areagrid_maxs[0] - world->areagrid_mins[0], AREA_GRID * sv_areagrid_mingridsize.value);
+ world->areagrid_size[1] = max(world->areagrid_maxs[1] - world->areagrid_mins[1], AREA_GRID * sv_areagrid_mingridsize.value);
+ world->areagrid_size[2] = max(world->areagrid_maxs[2] - world->areagrid_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;
+ world->areagrid_mins[0] = (world->areagrid_mins[0] + world->areagrid_maxs[0] - world->areagrid_size[0]) * 0.5f;
+ world->areagrid_mins[1] = (world->areagrid_mins[1] + world->areagrid_maxs[1] - world->areagrid_size[1]) * 0.5f;
+ world->areagrid_mins[2] = (world->areagrid_mins[2] + world->areagrid_maxs[2] - world->areagrid_size[2]) * 0.5f;
+ world->areagrid_maxs[0] = (world->areagrid_mins[0] + world->areagrid_maxs[0] + world->areagrid_size[0]) * 0.5f;
+ world->areagrid_maxs[1] = (world->areagrid_mins[1] + world->areagrid_maxs[1] + world->areagrid_size[1]) * 0.5f;
+ world->areagrid_maxs[2] = (world->areagrid_mins[2] + world->areagrid_maxs[2] + world->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];
+ VectorNegate(world->areagrid_mins, world->areagrid_bias);
+ world->areagrid_scale[0] = AREA_GRID / world->areagrid_size[0];
+ world->areagrid_scale[1] = AREA_GRID / world->areagrid_size[1];
+ world->areagrid_scale[2] = AREA_GRID / world->areagrid_size[2];
+ World_ClearLink(&world->areagrid_outside);
for (i = 0;i < AREA_GRIDNODES;i++)
- {
- 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);
+ World_ClearLink(&world->areagrid[i]);
+ if (developer.integer >= 10)
+ Con_Printf("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, world->areagrid_mins[0], world->areagrid_mins[1], world->areagrid_mins[2], world->areagrid_maxs[0], world->areagrid_maxs[1], world->areagrid_maxs[2], world->areagrid_size[0], world->areagrid_size[1], world->areagrid_size[2], 1.0f / world->areagrid_scale[0], 1.0f / world->areagrid_scale[1], 1.0f / world->areagrid_scale[2], sv_areagrid_mingridsize.value);
}
/*
===============
-SV_ClearWorld
+World_UnlinkAll
===============
*/
-void SV_ClearWorld (void)
+void World_UnlinkAll(world_t *world)
{
- SV_CreateAreaGrid(sv.worldmodel->normalmins, sv.worldmodel->normalmaxs);
+ int i;
+ link_t *grid;
+ // unlink all entities one by one
+ grid = &world->areagrid_outside;
+ while (grid->next != grid)
+ World_UnlinkEdict(PRVM_EDICT_NUM(grid->next->entitynumber));
+ for (i = 0, grid = world->areagrid;i < AREA_GRIDNODES;i++, grid++)
+ while (grid->next != grid)
+ World_UnlinkEdict(PRVM_EDICT_NUM(grid->next->entitynumber));
}
-
/*
===============
-SV_UnlinkEdict
===============
*/
-void SV_UnlinkEdict (prvm_edict_t *ent)
+void World_UnlinkEdict(prvm_edict_t *ent)
{
int i;
for (i = 0;i < ENTITYGRIDAREAS;i++)
{
if (ent->priv.server->areagrid[i].prev)
{
- RemoveLink (&ent->priv.server->areagrid[i]);
+ World_RemoveLink (&ent->priv.server->areagrid[i]);
ent->priv.server->areagrid[i].prev = ent->priv.server->areagrid[i].next = NULL;
}
}
}
-int SV_EntitiesInBox(vec3_t mins, vec3_t maxs, int maxlist, prvm_edict_t **list)
+int World_EntitiesInBox(world_t *world, const vec3_t mins, const vec3_t maxs, int maxlist, prvm_edict_t **list)
{
int numlist;
- areagrid_t *grid;
+ link_t *grid;
link_t *l;
prvm_edict_t *ent;
int igrid[3], igridmins[3], igridmaxs[3];
- sv_areagrid_stats_calls++;
- sv_areagrid_marknumber++;
- igridmins[0] = (int) floor((mins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
- igridmins[1] = (int) floor((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) floor((maxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
- igridmaxs[1] = (int) floor((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;
+ // FIXME: if areagrid_marknumber wraps, all entities need their
+ // ent->priv.server->areagridmarknumber reset
+ world->areagrid_stats_calls++;
+ world->areagrid_marknumber++;
+ igridmins[0] = (int) floor((mins[0] + world->areagrid_bias[0]) * world->areagrid_scale[0]);
+ igridmins[1] = (int) floor((mins[1] + world->areagrid_bias[1]) * world->areagrid_scale[1]);
+ //igridmins[2] = (int) ((mins[2] + world->areagrid_bias[2]) * world->areagrid_scale[2]);
+ igridmaxs[0] = (int) floor((maxs[0] + world->areagrid_bias[0]) * world->areagrid_scale[0]) + 1;
+ igridmaxs[1] = (int) floor((maxs[1] + world->areagrid_bias[1]) * world->areagrid_scale[1]) + 1;
+ //igridmaxs[2] = (int) ((maxs[2] + world->areagrid_bias[2]) * world->areagrid_scale[2]) + 1;
igridmins[0] = max(0, igridmins[0]);
igridmins[1] = max(0, igridmins[1]);
//igridmins[2] = max(0, igridmins[2]);
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)
+ if (world->areagrid_outside.next != &world->areagrid_outside)
{
- for (l = sv_areagrid_outside.edicts.next;l != &sv_areagrid_outside.edicts;l = l->next)
+ grid = &world->areagrid_outside;
+ for (l = grid->next;l != grid;l = l->next)
{
- ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber);
- if (ent->priv.server->areagridmarknumber != sv_areagrid_marknumber)
+ ent = PRVM_EDICT_NUM(l->entitynumber);
+ if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
{
- ent->priv.server->areagridmarknumber = sv_areagrid_marknumber;
- if (!ent->priv.server->free && BoxesOverlap(mins, maxs, ent->fields.server->absmin, ent->fields.server->absmax))
+ ent->priv.server->areagridmarknumber = world->areagrid_marknumber;
+ if (!ent->priv.server->free && BoxesOverlap(mins, maxs, ent->priv.server->areamins, ent->priv.server->areamaxs))
{
if (numlist < maxlist)
list[numlist] = ent;
numlist++;
}
- sv_areagrid_stats_entitychecks++;
+ world->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];
+ grid = world->areagrid + igrid[1] * AREA_GRID + igridmins[0];
for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
{
- if (grid->edicts.next != &grid->edicts)
+ if (grid->next != grid)
{
- for (l = grid->edicts.next;l != &grid->edicts;l = l->next)
+ for (l = grid->next;l != grid;l = l->next)
{
- ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber);
- if (ent->priv.server->areagridmarknumber != sv_areagrid_marknumber)
+ ent = PRVM_EDICT_NUM(l->entitynumber);
+ if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
{
- ent->priv.server->areagridmarknumber = sv_areagrid_marknumber;
- if (!ent->priv.server->free && BoxesOverlap(mins, maxs, ent->fields.server->absmin, ent->fields.server->absmax))
+ ent->priv.server->areagridmarknumber = world->areagrid_marknumber;
+ if (!ent->priv.server->free && BoxesOverlap(mins, maxs, ent->priv.server->areamins, ent->priv.server->areamaxs))
{
if (numlist < maxlist)
list[numlist] = ent;
numlist++;
}
- // Con_Printf("%d %f %f %f %f %f %f : %d : %f %f %f %f %f %f\n", BoxesOverlap(mins, maxs, ent->fields.server->absmin, ent->fields.server->absmax), ent->fields.server->absmin[0], ent->fields.server->absmin[1], ent->fields.server->absmin[2], ent->fields.server->absmax[0], ent->fields.server->absmax[1], ent->fields.server->absmax[2], PRVM_NUM_FOR_EDICT(ent), mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
+ //Con_Printf("%d %f %f %f %f %f %f : %d : %f %f %f %f %f %f\n", BoxesOverlap(mins, maxs, ent->priv.server->areamins, ent->priv.server->areamaxs), ent->priv.server->areamins[0], ent->priv.server->areamins[1], ent->priv.server->areamins[2], ent->priv.server->areamaxs[0], ent->priv.server->areamaxs[1], ent->priv.server->areamaxs[2], PRVM_NUM_FOR_EDICT(ent), mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
}
- sv_areagrid_stats_entitychecks++;
+ world->areagrid_stats_entitychecks++;
}
}
}
return numlist;
}
-void SV_TouchAreaGrid(prvm_edict_t *ent)
+void World_LinkEdict_AreaGrid(world_t *world, prvm_edict_t *ent)
{
- int i, numtouchedicts, old_self, old_other;
- prvm_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->fields.server->absmin, ent->fields.server->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 = prog->globals.server->self;
- old_other = prog->globals.server->other;
- for (i = 0;i < numtouchedicts;i++)
- {
- touch = touchedicts[i];
- if (touch != ent && (int)touch->fields.server->solid == SOLID_TRIGGER && touch->fields.server->touch)
- {
- prog->globals.server->self = PRVM_EDICT_TO_PROG(touch);
- prog->globals.server->other = PRVM_EDICT_TO_PROG(ent);
- prog->globals.server->time = sv.time;
- PRVM_ExecuteProgram (touch->fields.server->touch, "QC function self.touch is missing");
- }
- }
- prog->globals.server->self = old_self;
- prog->globals.server->other = old_other;
-}
-
-void SV_LinkEdict_AreaGrid(prvm_edict_t *ent)
-{
- areagrid_t *grid;
+ link_t *grid;
int igrid[3], igridmins[3], igridmaxs[3], gridnum, entitynumber = PRVM_NUM_FOR_EDICT(ent);
if (entitynumber <= 0 || entitynumber >= prog->max_edicts || PRVM_EDICT_NUM(entitynumber) != ent)
{
- Con_Printf ("SV_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", ent, prog->edicts, entitynumber);
+ Con_Printf ("SV_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", (void *)ent, (void *)prog->edicts, entitynumber);
return;
}
- igridmins[0] = (int) floor((ent->fields.server->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
- igridmins[1] = (int) floor((ent->fields.server->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
- //igridmins[2] = (int) ((ent->fields.server->absmin[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
- igridmaxs[0] = (int) floor((ent->fields.server->absmax[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
- igridmaxs[1] = (int) floor((ent->fields.server->absmax[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
- //igridmaxs[2] = (int) ((ent->fields.server->absmax[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
+ igridmins[0] = (int) floor((ent->priv.server->areamins[0] + world->areagrid_bias[0]) * world->areagrid_scale[0]);
+ igridmins[1] = (int) floor((ent->priv.server->areamins[1] + world->areagrid_bias[1]) * world->areagrid_scale[1]);
+ //igridmins[2] = (int) floor((ent->priv.server->areamins[2] + world->areagrid_bias[2]) * world->areagrid_scale[2]);
+ igridmaxs[0] = (int) floor((ent->priv.server->areamaxs[0] + world->areagrid_bias[0]) * world->areagrid_scale[0]) + 1;
+ igridmaxs[1] = (int) floor((ent->priv.server->areamaxs[1] + world->areagrid_bias[1]) * world->areagrid_scale[1]) + 1;
+ //igridmaxs[2] = (int) floor((ent->priv.server->areamaxs[2] + world->areagrid_bias[2]) * world->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)
{
// wow, something outside the grid, store it as such
- InsertLinkBefore (&ent->priv.server->areagrid[0], &sv_areagrid_outside.edicts, entitynumber);
+ World_InsertLinkBefore (&ent->priv.server->areagrid[0], &world->areagrid_outside, entitynumber);
return;
}
gridnum = 0;
for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
{
- grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0];
+ grid = world->areagrid + igrid[1] * AREA_GRID + igridmins[0];
for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++, gridnum++)
- InsertLinkBefore (&ent->priv.server->areagrid[gridnum], &grid->edicts, entitynumber);
+ World_InsertLinkBefore (&ent->priv.server->areagrid[gridnum], grid, entitynumber);
}
}
/*
===============
-SV_LinkEdict
+World_LinkEdict
===============
*/
-void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
+void World_LinkEdict(world_t *world, prvm_edict_t *ent, const vec3_t mins, const vec3_t maxs)
{
- model_t *model;
-
+ // unlink from old position first
if (ent->priv.server->areagrid[0].prev)
- SV_UnlinkEdict (ent); // unlink from old position
+ World_UnlinkEdict(ent);
+ // don't add the world
if (ent == prog->edicts)
- return; // don't add the world
+ return;
+ // don't add free entities
if (ent->priv.server->free)
return;
-// set the abs box
-
- if (ent->fields.server->solid == SOLID_BSP)
- {
- int modelindex = ent->fields.server->modelindex;
- if (modelindex < 0 || modelindex > MAX_MODELS)
- {
- Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
- modelindex = 0;
- }
- model = sv.models[modelindex];
- if (model != NULL)
- {
- if (!model->TraceBox)
- Con_Printf("edict %i: SOLID_BSP with non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
-
- if (ent->fields.server->angles[0] || ent->fields.server->angles[2] || ent->fields.server->avelocity[0] || ent->fields.server->avelocity[2])
- {
- VectorAdd(ent->fields.server->origin, model->rotatedmins, ent->fields.server->absmin);
- VectorAdd(ent->fields.server->origin, model->rotatedmaxs, ent->fields.server->absmax);
- }
- else if (ent->fields.server->angles[1] || ent->fields.server->avelocity[1])
- {
- VectorAdd(ent->fields.server->origin, model->yawmins, ent->fields.server->absmin);
- VectorAdd(ent->fields.server->origin, model->yawmaxs, ent->fields.server->absmax);
- }
- else
- {
- VectorAdd(ent->fields.server->origin, model->normalmins, ent->fields.server->absmin);
- VectorAdd(ent->fields.server->origin, model->normalmaxs, ent->fields.server->absmax);
- }
- }
- else
- {
- // SOLID_BSP with no model is valid, mainly because some QC setup code does so temporarily
- VectorAdd(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->absmin);
- VectorAdd(ent->fields.server->origin, ent->fields.server->maxs, ent->fields.server->absmax);
- }
- }
- else
- {
- VectorAdd(ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->absmin);
- VectorAdd(ent->fields.server->origin, ent->fields.server->maxs, ent->fields.server->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->fields.server->flags & FL_ITEM)
- {
- ent->fields.server->absmin[0] -= 15;
- ent->fields.server->absmin[1] -= 15;
- ent->fields.server->absmin[2] -= 1;
- ent->fields.server->absmax[0] += 15;
- ent->fields.server->absmax[1] += 15;
- ent->fields.server->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->fields.server->absmin[0] -= 1;
- ent->fields.server->absmin[1] -= 1;
- ent->fields.server->absmin[2] -= 1;
- ent->fields.server->absmax[0] += 1;
- ent->fields.server->absmax[1] += 1;
- ent->fields.server->absmax[2] += 1;
- }
-
- SV_LinkEdict_AreaGrid(ent);
-
-// if touch_triggers, touch all entities at this node and descend for more
- if (touch_triggers && ent->fields.server->solid != SOLID_NOT)
- SV_TouchAreaGrid(ent);
+ VectorCopy(mins, ent->priv.server->areamins);
+ VectorCopy(maxs, ent->priv.server->areamaxs);
+ World_LinkEdict_AreaGrid(world, ent);
}
-
-
-
-/*
-===============================================================================
-
-LINE TESTING IN HULLS
-
-===============================================================================
-*/
-
-/*
-==================
-SV_ClipMoveToEntity
-
-Handles selection or creation of a clipping hull, and offseting (and
-eventually rotation) of the end points
-==================
-*/
-trace_t SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
-{
- trace_t trace;
- model_t *model = NULL;
- matrix4x4_t matrix, imatrix;
- float tempnormal[3], starttransformed[3], endtransformed[3];
-
- memset(&trace, 0, sizeof(trace));
- trace.fraction = trace.realfraction = 1;
- VectorCopy(end, trace.endpos);
-
- if ((int) ent->fields.server->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
- {
- unsigned int modelindex = ent->fields.server->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", PRVM_NUM_FOR_EDICT(ent));
- return trace;
- }
- if (modelindex >= MAX_MODELS)
- {
- Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_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", PRVM_NUM_FOR_EDICT(ent));
- return trace;
- }
-
- if ((int) ent->fields.server->solid == SOLID_BSP)
- {
- if (!model->TraceBox)
- {
- Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with a non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
- return trace;
- }
- //if ((int) ent->fields.server->movetype != MOVETYPE_PUSH)
- //{
- // Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP without MOVETYPE_PUSH\n", PRVM_NUM_FOR_EDICT(ent));
- // return trace;
- //}
- }
- Matrix4x4_CreateFromQuakeEntity(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2], ent->fields.server->angles[0], ent->fields.server->angles[1], ent->fields.server->angles[2], 1);
- }
- else
- Matrix4x4_CreateTranslate(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->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->fields.server->frame;
- frame = bound(0, frame, (model->numframes - 1));
- model->TraceBox(model, frame, &trace, starttransformed, mins, maxs, endtransformed, hitsupercontents);
- }
- else
- Collision_ClipTrace_Box(&trace, ent->fields.server->mins, ent->fields.server->maxs, starttransformed, mins, maxs, endtransformed, hitsupercontents, SUPERCONTENTS_SOLID);
- trace.fraction = bound(0, trace.fraction, 1);
- trace.realfraction = bound(0, trace.realfraction, 1);
-
- 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
- VectorCopy(end, trace.endpos);
-
- return trace;
-}
-
-/*
-==================
-SV_ClipMoveToWorld
-==================
-*/
-trace_t SV_ClipMoveToWorld(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
-{
- trace_t trace;
- memset(&trace, 0, sizeof(trace));
- trace.fraction = trace.realfraction = 1;
- sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, start, mins, maxs, end, hitsupercontents);
- trace.fraction = bound(0, trace.fraction, 1);
- trace.realfraction = bound(0, trace.realfraction, 1);
- VectorLerp(start, trace.fraction, end, trace.endpos);
- return trace;
-}
-
-//===========================================================================
-
-/*
-==================
-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, prvm_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, prvm_edict_t *passedict)
-#endif
-{
- vec3_t hullmins, hullmaxs;
- int i;
- int hitsupercontentsmask;
- int passedictprog;
- qboolean pointtrace;
- prvm_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;
- prvm_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
-
- hitsupercontentsmask = SUPERCONTENTS_SOLID;
- if (passedict)
- {
- if (passedict->fields.server->solid == SOLID_SLIDEBOX)
- hitsupercontentsmask |= SUPERCONTENTS_PLAYERCLIP;
- if ((int)passedict->fields.server->flags & FL_MONSTER)
- hitsupercontentsmask |= SUPERCONTENTS_MONSTERCLIP;
- }
-
- // clip to world
- cliptrace = SV_ClipMoveToWorld(clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
- cliptrace.startsolid = cliptrace.bmodelstartsolid;
- if (cliptrace.startsolid || cliptrace.fraction < 1)
- cliptrace.ent = prog->edicts;
- if (type == MOVE_WORLDONLY)
- return cliptrace;
-
- if (type == MOVE_MISSILE)
- {
- // LordHavoc: modified this, was = -15, now -= 15
- for (i = 0;i < 3;i++)
- {
- clipmins2[i] -= 15;
- clipmaxs2[i] += 15;
- }
- }
-
- // 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);
- }
-
- // 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 == prog->edicts)
- passedict = NULL;
- // precalculate prog value for passedict for comparisons
- passedictprog = PRVM_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 ? PRVM_PROG_TO_EDICT(passedict->fields.server->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->fields.server->solid < SOLID_BBOX)
- continue;
- if (type == MOVE_NOMONSTERS && touch->fields.server->solid != SOLID_BSP)
- continue;
-
- if (passedict)
- {
- // don't clip against self
- if (passedict == touch)
- continue;
- // don't clip owned entities against owner
- if (traceowner == touch)
- continue;
- // don't clip owner against owned entities
- if (passedictprog == touch->fields.server->owner)
- continue;
- // don't clip points against points (they can't collide)
- if (pointtrace && VectorCompare(touch->fields.server->mins, touch->fields.server->maxs) && (type != MOVE_MISSILE || !((int)touch->fields.server->flags & FL_MONSTER)))
- continue;
- // don't clip corpse against character
- if (passedict->fields.server->solid == SOLID_CORPSE && (touch->fields.server->solid == SOLID_SLIDEBOX || touch->fields.server->solid == SOLID_CORPSE))
- continue;
- // don't clip character against corpse
- if (passedict->fields.server->solid == SOLID_SLIDEBOX && touch->fields.server->solid == SOLID_CORPSE)
- continue;
- }
-
- // might interact, so do an exact clip
- if ((int)touch->fields.server->flags & FL_MONSTER)
- trace = SV_ClipMoveToEntity(touch, clipstart, clipmins2, clipmaxs2, clipend, type, hitsupercontentsmask);
- else
- trace = SV_ClipMoveToEntity(touch, clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
- // LordHavoc: take the 'best' answers from the new trace and combine with existing data
- if (trace.allsolid)
- cliptrace.allsolid = true;
- if (trace.startsolid)
- {
- if (touch->fields.server->solid == SOLID_BSP)
- cliptrace.bmodelstartsolid = true;
- cliptrace.startsolid = true;
- if (cliptrace.realfraction == 1)
- cliptrace.ent = touch;
- }
- // 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)
- cliptrace.inwater = true;
- if (trace.realfraction < cliptrace.realfraction)
- {
- cliptrace.fraction = trace.fraction;
- cliptrace.realfraction = trace.realfraction;
- VectorCopy(trace.endpos, cliptrace.endpos);
- cliptrace.plane = trace.plane;
- cliptrace.ent = touch;
- }
- cliptrace.startsupercontents |= trace.startsupercontents;
- }
-
- return cliptrace;
-}
-
-#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, prvm_edict_t *passedict)
-{
- int endstuck;
- trace_t trace;
- vec3_t temp;
- trace = SV_Move_(start, mins, maxs, end, type, passedict);
- if (passedict)
- {
- 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 - prog->edicts : -1, passedict->fields.server->origin[0], passedict->fields.server->origin[1], passedict->fields.server->origin[2], end[0] - passedict->fields.server->origin[0], end[1] - passedict->fields.server->origin[1], end[2] - passedict->fields.server->origin[2], trace.fraction, trace.endpos[0] - passedict->fields.server->origin[0], trace.endpos[1] - passedict->fields.server->origin[1], trace.endpos[2] - passedict->fields.server->origin[2], trace.startsolid ? " startstuck" : "", endstuck ? " endstuck" : "");
- }
- return trace;
-}
-#endif
-
-