X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_collision.c;h=28f908e89096ecb02e810f86c9c2b600c8c6967d;hb=875c1aa1a2744ba68cc4afcedd299b7f7a320481;hp=c97f0a3f4dbff6efc60ee914815f812d35606bc3;hpb=0960c1f25d397c09f680454759f4ea747975c8c9;p=xonotic%2Fdarkplaces.git diff --git a/cl_collision.c b/cl_collision.c index c97f0a3f..28f908e8 100644 --- a/cl_collision.c +++ b/cl_collision.c @@ -35,27 +35,22 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co entity_render_t *ent; vec3_t tracemins, tracemaxs; trace_t cliptrace, trace; - vec3_t starttransformed, endtransformed, starttransformedmins, endtransformedmins, starttransformedmaxs, endtransformedmaxs; - vec3_t startmins, startmaxs, endmins, endmaxs, entmins, entmaxs; + vec3_t origin; + vec3_t starttransformed, endtransformed; + vec3_t entmins, entmaxs; vec_t *playermins, *playermaxs; - VectorAdd(start, mins, startmins); - VectorAdd(start, maxs, startmaxs); - VectorAdd(end, mins, endmins); - VectorAdd(end, maxs, endmaxs); - memset (&cliptrace, 0 , sizeof(trace_t)); cliptrace.fraction = 1; cliptrace.realfraction = 1; - Mod_CheckLoaded(cl.worldmodel); if (cl.worldmodel && cl.worldmodel->TraceBox) - cl.worldmodel->TraceBox(cl.worldmodel, 0, &cliptrace, startmins, startmaxs, endmins, endmaxs, hitsupercontentsmask); + cl.worldmodel->TraceBox(cl.worldmodel, 0, &cliptrace, start, mins, maxs, end, hitsupercontentsmask); if (hitent) *hitent = 0; - if (hitbmodels && cl_num_brushmodel_entities) + if (hitbmodels && cl.num_brushmodel_entities) { tracemins[0] = min(start[0], end[0]) + mins[0]; tracemaxs[0] = max(start[0], end[0]) + maxs[0]; @@ -65,25 +60,21 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co tracemaxs[2] = max(start[2], end[2]) + maxs[2]; // look for embedded bmodels - for (n = 0;n < cl_num_brushmodel_entities;n++) + for (n = 0;n < cl.num_brushmodel_entities;n++) { - ent = &cl_entities[cl_brushmodel_entities[n]].render; + ent = &cl.entities[cl.brushmodel_entities[n]].render; if (!BoxesOverlap(tracemins, tracemaxs, ent->mins, ent->maxs)) continue; Matrix4x4_Transform(&ent->inversematrix, start, starttransformed); Matrix4x4_Transform(&ent->inversematrix, end, endtransformed); - VectorAdd(starttransformed, mins, starttransformedmins); - VectorAdd(starttransformed, maxs, starttransformedmaxs); - VectorAdd(endtransformed, mins, endtransformedmins); - VectorAdd(endtransformed, maxs, endtransformedmaxs); memset (&trace, 0 , sizeof(trace_t)); trace.fraction = 1; trace.realfraction = 1; if (ent->model && ent->model->TraceBox) - ent->model->TraceBox(ent->model, 0, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, hitsupercontentsmask); + ent->model->TraceBox(ent->model, 0, &trace, start, mins, maxs, endtransformed, hitsupercontentsmask); // LordHavoc: take the 'best' answers from the new trace and combine with existing data if (trace.allsolid) @@ -93,7 +84,7 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co cliptrace.startsolid = true; if (cliptrace.realfraction == 1) if (hitent) - *hitent = cl_brushmodel_entities[n]; + *hitent = cl.brushmodel_entities[n]; } // don't set this except on the world, because it can easily confuse // monsters underwater if there's a bmodel involved in the trace @@ -108,7 +99,7 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co cliptrace.realfraction = trace.realfraction; cliptrace.plane = trace.plane; if (hitent) - *hitent = cl_brushmodel_entities[n]; + *hitent = cl.brushmodel_entities[n]; Matrix4x4_Transform3x3(&ent->matrix, trace.plane.normal, cliptrace.plane.normal); } cliptrace.startsupercontents |= trace.startsupercontents; @@ -127,12 +118,13 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co { if (n != cl.playerentity) { - ent = &cl_entities[n].render; + ent = &cl.entities[n].render; // FIXME: crouch - playermins = cl_playerstandmins; - playermaxs = cl_playerstandmaxs; - VectorAdd(ent->origin, playermins, entmins); - VectorAdd(ent->origin, playermaxs, entmaxs); + playermins = cl.playerstandmins; + playermaxs = cl.playerstandmaxs; + Matrix4x4_OriginFromMatrix(&ent->matrix, origin); + VectorAdd(origin, playermins, entmins); + VectorAdd(origin, playermaxs, entmaxs); if (!BoxesOverlap(tracemins, tracemaxs, entmins, entmaxs)) continue; @@ -180,10 +172,12 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co return cliptrace; } -float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent) +float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent, qboolean csqcents) { float maxfrac, maxrealfrac; - int n; + int n, entsnum; + entity_t *entlist; + unsigned char *entactivelist; entity_render_t *ent; float tracemins[3], tracemaxs[3]; trace_t trace; @@ -196,13 +190,11 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve if (hitent) *hitent = 0; - Mod_CheckLoaded(cl.worldmodel); if (cl.worldmodel && cl.worldmodel->TraceBox) cl.worldmodel->TraceBox(cl.worldmodel, 0, &trace, start, start, end, end, SUPERCONTENTS_SOLID); if (normal) VectorCopy(trace.plane.normal, normal); - //cl_traceline_startsupercontents = trace.startsupercontents; maxfrac = trace.fraction; maxrealfrac = trace.realfraction; @@ -213,18 +205,33 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve tracemins[2] = min(start[2], end[2]); tracemaxs[2] = max(start[2], end[2]); + if(csqcents) + { + entlist = cl.csqcentities; + entactivelist = cl.csqcentities_active; + entsnum = cl.num_csqcentities; + } + else + { + entlist = cl.entities; + entactivelist = cl.entities_active; + entsnum = cl.num_entities; + } + // look for embedded bmodels - for (n = 0;n < cl_num_entities;n++) + for (n = 0;n < entsnum;n++) { - if (!cl_entities_active[n]) + if (!entactivelist[n]) continue; - ent = &cl_entities[n].render; + ent = &entlist[n].render; if (!BoxesOverlap(ent->mins, ent->maxs, tracemins, tracemaxs)) continue; if (!ent->model || !ent->model->TraceBox) continue; + if ((ent->flags & RENDER_EXTERIORMODEL) && !chase_active.integer) + continue; // if transparent and not selectable, skip entity - if (!(cl_entities[n].state_current.effects & EF_SELECTABLE) && (ent->alpha < 1 || (ent->effects & (EF_ADDITIVE | EF_NODEPTHTEST)))) + if (!(entlist[n].state_current.effects & EF_SELECTABLE) && (ent->alpha < 1 || (ent->effects & (EF_ADDITIVE | EF_NODEPTHTEST)))) continue; if (ent == ignoreent) continue; @@ -234,7 +241,6 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve if (ent->model && ent->model->TraceBox) ent->model->TraceBox(ent->model, ent->frameblend[0].frame, &trace, starttransformed, starttransformed, endtransformed, endtransformed, SUPERCONTENTS_SOLID); - //cl_traceline_startsupercontents |= trace.startsupercontents; if (maxrealfrac > trace.realfraction) { if (hitent)