X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=world.c;h=3856598764747f08fe78f00bb97cc8cc17ce34e6;hp=6fceef78097595f637210c50b9ecc531dc855861;hb=e24d834dcbcc61f28fdf0e2c1ba75693d9e23ed1;hpb=3b559840aaf1e5a218052d893881c1dd8c1b0780 diff --git a/world.c b/world.c index 6fceef78..38565987 100644 --- a/world.c +++ b/world.c @@ -30,7 +30,6 @@ line of sight checks trace->inopen and trace->inwater, but bullets don't */ cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0"}; -cvar_t sv_polygoncollisions = {CVAR_NOTIFY, "sv_polygoncollisions", "0"}; cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64"}; void SV_AreaStats_f(void); @@ -38,7 +37,6 @@ void SV_AreaStats_f(void); void SV_World_Init(void) { Cvar_RegisterVariable(&sv_debugmove); - Cvar_RegisterVariable(&sv_polygoncollisions); Cvar_RegisterVariable(&sv_areagrid_mingridsize); Cmd_AddCommand("sv_areastats", SV_AreaStats_f); Collision_Init(); @@ -184,10 +182,10 @@ void SV_UnlinkEdict (edict_t *ent) int i; for (i = 0;i < ENTITYGRIDAREAS;i++) { - if (ent->areagrid[i].prev) + if (ent->e->areagrid[i].prev) { - RemoveLink (&ent->areagrid[i]); - ent->areagrid[i].prev = ent->areagrid[i].next = NULL; + RemoveLink (&ent->e->areagrid[i]); + ent->e->areagrid[i].prev = ent->e->areagrid[i].next = NULL; } } } @@ -250,9 +248,9 @@ void SV_TouchAreaGrid(edict_t *ent) { next = l->next; touch = EDICT_NUM(l->entitynumber); - if (touch->areagridmarknumber == sv_areagrid_marknumber) + if (touch->e->areagridmarknumber == sv_areagrid_marknumber) continue; - touch->areagridmarknumber = sv_areagrid_marknumber; + touch->e->areagridmarknumber = sv_areagrid_marknumber; if (ent->v->absmin[0] > touch->v->absmax[0] || ent->v->absmax[0] < touch->v->absmin[0] || ent->v->absmin[1] > touch->v->absmax[1] @@ -260,6 +258,7 @@ void SV_TouchAreaGrid(edict_t *ent) || ent->v->absmin[2] > touch->v->absmax[2] || ent->v->absmax[2] < touch->v->absmin[2]) continue; + // LordHavoc: id bug that won't be fixed: triggers do not ignore their owner like solid objects do if (touch == ent) continue; if (!touch->v->touch || touch->v->solid != SOLID_TRIGGER) @@ -282,7 +281,10 @@ void SV_TouchAreaGrid(edict_t *ent) void SV_LinkEdict_AreaGrid(edict_t *ent) { areagrid_t *grid; - int igrid[3], igridmins[3], igridmaxs[3], gridnum; + int igrid[3], igridmins[3], igridmaxs[3], gridnum, entitynumber = NUM_FOR_EDICT(ent); + + if (entitynumber <= 0 || entitynumber >= sv.max_edicts || EDICT_NUM(entitynumber) != ent) + Host_Error("SV_LinkEdict_AreaGrid: invalid edict %p (sv.edicts is %p, edict compared to sv.edicts is %i)\n", ent, sv.edicts, entitynumber); igridmins[0] = (int) ((ent->v->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]); igridmins[1] = (int) ((ent->v->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]); @@ -294,9 +296,9 @@ void SV_LinkEdict_AreaGrid(edict_t *ent) { // wow, something outside the grid, store it as such if (ent->v->solid == SOLID_TRIGGER) - InsertLinkBefore (&ent->areagrid[0], &sv_areagrid_outside.trigger_edicts, NUM_FOR_EDICT(ent)); + InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.trigger_edicts, entitynumber); else - InsertLinkBefore (&ent->areagrid[0], &sv_areagrid_outside.solid_edicts, NUM_FOR_EDICT(ent)); + InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.solid_edicts, entitynumber); return; } @@ -307,9 +309,9 @@ void SV_LinkEdict_AreaGrid(edict_t *ent) for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++, gridnum++) { if (ent->v->solid == SOLID_TRIGGER) - InsertLinkBefore (&ent->areagrid[gridnum], &grid->trigger_edicts, NUM_FOR_EDICT(ent)); + InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->trigger_edicts, entitynumber); else - InsertLinkBefore (&ent->areagrid[gridnum], &grid->solid_edicts, NUM_FOR_EDICT(ent)); + InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->solid_edicts, entitynumber); } } } @@ -324,13 +326,13 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers) { model_t *model; - if (ent->areagrid[0].prev) + if (ent->e->areagrid[0].prev) SV_UnlinkEdict (ent); // unlink from old position if (ent == sv.edicts) return; // don't add the world - if (ent->free) + if (ent->e->free) return; // set the abs box @@ -342,7 +344,8 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers) model = sv.models[(int) ent->v->modelindex]; if (model != NULL) { - if (model->type != mod_brush) + Mod_CheckLoaded(model); + if (!model->brush.TraceBox) Host_Error("SOLID_BSP with non-BSP model\n"); if (ent->v->angles[0] || ent->v->angles[2] || ent->v->avelocity[0] || ent->v->avelocity[2]) @@ -448,23 +451,26 @@ 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 SV_ClipMoveToEntity(edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end) { int i; trace_t trace; - model_t *model; - - i = ent->v->modelindex; - if ((unsigned int) i >= MAX_MODELS) - Host_Error("SV_ClipMoveToEntity: invalid modelindex\n"); - model = sv.models[i]; - if (i != 0 && model == NULL) - Host_Error("SV_ClipMoveToEntity: invalid modelindex\n"); + 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 ((int) ent->v->solid == SOLID_BSP) { + i = ent->v->modelindex; + if ((unsigned int) i >= MAX_MODELS) + Host_Error("SV_ClipMoveToEntity: invalid modelindex\n"); + model = sv.models[i]; + if (i != 0 && model == NULL) + Host_Error("SV_ClipMoveToEntity: invalid modelindex\n"); + Mod_CheckLoaded(model); - if (model->type != mod_brush) + if (!model->brush.TraceBox) { Con_Printf ("SV_ClipMoveToEntity: SOLID_BSP with a non bsp model, entity dump:\n"); ED_Print (ent); @@ -474,10 +480,26 @@ trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t max Host_Error ("SV_ClipMoveToEntity: SOLID_BSP without MOVETYPE_PUSH"); } - if (sv_polygoncollisions.integer && (mins[0] != maxs[0] || mins[1] != maxs[1] || mins[2] != maxs[2])) - Collision_PolygonClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end); + Matrix4x4_CreateFromQuakeEntity(&matrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], 1); + Matrix4x4_Invert_Simple(&imatrix, &matrix); + Matrix4x4_Transform(&imatrix, start, starttransformed); + Matrix4x4_Transform(&imatrix, end, endtransformed); + VectorAdd(starttransformed, maxs, starttransformedmaxs); + VectorAdd(endtransformed, maxs, endtransformedmaxs); + VectorAdd(starttransformed, mins, starttransformedmins); + VectorAdd(endtransformed, mins, endtransformedmins); + + if (model && model->brush.TraceBox) + model->brush.TraceBox(model, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, SUPERCONTENTS_SOLID); else - Collision_ClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end); + Collision_ClipTrace_Box(&trace, ent->v->mins, ent->v->maxs, starttransformed, mins, maxs, endtransformed, SUPERCONTENTS_SOLID, SUPERCONTENTS_SOLID); + + if (trace.fraction < 1 || trace.startsolid) + trace.ent = ent; + 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 return trace; } @@ -495,9 +517,9 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list) { next = l->next; touch = EDICT_NUM(l->entitynumber); - if (touch->areagridmarknumber == sv_areagrid_marknumber) + if (touch->e->areagridmarknumber == sv_areagrid_marknumber) continue; - touch->areagridmarknumber = sv_areagrid_marknumber; + touch->e->areagridmarknumber = sv_areagrid_marknumber; sv_areagrid_stats_entitychecks++; if (clip->boxmins[0] > touch->v->absmax[0] @@ -516,7 +538,7 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list) if (clip->passedict) { - if (clip->passedict->v->size[0] && !touch->v->size[0]) + if (!clip->passedict->v->size[0] && !touch->v->size[0]) continue; // points never interact if (PROG_TO_EDICT(touch->v->owner) == clip->passedict) continue; // don't clip against own missiles @@ -562,99 +584,27 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list) 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; + clip->trace.ent = touch; } + clip->trace.startsupercontents |= trace.startsupercontents; if (clip->trace.allsolid) return; } } -/* -==================== -SV_ClipToAreaGrid - -Mins and maxs enclose the entire area swept by the move -==================== -*/ -void SV_ClipToAreaGrid(moveclip_t *clip) -{ - areagrid_t *grid; - int igrid[3], igridmins[3], igridmaxs[3]; - - if (clip->trace.allsolid) - return; - - sv_areagrid_stats_calls++; - sv_areagrid_marknumber++; - igridmins[0] = (int) ((clip->boxmins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]); - igridmins[1] = (int) ((clip->boxmins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]); - //igridmins[2] = (int) ((clip->boxmins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]); - igridmaxs[0] = (int) ((clip->boxmaxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1; - igridmaxs[1] = (int) ((clip->boxmaxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1; - //igridmaxs[2] = (int) ((clip->boxmaxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1; - igridmins[0] = max(0, igridmins[0]); - igridmins[1] = max(0, igridmins[1]); - //igridmins[2] = max(0, igridmins[2]); - igridmaxs[0] = min(AREA_GRID, igridmaxs[0]); - igridmaxs[1] = min(AREA_GRID, igridmaxs[1]); - //igridmaxs[2] = min(AREA_GRID, igridmaxs[2]); - - if (sv_areagrid_outside.solid_edicts.next != &sv_areagrid_outside.solid_edicts) - SV_ClipToNode(clip, &sv_areagrid_outside.solid_edicts); - - for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++) - for (grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0], igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++) - if (grid->solid_edicts.next != &grid->solid_edicts) - SV_ClipToNode(clip, &grid->solid_edicts); -} - - -/* -================== -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_debugmove.integer) - { - int i; - - for (i=0 ; i<3 ; i++) - { - if (end[i] > start[i]) - { - boxmins[i] = start[i] + mins[i] - 1; - boxmaxs[i] = end[i] + maxs[i] + 1; - } - else - { - boxmins[i] = end[i] + mins[i] - 1; - boxmaxs[i] = start[i] + maxs[i] + 1; - } - } - } - else - { - // debug to test against everything - boxmins[0] = boxmins[1] = boxmins[2] = -999999999; - boxmaxs[0] = boxmaxs[1] = boxmaxs[2] = 999999999; - } -} - /* ================== SV_Move ================== */ -trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict) +trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict) { - moveclip_t clip; - vec3_t bigmins, bigmaxs; - int i; + moveclip_t clip; + vec3_t bigmins, bigmaxs; + areagrid_t *grid; + int i, igrid[3], igridmins[3], igridmaxs[3]; - memset ( &clip, 0, sizeof ( moveclip_t ) ); + memset(&clip, 0, sizeof(moveclip_t)); VectorCopy(start, clip.start); VectorCopy(end, clip.end); @@ -663,9 +613,16 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e clip.type = type; clip.passedict = passedict; - Collision_RoundUpToHullSize(sv.worldmodel, clip.mins, clip.maxs, clip.hullmins, clip.hullmaxs); + if (sv.worldmodel && sv.worldmodel->brush.RoundUpToHullSize) + sv.worldmodel->brush.RoundUpToHullSize(sv.worldmodel, clip.mins, clip.maxs, clip.hullmins, clip.hullmaxs); - if (type == MOVE_MISSILE) + // clip to world + clip.trace = SV_ClipMoveToEntity(sv.edicts, clip.start, clip.hullmins, clip.hullmaxs, clip.end); + if (clip.type == MOVE_WORLDONLY) + //if (clip.trace.allsolid) + return clip.trace; + + if (clip.type == MOVE_MISSILE) { // LordHavoc: modified this, was = -15, now = clip.mins[i] - 15 for (i=0 ; i<3 ; i++) @@ -687,15 +644,78 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e 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 ); + if (!sv_debugmove.integer) + { + int i; + + for (i=0 ; i<3 ; i++) + { + if (clip.trace.endpos[i] > clip.start[i]) + { + clip.boxmins[i] = clip.start[i] + bigmins[i] - 1; + clip.boxmaxs[i] = clip.trace.endpos[i] + bigmaxs[i] + 1; + } + else + { + clip.boxmins[i] = clip.trace.endpos[i] + bigmins[i] - 1; + clip.boxmaxs[i] = clip.start[i] + bigmaxs[i] + 1; + } + } + } + else + { + // debug to test against everything + clip.boxmins[0] = clip.boxmins[1] = clip.boxmins[2] = -999999999; + clip.boxmaxs[0] = clip.boxmaxs[1] = clip.boxmaxs[2] = 999999999; + } - SV_ClipToAreaGrid(&clip); + // clip to enttiies + sv_areagrid_stats_calls++; + sv_areagrid_marknumber++; + igridmins[0] = (int) ((clip.boxmins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]); + igridmins[1] = (int) ((clip.boxmins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]); + //igridmins[2] = (int) ((clip->boxmins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]); + igridmaxs[0] = (int) ((clip.boxmaxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1; + igridmaxs[1] = (int) ((clip.boxmaxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1; + //igridmaxs[2] = (int) ((clip->boxmaxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1; + igridmins[0] = max(0, igridmins[0]); + igridmins[1] = max(0, igridmins[1]); + //igridmins[2] = max(0, igridmins[2]); + igridmaxs[0] = min(AREA_GRID, igridmaxs[0]); + igridmaxs[1] = min(AREA_GRID, igridmaxs[1]); + //igridmaxs[2] = min(AREA_GRID, igridmaxs[2]); + + if (sv_areagrid_outside.solid_edicts.next != &sv_areagrid_outside.solid_edicts) + SV_ClipToNode(&clip, &sv_areagrid_outside.solid_edicts); + + for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++) + for (grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0], igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++) + if (grid->solid_edicts.next != &grid->solid_edicts) + SV_ClipToNode(&clip, &grid->solid_edicts); return clip.trace; } +int SV_PointQ1Contents(const vec3_t point) +{ +#if 1 + return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents); +#else + if (sv.worldmodel && sv.worldmodel->brush.PointContents) + return sv.worldmodel->brush.PointContents(sv.worldmodel, point); + return CONTENTS_SOLID; +#endif +} + +int SV_PointSuperContents(const vec3_t point) +{ +#if 1 + return SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents; +#else + if (sv.worldmodel && sv.worldmodel->brush.PointContents) + return sv.worldmodel->brush.PointContents(sv.worldmodel, point); + return CONTENTS_SOLID; +#endif +} +