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"};
-
-void SV_World_Init(void)
+void World_Init(void)
{
- Cvar_RegisterVariable(&sv_useareanodes);
+ Collision_Init();
}
-
-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)))
-
//============================================================================
-// ClearLink is used for new headnodes
-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;
}
-void RemoveLink (link_t *l)
+void World_RemoveLink (link_t *l)
{
l->next->prev = l->prev;
l->prev->next = l->next;
}
-void InsertLinkBefore (link_t *l, link_t *before)
+void World_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;
-
-/*
-===============
-SV_CreateAreaNode
-
-===============
-*/
-areanode_t *SV_CreateAreaNode (int depth, vec3_t mins, vec3_t maxs)
+void World_PrintAreaStats(world_t *world, const char *worldname)
{
- areanode_t *anode;
- vec3_t size;
- vec3_t mins1, maxs1, mins2, maxs2;
-
- anode = &sv_areanodes[sv_numareanodes];
- sv_numareanodes++;
-
- 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);
-
- 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_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;
}
/*
===============
-SV_ClearWorld
+World_Clear
===============
*/
-void SV_ClearWorld (void)
+void World_Clear(world_t *world)
{
- 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);
+ int i;
+ // 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
+ 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
+ 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(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++)
+ World_ClearLink(&world->areagrid[i]);
+ Con_DPrintf("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_UnlinkEdict
===============
*/
-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;
-}
-
-
-/*
-====================
-SV_TouchLinks
-====================
-*/
-void SV_TouchLinks ( edict_t *ent, areanode_t *node )
+void World_UnlinkEdict(prvm_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)
- {
- next = l->next;
- touch = EDICT_FROM_AREA(l);
- if (touch == ent)
- continue;
- 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])
- 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;
- }
-
-// recurse down both sides
- if (node->axis == -1)
- return;
-
- if (ent->v.absmax[node->axis] > node->dist)
- {
- 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;
- }
- else
+ int i;
+ for (i = 0;i < ENTITYGRIDAREAS;i++)
{
- if (ent->v.absmin[node->axis] < node->dist)
+ if (ent->priv.server->areagrid[i].prev)
{
- node = node->children[1];
- goto loc0;
+ World_RemoveLink (&ent->priv.server->areagrid[i]);
+ ent->priv.server->areagrid[i].prev = ent->priv.server->areagrid[i].next = NULL;
}
}
}
-
-/*
-===============
-SV_LinkEdict
-
-===============
-*/
-void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
+int World_EntitiesInBox(world_t *world, const vec3_t mins, const vec3_t maxs, int maxlist, prvm_edict_t **list)
{
- 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
-
- if (ent->free)
- return;
-
-// set the abs box
-
- if (ent->v.solid == SOLID_BSP)
+ int numlist;
+ link_t *grid;
+ link_t *l;
+ prvm_edict_t *ent;
+ int igrid[3], igridmins[3], igridmaxs[3];
+
+ // 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]);
+ igridmaxs[0] = min(AREA_GRID, igridmaxs[0]);
+ igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
+ //igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
+
+ numlist = 0;
+ // add entities not linked into areagrid because they are too big or
+ // outside the grid bounds
+ if (world->areagrid_outside.next != &world->areagrid_outside)
{
- 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)
+ grid = &world->areagrid_outside;
+ for (l = grid->next;l != grid;l = l->next)
{
- 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])
+ ent = PRVM_EDICT_NUM(l->entitynumber);
+ if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
{
- VectorAdd(ent->v.origin, model->rotatedmins, ent->v.absmin);
- VectorAdd(ent->v.origin, model->rotatedmaxs, ent->v.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++;
+ }
+ world->areagrid_stats_entitychecks++;
}
- 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);
- }
- }
- 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);
}
}
- else
- {
- 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)
- {
- 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;
- }
-
- 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);
-
-// if touch_triggers, touch all entities at this node and descend for more
- if (touch_triggers)
- SV_TouchLinks ( ent, sv_areanodes );
-}
-
-
-
-/*
-===============================================================================
-
-POINT TESTING IN HULLS
-
-===============================================================================
-*/
-
-/*
-============
-SV_TestEntityPosition
-
-This could be a lot more efficient...
-============
-*/
-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;
-}
-
-
-/*
-===============================================================================
-
-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 (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end)
-{
- 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)
+ // add grid linked entities
+ for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
{
- Mod_CheckLoaded(model);
- if (model->type != mod_brush)
+ grid = world->areagrid + igrid[1] * AREA_GRID + igridmins[0];
+ for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
{
- 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 (grid->next != grid)
+ {
+ for (l = grid->next;l != grid;l = l->next)
+ {
+ ent = PRVM_EDICT_NUM(l->entitynumber);
+ if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
+ {
+ 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->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]);
+ }
+ world->areagrid_stats_entitychecks++;
+ }
+ }
}
- 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);
-
- return trace;
+ return numlist;
}
-//===========================================================================
-
-/*
-====================
-SV_ClipToLinks
-
-Mins and maxs enclose the entire area swept by the move
-====================
-*/
-void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip )
+void World_LinkEdict_AreaGrid(world_t *world, prvm_edict_t *ent)
{
- link_t *l, *next;
- edict_t *touch;
- trace_t trace;
+ link_t *grid;
+ int igrid[3], igridmins[3], igridmaxs[3], gridnum, entitynumber = PRVM_NUM_FOR_EDICT(ent);
-loc0:
- if (clip->trace.allsolid)
- return;
-// touch linked edicts
- for (l = node->solid_edicts.next ; l != &node->solid_edicts ; l = next)
+ if (entitynumber <= 0 || entitynumber >= prog->max_edicts || PRVM_EDICT_NUM(entitynumber) != ent)
{
- next = l->next;
- touch = EDICT_FROM_AREA(l);
- if (touch->v.solid == SOLID_NOT)
- continue;
- if (touch == clip->passedict)
- continue;
- if (touch->v.solid == SOLID_TRIGGER)
- 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->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)
- {
- 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))
- continue;
- if (clip->passedict->v.solid == SOLID_SLIDEBOX && touch->v.solid == SOLID_CORPSE)
- continue;
- }
-
- // 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);
- // LordHavoc: take the 'best' answers from the new trace and combine with existing data
- if (trace.allsolid)
- clip->trace.allsolid = true;
- if (trace.startsolid)
- {
- clip->trace.startsolid = true;
- if (!clip->trace.ent)
- clip->trace.ent = trace.ent;
- }
- if (trace.inopen)
- clip->trace.inopen = true;
- if (trace.inwater)
- clip->trace.inwater = true;
- if (trace.fraction < clip->trace.fraction)
- {
- clip->trace.fraction = trace.fraction;
- VectorCopy(trace.endpos, clip->trace.endpos);
- clip->trace.plane = trace.plane;
- clip->trace.endcontents = trace.endcontents;
- clip->trace.ent = trace.ent;
- }
- }
-
-// recurse down both sides
- if (node->axis == -1)
+ Con_Printf ("SV_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", ent, prog->edicts, entitynumber);
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_MoveBounds
-==================
-*/
-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)
+ 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)
{
- 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;
- }
- }
+ // wow, something outside the grid, store it as such
+ World_InsertLinkBefore (&ent->priv.server->areagrid[0], &world->areagrid_outside, entitynumber);
+ return;
}
- else
+
+ gridnum = 0;
+ for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
{
- // debug to test against everything
- boxmins[0] = boxmins[1] = boxmins[2] = -999999999;
- boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 999999999;
+ grid = world->areagrid + igrid[1] * AREA_GRID + igridmins[0];
+ for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++, gridnum++)
+ World_InsertLinkBefore (&ent->priv.server->areagrid[gridnum], grid, entitynumber);
}
}
/*
-==================
-SV_Move
-==================
+===============
+World_LinkEdict
+
+===============
*/
-trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict)
+void World_LinkEdict(world_t *world, prvm_edict_t *ent, const vec3_t mins, const vec3_t maxs)
{
- 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);
- }
+ // unlink from old position first
+ if (ent->priv.server->areagrid[0].prev)
+ World_UnlinkEdict(ent);
- 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 );
+ // don't add the world
+ if (ent == prog->edicts)
+ return;
- SV_ClipToLinks ( sv_areanodes, &clip );
+ // don't add free entities
+ if (ent->priv.server->free)
+ return;
- return clip.trace;
+ VectorCopy(mins, ent->priv.server->areamins);
+ VectorCopy(maxs, ent->priv.server->areamaxs);
+ World_LinkEdict_AreaGrid(world, ent);
}
-
projects / xonotic / darkplaces.git / blobdiff