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
*/
-/*
-typedef struct link_s
-{
- struct link_s *prev, *next;
-} link_t;
-*/
+cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0"};
+cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64"};
+void SV_AreaStats_f(void);
-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);
-
-// (type *)STRUCT_FROM_LINK(link_t *link, type, member)
-// ent = STRUCT_FROM_LINK(link,entity_t,order)
-// FIXME: remove this mess!
-//#define STRUCT_FROM_LINK(l,t,m) ((t *)((byte *)l - (int)&(((t *)0)->m)))
-
-#define EDICT_FROM_AREA(l) ((edict_t *)((byte *)l - (int)&(((edict_t *)0)->area)))
+void SV_World_Init(void)
+{
+ Cvar_RegisterVariable(&sv_debugmove);
+ Cvar_RegisterVariable(&sv_areagrid_mingridsize);
+ Cmd_AddCommand("sv_areastats", SV_AreaStats_f);
+ Collision_Init();
+}
//============================================================================
// 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
-{
- vec3_t boxmins, boxmaxs;// enclose the test object along entire move
- float *mins, *maxs; // size of the moving object
- vec3_t mins2, maxs2; // size when clipping against mosnters
- float *start, *end;
- trace_t trace;
- int type;
- edict_t *passedict;
-} moveclip_t;
/*
===============================================================================
-HULL BOXES
+ENTITY AREA CHECKING
===============================================================================
*/
+int sv_areagrid_stats_calls = 0;
+int sv_areagrid_stats_nodechecks = 0;
+int sv_areagrid_stats_entitychecks = 0;
-static hull_t box_hull;
-static dclipnode_t box_clipnodes[6];
-static mplane_t box_planes[6];
-
-/*
-===================
-SV_InitBoxHull
-
-Set up the planes and clipnodes so that the six floats of a bounding box
-can just be stored out and get a proper hull_t structure.
-===================
-*/
-void SV_InitBoxHull (void)
+void SV_AreaStats_f(void)
{
- int i;
- int side;
-
- box_hull.clipnodes = box_clipnodes;
- box_hull.planes = box_planes;
- box_hull.firstclipnode = 0;
- box_hull.lastclipnode = 5;
-
- for (i=0 ; i<6 ; i++)
- {
- box_clipnodes[i].planenum = i;
-
- side = i&1;
-
- box_clipnodes[i].children[side] = CONTENTS_EMPTY;
- if (i != 5)
- box_clipnodes[i].children[side^1] = i + 1;
- else
- box_clipnodes[i].children[side^1] = CONTENTS_SOLID;
-
- box_planes[i].type = i>>1;
- box_planes[i].normal[i>>1] = 1;
- }
-
+ 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;
}
-
-/*
-===================
-SV_HullForBox
-
-To keep everything totally uniform, bounding boxes are turned into small
-BSP trees instead of being compared directly.
-===================
-*/
-hull_t *SV_HullForBox (vec3_t mins, vec3_t maxs)
-{
- box_planes[0].dist = maxs[0];
- box_planes[1].dist = mins[0];
- box_planes[2].dist = maxs[1];
- box_planes[3].dist = mins[1];
- box_planes[4].dist = maxs[2];
- box_planes[5].dist = mins[2];
-
- return &box_hull;
-}
-
-
-
-/*
-================
-SV_HullForEntity
-
-Returns a hull that can be used for testing or clipping an object of mins/maxs
-size.
-Offset is filled in to contain the adjustment that must be added to the
-testing object's origin to get a point to use with the returned hull.
-================
-*/
-hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
+typedef struct areagrid_s
{
- model_t *model;
- vec3_t size;
- vec3_t hullmins, hullmaxs;
- hull_t *hull;
-
-// decide which clipping hull to use, based on the size
- if (ent->v.solid == SOLID_BSP)
- { // explicit hulls in the BSP model
- if (ent->v.movetype != MOVETYPE_PUSH)
- Host_Error ("SOLID_BSP without MOVETYPE_PUSH");
-
- model = sv.models[ (int)ent->v.modelindex ];
- Mod_CheckLoaded(model);
-
- // LordHavoc: fixed SOLID_BSP error message
- if (!model || model->type != mod_brush)
- {
- Con_Printf ("SOLID_BSP with a non bsp model, entity dump:\n");
- ED_Print (ent);
- Host_Error ("SOLID_BSP with a non bsp model\n");
- }
-
- VectorSubtract (maxs, mins, size);
- // LordHavoc: FIXME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- if (sv.worldmodel->ishlbsp)
- {
- if (size[0] < 3)
- hull = &model->hulls[0]; // 0x0x0
- else if (size[0] <= 32)
- {
- if (size[2] < 54) // pick the nearest of 36 or 72
- hull = &model->hulls[3]; // 32x32x36
- else
- hull = &model->hulls[1]; // 32x32x72
- }
- else
- hull = &model->hulls[2]; // 64x64x64
- }
- else
- {
- if (size[0] < 3)
- hull = &model->hulls[0]; // 0x0x0
- else if (size[0] <= 32)
- hull = &model->hulls[1]; // 32x32x56
- else
- hull = &model->hulls[2]; // 64x64x88
- }
-
-// calculate an offset value to center the origin
- VectorSubtract (hull->clip_mins, mins, offset);
- VectorAdd (offset, ent->v.origin, offset);
- }
- else
- { // create a temp hull from bounding box sizes
-
- VectorSubtract (ent->v.mins, maxs, hullmins);
- VectorSubtract (ent->v.maxs, mins, hullmaxs);
- hull = SV_HullForBox (hullmins, hullmaxs);
-
- VectorCopy (ent->v.origin, offset);
- }
-
-
- return hull;
+ link_t edicts;
}
+areagrid_t;
-/*
-===============================================================================
-
-ENTITY AREA CHECKING
+#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;
-typedef struct areanode_s
+void SV_CreateAreaGrid (vec3_t mins, vec3_t maxs)
{
- 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)
-{
- 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;
+ int i;
+ 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_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++)
+ {
+ 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_ClearWorld (void)
{
- SV_InitBoxHull ();
-
- 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)
+void SV_UnlinkEdict (prvm_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->priv.server->areagrid[i].prev)
+ {
+ 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 numlist;
+ areagrid_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) ((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[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 (sv_areagrid_outside.edicts.next != &sv_areagrid_outside.edicts)
+ {
+ for (l = sv_areagrid_outside.edicts.next;l != &sv_areagrid_outside.edicts;l = l->next)
+ {
+ ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber);
+ if (ent->priv.server->areagridmarknumber != sv_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))
+ {
+ 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++)
+ {
+ if (grid->edicts.next != &grid->edicts)
+ {
+ for (l = grid->edicts.next;l != &grid->edicts;l = l->next)
+ {
+ ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber);
+ if (ent->priv.server->areagridmarknumber != sv_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))
+ {
+ if (numlist < maxlist)
+ list[numlist] = ent;
+ numlist++;
+ }
+ }
+ sv_areagrid_stats_entitychecks++;
+ }
+ }
+ }
+ }
+ return numlist;
+}
-/*
-====================
-SV_TouchLinks
-====================
-*/
-void SV_TouchLinks ( edict_t *ent, areanode_t *node )
+void SV_TouchAreaGrid(prvm_edict_t *ent)
{
- link_t *l, *next;
- edict_t *touch;
- int old_self, old_other;
+ int i, numtouchedicts, old_self, old_other;
+ prvm_edict_t *touch, *touchedicts[MAX_EDICTS];
-loc0:
-// touch linked edicts
- for (l = node->trigger_edicts.next ; l != &node->trigger_edicts ; l = next)
+ // 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)
{
- 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, "");
+ // this never happens
+ Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+ numtouchedicts = MAX_EDICTS;
+ }
- pr_global_struct->self = old_self;
- pr_global_struct->other = old_other;
+ 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;
+}
-// recurse down both sides
- if (node->axis == -1)
+void SV_LinkEdict_AreaGrid(prvm_edict_t *ent)
+{
+ areagrid_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);
return;
+ }
- // LordHavoc: optimized recursion
-// if (ent->v.absmax[node->axis] > node->dist) SV_TouchLinks (ent, node->children[0]);
-// if (ent->v.absmin[node->axis] < node->dist) SV_TouchLinks (ent, node->children[1]);
- if (ent->v.absmax[node->axis] > node->dist)
+ igridmins[0] = (int) ((ent->fields.server->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
+ igridmins[1] = (int) ((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) ((ent->fields.server->absmax[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
+ igridmaxs[1] = (int) ((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;
+ 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
+ InsertLinkBefore (&ent->priv.server->areagrid[0], &sv_areagrid_outside.edicts, entitynumber);
+ return;
}
- else
+
+ gridnum = 0;
+ for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
{
- if (ent->v.absmin[node->axis] < node->dist)
- {
- node = node->children[1];
- goto loc0;
- }
+ grid = sv_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);
}
}
-
/*
===============
SV_LinkEdict
===============
*/
-void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
+void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
{
- areanode_t *node;
+ model_t *model;
- if (ent->area.prev)
+ if (ent->priv.server->areagrid[0].prev)
SV_UnlinkEdict (ent); // unlink from old position
-
- if (ent == sv.edicts)
+
+ if (ent == prog->edicts)
return; // don't add the world
- if (ent->free)
+ if (ent->priv.server->free)
return;
// set the abs box
-// LordHavoc: enabling rotating bmodels
- if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))
+ if (ent->fields.server->solid == SOLID_BSP)
{
- // expand for rotation
- float max, v;
- int i;
-
- max = DotProduct(ent->v.mins, ent->v.mins);
- v = DotProduct(ent->v.maxs, ent->v.maxs);
- if (max < v)
- max = v;
- max = sqrt(max);
- /*
- max = 0;
- for (i=0 ; i<3 ; i++)
+ int modelindex = ent->fields.server->modelindex;
+ if (modelindex < 0 || modelindex > MAX_MODELS)
{
- v = fabs(ent->v.mins[i]);
- if (max < v)
- max = v;
- v = fabs(ent->v.maxs[i]);
- if (max < v)
- max = v;
+ Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
+ modelindex = 0;
}
- */
- for (i=0 ; i<3 ; i++)
+ model = sv.models[modelindex];
+ if (model != NULL)
{
- ent->v.absmin[i] = ent->v.origin[i] - max;
- ent->v.absmax[i] = ent->v.origin[i] + max;
+ Mod_CheckLoaded(model);
+ 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->v.origin, ent->v.mins, ent->v.absmin);
- VectorAdd (ent->v.origin, ent->v.maxs, ent->v.absmax);
+ 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->v.flags & FL_ITEM)
+ if ((int)ent->fields.server->flags & FL_ITEM)
{
- ent->v.absmin[0] -= 15;
- ent->v.absmin[1] -= 15;
- ent->v.absmax[0] += 15;
- ent->v.absmax[1] += 15;
+ 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->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->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;
}
- if (ent->v.solid == SOLID_NOT)
+ if (ent->fields.server->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);
}
===============================================================================
*/
-/*
-==================
-SV_HullPointContents
-
-==================
-*/
-int SV_HullPointContents (hull_t *hull, int num, vec3_t p)
-{
- while (num >= 0)
- num = hull->clipnodes[num].children[(hull->planes[hull->clipnodes[num].planenum].type < 3 ? p[hull->planes[hull->clipnodes[num].planenum].type] : DotProduct (hull->planes[hull->clipnodes[num].planenum].normal, p)) < hull->planes[hull->clipnodes[num].planenum].dist];
-
- return num;
-}
-
/*
============
SV_TestEntityPosition
This could be a lot more efficient...
============
*/
-edict_t *SV_TestEntityPosition (edict_t *ent)
+int SV_TestEntityPosition (prvm_edict_t *ent)
{
- trace_t trace;
-
- trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent);
-
- if (trace.startsolid)
- return sv.edicts;
-
- return NULL;
+ return SV_Move (ent->fields.server->origin, ent->fields.server->mins, ent->fields.server->maxs, ent->fields.server->origin, MOVE_NORMAL, ent).startsolid;
}
===============================================================================
*/
-// 1/32 epsilon to keep floating point happy
-//#define DIST_EPSILON (0.03125)
-#define DIST_EPSILON (0.125)
-
-#define HULLCHECKSTATE_EMPTY 0
-#define HULLCHECKSTATE_SOLID 1
-#define HULLCHECKSTATE_DONE 2
-
-// LordHavoc: FIXME: this is not thread safe, if threading matters here, pass
-// this as a struct to RecursiveHullCheck, RecursiveHullCheck_Impact, etc...
-RecursiveHullCheckTraceInfo_t RecursiveHullCheckInfo;
-#define RHC RecursiveHullCheckInfo
+/*
+==================
+SV_ClipMoveToEntity
-void SV_RecursiveHullCheck_Impact (mplane_t *plane, int side)
+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)
{
- // LordHavoc: using doubles for extra accuracy
- double t1, t2, frac;
-
- // LordHavoc: now that we have found the impact, recalculate the impact
- // point from scratch for maximum accuracy, with an epsilon bias on the
- // surface distance
- frac = plane->dist;
- if (side)
- {
- frac -= DIST_EPSILON;
- VectorNegate (plane->normal, RHC.trace->plane.normal);
- RHC.trace->plane.dist = -plane->dist;
- }
- else
- {
- frac += DIST_EPSILON;
- VectorCopy (plane->normal, RHC.trace->plane.normal);
- RHC.trace->plane.dist = plane->dist;
- }
+ 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];
- if (plane->type < 3)
- {
- t1 = RHC.start[plane->type] - frac;
- t2 = RHC.start[plane->type] + RHC.dist[plane->type] - frac;
- }
- else
- {
- t1 = plane->normal[0] * RHC.start[0] + plane->normal[1] * RHC.start[1] + plane->normal[2] * RHC.start[2] - frac;
- t2 = plane->normal[0] * (RHC.start[0] + RHC.dist[0]) + plane->normal[1] * (RHC.start[1] + RHC.dist[1]) + plane->normal[2] * (RHC.start[2] + RHC.dist[2]) - frac;
- }
-
- frac = t1 / (t1 - t2);
- frac = bound(0.0f, frac, 1.0f);
+ memset(&trace, 0, sizeof(trace));
+ trace.fraction = trace.realfraction = 1;
+ VectorCopy(end, trace.endpos);
- RHC.trace->fraction = frac;
- RHC.trace->endpos[0] = RHC.start[0] + frac * RHC.dist[0];
- RHC.trace->endpos[1] = RHC.start[1] + frac * RHC.dist[1];
- RHC.trace->endpos[2] = RHC.start[2] + frac * RHC.dist[2];
-}
-
-int SV_RecursiveHullCheck (int num, float p1f, float p2f, vec3_t p1, vec3_t p2)
-{
- dclipnode_t *node;
- vec3_t mid;
- int side;
- float midf;
- // LordHavoc: FIXME: this is not thread safe... if threading matters here,
- // remove the static prefixes
- static int ret;
- static mplane_t *plane;
- static float t1, t2, frac;
-
- // LordHavoc: a goto! everyone flee in terror... :)
-loc0:
- // check for empty
- if (num < 0)
+ if ((int) ent->fields.server->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
{
- RHC.trace->endcontents = num;
- if (RHC.trace->startcontents)
+ unsigned int modelindex = ent->fields.server->modelindex;
+ // if the modelindex is 0, it shouldn't be SOLID_BSP!
+ if (modelindex == 0)
{
- if (num == RHC.trace->startcontents)
- RHC.trace->allsolid = false;
- else
- {
- // if the first leaf is solid, set startsolid
- if (RHC.trace->allsolid)
- RHC.trace->startsolid = true;
- return HULLCHECKSTATE_SOLID;
- }
- return HULLCHECKSTATE_EMPTY;
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with no model\n", PRVM_NUM_FOR_EDICT(ent));
+ return trace;
}
- else
- {
- if (num != CONTENTS_SOLID)
- {
- RHC.trace->allsolid = false;
- if (num == CONTENTS_EMPTY)
- RHC.trace->inopen = true;
- else
- RHC.trace->inwater = true;
- }
- else
- {
- // if the first leaf is solid, set startsolid
- if (RHC.trace->allsolid)
- RHC.trace->startsolid = true;
- return HULLCHECKSTATE_SOLID;
- }
- return HULLCHECKSTATE_EMPTY;
- }
- }
-
- // find the point distances
- node = RHC.hull->clipnodes + num;
-
- plane = RHC.hull->planes + node->planenum;
- if (plane->type < 3)
- {
- t1 = p1[plane->type] - plane->dist;
- t2 = p2[plane->type] - plane->dist;
- }
- else
- {
- t1 = DotProduct (plane->normal, p1) - plane->dist;
- t2 = DotProduct (plane->normal, p2) - plane->dist;
- }
-
- // LordHavoc: rearranged the side/frac code
- if (t1 >= 0)
- {
- if (t2 >= 0)
+ if (modelindex >= MAX_MODELS)
{
- num = node->children[0];
- goto loc0;
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_NUM_FOR_EDICT(ent));
+ return trace;
}
- // put the crosspoint DIST_EPSILON pixels on the near side
- side = 0;
- }
- else
- {
- if (t2 < 0)
+ model = sv.models[modelindex];
+ if (modelindex != 0 && model == NULL)
{
- num = node->children[1];
- goto loc0;
+ Con_Printf("SV_ClipMoveToEntity: edict %i: SOLID_BSP with invalid modelindex\n", PRVM_NUM_FOR_EDICT(ent));
+ return trace;
}
- // put the crosspoint DIST_EPSILON pixels on the near side
- side = 1;
- }
-
- frac = t1 / (t1 - t2);
- frac = bound(0.0f, frac, 1.0f);
-
- midf = p1f + ((p2f - p1f) * frac);
- mid[0] = RHC.start[0] + midf * RHC.dist[0];
- mid[1] = RHC.start[1] + midf * RHC.dist[1];
- mid[2] = RHC.start[2] + midf * RHC.dist[2];
-
- // front side first
- ret = SV_RecursiveHullCheck (node->children[side], p1f, midf, p1, mid);
- if (ret != HULLCHECKSTATE_EMPTY)
- return ret; // solid or done
- ret = SV_RecursiveHullCheck (node->children[!side], midf, p2f, mid, p2);
- if (ret != HULLCHECKSTATE_SOLID)
- return ret; // empty or done
-
- // front is air and back is solid, this is the impact point...
- SV_RecursiveHullCheck_Impact(RHC.hull->planes + node->planenum, side);
-
- return HULLCHECKSTATE_DONE;
-}
-
-/*
-qboolean SV_RecursiveHullCheckContentBoundary (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace)
-{
- dclipnode_t *node;
- mplane_t *plane;
- float t1, t2;
- float frac;
- int i;
- vec3_t mid;
- int side;
- float midf;
-
- // LordHavoc: a goto! everyone flee in terror... :)
-loc0:
-// check for empty
- if (num < 0)
- {
- if (num != trace->startcontents)
- trace->startsolid = true;
- else
- trace->allsolid = false;
- return true; // empty
- }
-
-// find the point distances
- node = hull->clipnodes + num;
- plane = hull->planes + node->planenum;
- if (plane->type < 3)
- {
- t1 = p1[plane->type] - plane->dist;
- t2 = p2[plane->type] - plane->dist;
- }
- else
- {
- t1 = DotProduct (plane->normal, p1) - plane->dist;
- t2 = DotProduct (plane->normal, p2) - plane->dist;
- }
-
- // LordHavoc: rearranged the side/frac code
- // LordHavoc: recursion optimization
- if (t1 >= 0)
- {
- if (t2 >= 0)
+ Mod_CheckLoaded(model);
+ if ((int) ent->fields.server->solid == SOLID_BSP)
{
- num = node->children[0];
- goto loc0;
+ 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;
+ //}
}
- // put the crosspoint DIST_EPSILON pixels on the near side
- side = 0;
+ 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
- {
- if (t2 < 0)
- {
- num = node->children[1];
- goto loc0;
- }
- // put the crosspoint DIST_EPSILON pixels on the near side
- side = 1;
- }
-
- frac = t1 / (t1 - t2);
- frac = bound(0.0f, frac, 1.0f);
+ Matrix4x4_CreateTranslate(&matrix, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2]);
- midf = p1f + ((p2f - p1f) * frac);
- mid[0] = p1[0] + ((p2[0] - p1[0]) * frac);
- mid[1] = p1[1] + ((p2[1] - p1[1]) * frac);
- mid[2] = p1[2] + ((p2[2] - p1[2]) * frac);
-
-// move up to the node
- if (!SV_RecursiveHullCheck (hull, node->children[side], p1f, midf, p1, mid, trace) )
- return false;
-
-*/
- /*
-#ifdef PARANOID
- if (SV_HullPointContents (pm_hullmodel, mid, node->children[side]) != trace->startcontents)
- {
- Con_Printf ("mid PointInHullSolid\n");
- return false;
- }
+ 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
- */
-/*
-
- // LordHavoc: warning to the clumsy, this recursion can not be optimized because mid would need to be duplicated on a stack
- if (SV_HullPointContents (hull, node->children[side^1], mid) == trace->startcontents)
-// go past the node
- return SV_RecursiveHullCheck (hull, node->children[side^1], midf, p2f, mid, p2, trace);
-
- if (trace->allsolid)
- return false; // never got out of the solid area
-//==================
-// the other side of the node is solid, this is the impact point
-//==================
- if (!side)
+ if (model && model->TraceBox)
{
- VectorCopy (plane->normal, trace->plane.normal);
- trace->plane.dist = plane->dist;
+ int frame;
+ frame = (int)ent->fields.server->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, hitsupercontents);
}
else
- {
- VectorNegate (plane->normal, trace->plane.normal);
- trace->plane.dist = -plane->dist;
- }
+ 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);
-*/
- /*
- while (SV_HullPointContents (hull, hull->firstclipnode, mid) != trace->startcontents)
+ if (trace.fraction < 1)
{
- // shouldn't really happen, but does occasionally
- frac -= 0.1;
- if (frac < 0)
- {
- trace->fraction = midf;
- VectorCopy (mid, trace->endpos);
- Con_DPrintf ("backup past 0\n");
- return false;
- }
- midf = p1f + (p2f - p1f)*frac;
- mid[0] = p1[0] + frac*(p2[0] - p1[0]);
- mid[1] = p1[1] + frac*(p2[1] - p1[1]);
- mid[2] = p1[2] + frac*(p2[2] - p1[2]);
+ 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
}
- */
-/*
-
- frac = t1;
- if (side)
- frac += DIST_EPSILON;
else
- frac -= DIST_EPSILON;
-
- frac /= (t1 - t2);
- frac = bound(0.0f, frac, 1.0f);
-
- trace->fraction = p1f + (p2f - p1f)*frac;
- trace->endpos[0] = p1[0] + frac*(p2[0] - p1[0]);
- trace->endpos[1] = p1[1] + frac*(p2[1] - p1[1]);
- trace->endpos[2] = p1[2] + frac*(p2[2] - p1[2]);
+ VectorCopy(end, trace.endpos);
- return false;
+ return trace;
}
-*/
+
+//===========================================================================
/*
-// FIXME: this is broken and I'm not interested in figuring out what is broken about it right now
-qboolean SV_TestLine (hull_t *hull, int num, vec3_t p1, vec3_t p2)
+==================
+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
{
- dclipnode_t *node;
- mplane_t *plane;
- float t1, t2, frac;
- vec3_t mid;
- int side;
-
-loc0:
-// check for empty
- if (num < 0)
- return num != CONTENTS_SOLID;
-
- if (num < hull->firstclipnode || num > hull->lastclipnode)
- Sys_Error ("SV_RecursiveHullCheck: bad node number");
+ 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
-//
-// find the point distances
-//
- node = hull->clipnodes + num;
- if (node->children[0] < 0)
+ hitsupercontentsmask = SUPERCONTENTS_SOLID;
+ if (passedict)
{
- if (node->children[0] == CONTENTS_SOLID)
- return false;
- if (node->children[1] < 0)
- return node->children[1] != CONTENTS_SOLID;
+ if (passedict->fields.server->solid == SOLID_SLIDEBOX)
+ hitsupercontentsmask |= SUPERCONTENTS_PLAYERCLIP;
+ if ((int)passedict->fields.server->flags & FL_MONSTER)
+ hitsupercontentsmask |= SUPERCONTENTS_MONSTERCLIP;
}
- else if (node->children[1] == CONTENTS_SOLID)
- return false;
- plane = hull->planes + node->planenum;
+ // clip to world
+ cliptrace = SV_ClipMoveToEntity(prog->edicts, clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
+ if (cliptrace.startsolid || cliptrace.fraction < 1)
+ cliptrace.ent = prog->edicts;
+ if (type == MOVE_WORLDONLY)
+ return cliptrace;
- if (plane->type < 3)
- {
- t1 = p1[plane->type] - plane->dist;
- t2 = p2[plane->type] - plane->dist;
- }
- else
- {
- t1 = DotProduct (plane->normal, p1) - plane->dist;
- t2 = DotProduct (plane->normal, p2) - plane->dist;
- }
-
- if (t1 >= 0)
+ if (type == MOVE_MISSILE)
{
- if (t2 >= 0)
+ // LordHavoc: modified this, was = -15, now -= 15
+ for (i = 0;i < 3;i++)
{
- num = node->children[0];
- goto loc0;
+ clipmins2[i] -= 15;
+ clipmaxs2[i] += 15;
}
- side = 0;
}
+
+ // 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
{
- if (t2 < 0)
- {
- num = node->children[1];
- goto loc0;
- }
- side = 1;
+ VectorCopy(clipmins, hullmins);
+ VectorCopy(clipmaxs, hullmaxs);
}
- if (node->children[side] < 0)
+ // create the bounding box of the entire move
+ for (i = 0;i < 3;i++)
{
- if (node->children[side] == CONTENTS_SOLID)
- return false;
-
- if (node->children[!side] < 0)
- return node->children[!side] != CONTENTS_SOLID;
- else
- {
- frac = t1 / (t1 - t2);
- frac = bound(0, frac, 1);
-
- mid[0] = p1[0] + frac*(p2[0] - p1[0]);
- mid[1] = p1[1] + frac*(p2[1] - p1[1]);
- mid[2] = p1[2] + frac*(p2[2] - p1[2]);
-
- return SV_TestLine(hull, node->children[!side], mid, p2);
- }
- }
- else
- {
- if (node->children[!side] < 0)
- {
- if (node->children[!side] == CONTENTS_SOLID)
- return false;
-
- frac = t1 / (t1 - t2);
- frac = bound(0, frac, 1);
-
- mid[0] = p1[0] + frac*(p2[0] - p1[0]);
- mid[1] = p1[1] + frac*(p2[1] - p1[1]);
- mid[2] = p1[2] + frac*(p2[2] - p1[2]);
-
- return SV_TestLine(hull, node->children[side], p1, mid);
- }
- else
- {
- frac = t1 / (t1 - t2);
- frac = bound(0, frac, 1);
-
- mid[0] = p1[0] + frac*(p2[0] - p1[0]);
- mid[1] = p1[1] + frac*(p2[1] - p1[1]);
- mid[2] = p1[2] + frac*(p2[2] - p1[2]);
-
- if (SV_TestLine(hull, node->children[side], p1, mid))
- return SV_TestLine(hull, node->children[!side], mid, p2);
- else
- return false;
- }
+ 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;
}
-}
-*/
-
-
-/*
-==================
-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)
-{
- trace_t trace;
- vec3_t offset;
- vec3_t start_l, end_l;
- hull_t *hull;
-
-// fill in a default trace
- memset (&trace, 0, sizeof(trace_t));
- trace.fraction = 1;
- trace.allsolid = true;
- VectorCopy (end, trace.endpos);
-
-// get the clipping hull
- hull = SV_HullForEntity (ent, mins, maxs, offset);
-
- VectorSubtract (start, offset, start_l);
- VectorSubtract (end, offset, end_l);
-
-// LordHavoc: enabling rotating bmodels
- // rotate start and end into the models frame of reference
- if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))
+ // debug override to test against everything
+ if (sv_debugmove.integer)
{
- vec3_t forward, right, up;
- vec3_t temp;
-
- AngleVectors (ent->v.angles, forward, right, up);
-
- VectorCopy (start_l, temp);
- start_l[0] = DotProduct (temp, forward);
- start_l[1] = -DotProduct (temp, right);
- start_l[2] = DotProduct (temp, up);
-
- VectorCopy (end_l, temp);
- end_l[0] = DotProduct (temp, forward);
- end_l[1] = -DotProduct (temp, right);
- end_l[2] = DotProduct (temp, up);
+ clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
+ clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = 999999999;
}
-// trace a line through the apropriate clipping hull
- VectorCopy(start_l, RecursiveHullCheckInfo.start);
- VectorSubtract(end_l, start_l, RecursiveHullCheckInfo.dist);
- RecursiveHullCheckInfo.hull = hull;
- RecursiveHullCheckInfo.trace = &trace;
- SV_RecursiveHullCheck (hull->firstclipnode, 0, 1, start_l, end_l);
+ // 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;
-// LordHavoc: enabling rotating bmodels
- // rotate endpos back to world frame of reference
- if (ent->v.solid == SOLID_BSP && (ent->v.angles[0] || ent->v.angles[1] || ent->v.angles[2]))
+ // clip to enttiies
+ numtouchedicts = SV_EntitiesInBox(clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts);
+ if (numtouchedicts > MAX_EDICTS)
{
- vec3_t a;
- vec3_t forward, right, up;
- vec3_t temp;
-
- if (trace.fraction != 1)
- {
- VectorNegate (ent->v.angles, a);
- AngleVectors (a, forward, right, up);
-
- VectorCopy (trace.endpos, temp);
- trace.endpos[0] = DotProduct (temp, forward);
- trace.endpos[1] = -DotProduct (temp, right);
- trace.endpos[2] = DotProduct (temp, up);
-
- VectorCopy (trace.plane.normal, temp);
- trace.plane.normal[0] = DotProduct (temp, forward);
- trace.plane.normal[1] = -DotProduct (temp, right);
- trace.plane.normal[2] = DotProduct (temp, up);
- }
+ // this never happens
+ Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+ numtouchedicts = MAX_EDICTS;
}
-
-// fix trace up by the offset
- if (trace.fraction != 1)
- VectorAdd (trace.endpos, offset, trace.endpos);
-
-// did we clip the move?
- if (trace.fraction < 1 || trace.startsolid )
- trace.ent = ent;
-
- return trace;
-}
-
-//===========================================================================
-
-/*
-====================
-SV_ClipToLinks
-
-Mins and maxs enclose the entire area swept by the move
-====================
-*/
-void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip )
-{
- link_t *l, *next;
- edict_t *touch;
- trace_t trace;
-
-loc0:
-// touch linked edicts
- for (l = node->solid_edicts.next ; l != &node->solid_edicts ; l = next)
+ for (i = 0;i < numtouchedicts;i++)
{
- 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)
- Sys_Error ("Trigger in clipping list");
+ touch = touchedicts[i];
- if (clip->type == MOVE_NOMONSTERS && touch->v.solid != SOLID_BSP)
+ if (touch->fields.server->solid < SOLID_BBOX)
continue;
-
- if (clip->boxmins[0] > touch->v.absmax[0]
- || clip->boxmins[1] > touch->v.absmax[1]
- || clip->boxmins[2] > touch->v.absmax[2]
- || clip->boxmaxs[0] < touch->v.absmin[0]
- || clip->boxmaxs[1] < touch->v.absmin[1]
- || clip->boxmaxs[2] < touch->v.absmin[2])
+ if (type == MOVE_NOMONSTERS && touch->fields.server->solid != SOLID_BSP)
continue;
- if (clip->passedict != NULL && clip->passedict->v.size[0] && !touch->v.size[0])
- continue; // points never interact
-
- // might intersect, so do an exact clip
- if (clip->trace.allsolid)
- return;
- if (clip->passedict)
+ if (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)
- continue; // don't clip against owner
- // LordHavoc: corpse code
- if (clip->passedict->v.solid == SOLID_CORPSE && touch->v.solid == SOLID_SLIDEBOX)
+ // 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->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;
}
- if ((int)touch->v.flags & FL_MONSTER)
- trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2, clip->maxs2, clip->end);
+ // 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, clip->start, clip->mins, clip->maxs, clip->end);
- if (trace.allsolid || trace.startsolid || trace.fraction < clip->trace.fraction)
+ 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)
{
- trace.ent = touch;
- if (clip->trace.startsolid)
- {
- clip->trace = trace;
- clip->trace.startsolid = true;
- }
- else
- clip->trace = trace;
+ 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;
}
- else if (trace.startsolid)
- clip->trace.startsolid = true;
+ cliptrace.startsupercontents |= trace.startsupercontents;
}
-// recurse down both sides
- if (node->axis == -1)
- return;
-
- // LordHavoc: optimized recursion
-// if (clip->boxmaxs[node->axis] > node->dist) SV_ClipToLinks(node->children[0], clip);
-// if (clip->boxmins[node->axis] < node->dist) SV_ClipToLinks(node->children[1], clip);
- if (clip->boxmaxs[node->axis] > node->dist)
- {
- if (clip->boxmins[node->axis] < node->dist)
- 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;
- }
+ 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, prvm_edict_t *passedict)
{
-#if 0
-// debug to test against everything
-boxmins[0] = boxmins[1] = boxmins[2] = -9999;
-boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 9999;
-#else
- int i;
-
- for (i=0 ; i<3 ; i++)
- {
- if (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;
- }
- }
+ 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
-/*
-==================
-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;
- int i;
-
- memset ( &clip, 0, sizeof ( moveclip_t ) );
-
-// clip to world
- clip.trace = SV_ClipMoveToEntity ( sv.edicts, start, mins, maxs, end );
-
- clip.start = start;
- clip.end = end;
- clip.mins = mins;
- clip.maxs = maxs;
- clip.type = type;
- clip.passedict = passedict;
-
- if (type == MOVE_MISSILE)
- {
- for (i=0 ; i<3 ; i++)
- {
- clip.mins2[i] = -15;
- clip.maxs2[i] = 15;
- }
- }
- else
- {
- VectorCopy (mins, clip.mins2);
- VectorCopy (maxs, clip.maxs2);
- }
+ return SV_Move(point, vec3_origin, vec3_origin, point, sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents;
+}
-// create the bounding box of the entire move
- SV_MoveBounds ( start, clip.mins2, clip.maxs2, end, clip.boxmins, clip.boxmaxs );
+int SV_PointQ1Contents(const vec3_t point)
+{
+ return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(point));
+}
-// clip to entities
- SV_ClipToLinks ( sv_areanodes, &clip );
- return clip.trace;
-}
projects / xonotic / darkplaces.git / blobdiff