X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=world.c;h=3b331b92724afbee291897b4eab66ea4a58667b7;hb=5f501dcaa4b2ca10c938498c0f029ffa9646bbb7;hp=5880c7cfe8352242822da1f6d75264170a26bb4b;hpb=6622dc0f50e46953e458b1b30505d2545ae5902b;p=xonotic%2Fdarkplaces.git diff --git a/world.c b/world.c index 5880c7cf..3b331b92 100644 --- a/world.c +++ b/world.c @@ -45,9 +45,9 @@ 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 STRUCT_FROM_LINK(l,t,m) ((t *)((qbyte *)l - (int)&(((t *)0)->m))) -#define EDICT_FROM_AREA(l) ((edict_t *)((byte *)l - (int)&(((edict_t *)0)->area))) +#define EDICT_FROM_AREA(l) ((edict_t *)((qbyte *)l - (int)&(((edict_t *)0)->area))) //============================================================================ @@ -137,7 +137,7 @@ void SV_InitBoxHull (void) box_planes[i].type = i>>1; box_planes[i].normal[i>>1] = 1; } - + } @@ -554,7 +554,7 @@ edict_t *SV_TestEntityPosition (edict_t *ent) if (trace.startsolid) return sv.edicts; - + return NULL; } @@ -568,8 +568,7 @@ LINE TESTING IN HULLS */ // 1/32 epsilon to keep floating point happy -//#define DIST_EPSILON (0.03125) -#define DIST_EPSILON (0.125) +#define DIST_EPSILON (0.03125) #define HULLCHECKSTATE_EMPTY 0 #define HULLCHECKSTATE_SOLID 1 @@ -614,7 +613,7 @@ void SV_RecursiveHullCheck_Impact (mplane_t *plane, int side) } frac = t1 / (t1 - t2); - frac = bound(0.0f, frac, 1.0f); + frac = bound(0.0f, frac, 1.0); RHC.trace->fraction = frac; RHC.trace->endpos[0] = RHC.start[0] + frac * RHC.dist[0]; @@ -622,17 +621,16 @@ void SV_RecursiveHullCheck_Impact (mplane_t *plane, int side) 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) +int SV_RecursiveHullCheck (int num, double p1f, double p2f, double p1[3], double p2[3]) { dclipnode_t *node; - vec3_t mid; int side; - float midf; + double midf, mid[3]; // 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; + static double t1, t2, frac; // LordHavoc: a goto! everyone flee in terror... :) loc0: @@ -712,7 +710,7 @@ loc0: } frac = t1 / (t1 - t2); - frac = bound(0.0f, frac, 1.0f); + frac = bound(0.0f, frac, 1.0); midf = p1f + ((p2f - p1f) * frac); mid[0] = RHC.start[0] + midf * RHC.dist[0]; @@ -733,271 +731,6 @@ loc0: 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) - { - num = node->children[0]; - goto loc0; - } - // put the crosspoint DIST_EPSILON pixels on the near side - side = 0; - } - 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); - - 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; - } -#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) - { - VectorCopy (plane->normal, trace->plane.normal); - trace->plane.dist = plane->dist; - } - else - { - VectorNegate (plane->normal, trace->plane.normal); - trace->plane.dist = -plane->dist; - } - -*/ - /* - while (SV_HullPointContents (hull, hull->firstclipnode, mid) != trace->startcontents) - { - // 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]); - } - */ -/* - - 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]); - - return false; -} -*/ - -/* -// 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) -{ - 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"); - -// -// find the point distances -// - node = hull->clipnodes + num; - if (node->children[0] < 0) - { - if (node->children[0] == CONTENTS_SOLID) - return false; - if (node->children[1] < 0) - return node->children[1] != CONTENTS_SOLID; - } - else if (node->children[1] == CONTENTS_SOLID) - return false; - - 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; - } - - if (t1 >= 0) - { - if (t2 >= 0) - { - num = node->children[0]; - goto loc0; - } - side = 0; - } - else - { - if (t2 < 0) - { - num = node->children[1]; - goto loc0; - } - side = 1; - } - - if (node->children[side] < 0) - { - 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; - } - } -} -*/ - - /* ================== SV_ClipMoveToEntity @@ -1008,81 +741,69 @@ 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; + trace_t trace; + vec3_t offset, forward, left, up; + double startd[3], endd[3], tempd[3]; + 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); + VectorSubtract(start, offset, startd); + VectorSubtract(end, offset, endd); -// 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])) { - 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); + AngleVectorsFLU (ent->v.angles, forward, left, up); + VectorCopy(startd, tempd); + startd[0] = DotProduct (tempd, forward); + startd[1] = DotProduct (tempd, left); + startd[2] = DotProduct (tempd, up); + VectorCopy(endd, tempd); + endd[0] = DotProduct (tempd, forward); + endd[1] = DotProduct (tempd, left); + endd[2] = DotProduct (tempd, up); } + VectorCopy(end, trace.endpos); + // trace a line through the appropriate clipping hull - VectorCopy(start_l, RecursiveHullCheckInfo.start); - VectorSubtract(end_l, start_l, RecursiveHullCheckInfo.dist); + VectorCopy(startd, RecursiveHullCheckInfo.start); + VectorSubtract(endd, startd, RecursiveHullCheckInfo.dist); RecursiveHullCheckInfo.hull = hull; RecursiveHullCheckInfo.trace = &trace; - SV_RecursiveHullCheck (hull->firstclipnode, 0, 1, start_l, end_l); + SV_RecursiveHullCheck (hull->firstclipnode, 0, 1, startd, endd); -// 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])) + // if we hit, unrotate endpos and normal, and store the entity we hit + if (trace.fraction != 1) { - vec3_t a; - vec3_t forward, right, up; - vec3_t temp; - - if (trace.fraction != 1) + // 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])) { - 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); + VectorNegate (ent->v.angles, offset); + AngleVectorsFLU (offset, forward, left, up); + + VectorCopy (trace.endpos, tempd); + trace.endpos[0] = DotProduct (tempd, forward); + trace.endpos[1] = DotProduct (tempd, left); + trace.endpos[2] = DotProduct (tempd, up); + + VectorCopy (trace.plane.normal, tempd); + trace.plane.normal[0] = DotProduct (tempd, forward); + trace.plane.normal[1] = DotProduct (tempd, left); + trace.plane.normal[2] = DotProduct (tempd, up); } - } - -// fix trace up by the offset - if (trace.fraction != 1) + // fix offset VectorAdd (trace.endpos, offset, trace.endpos); - -// did we clip the move? - if (trace.fraction < 1 || trace.startsolid ) + trace.ent = ent; + } + else if (trace.allsolid || trace.startsolid) trace.ent = ent; return trace; @@ -1104,6 +825,8 @@ void SV_ClipToLinks ( areanode_t *node, moveclip_t *clip ) trace_t trace; loc0: + if (clip->trace.allsolid) + return; // touch linked edicts for (l = node->solid_edicts.next ; l != &node->solid_edicts ; l = next) { @@ -1114,46 +837,69 @@ loc0: if (touch == clip->passedict) continue; if (touch->v.solid == SOLID_TRIGGER) - Sys_Error ("Trigger in clipping list"); + 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->boxmins[1] > touch->v.absmax[1] - || clip->boxmins[2] > touch->v.absmax[2] || 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 != 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 (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) + 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 ((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); - if (trace.allsolid || trace.startsolid || trace.fraction < clip->trace.fraction) + // 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; + } + /* + if (trace.allsolid) + { + clip->trace = trace; + return; + } + if (trace.startsolid || trace.fraction < clip->trace.fraction) { - trace.ent = touch; - if (clip->trace.startsolid) + if (clip->trace.startsolid) { clip->trace = trace; clip->trace.startsolid = true; @@ -1161,8 +907,7 @@ loc0: else clip->trace = trace; } - else if (trace.startsolid) - clip->trace.startsolid = true; + */ } // recurse down both sides @@ -1200,7 +945,7 @@ 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]) @@ -1229,9 +974,6 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e 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; @@ -1249,15 +991,21 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e } else { - VectorCopy (mins, clip.mins2); - VectorCopy (maxs, clip.maxs2); + VectorCopy (clip.mins, clip.mins2); + VectorCopy (clip.maxs, clip.maxs2); } -// create the bounding box of the entire move - SV_MoveBounds ( start, clip.mins2, clip.maxs2, end, clip.boxmins, clip.boxmaxs ); + // clip to world + clip.trace = SV_ClipMoveToEntity (sv.edicts, start, mins, maxs, end); -// clip to entities - SV_ClipToLinks ( sv_areanodes, &clip ); + // clip to entities + if (!clip.trace.allsolid) + { + // create the bounding box of the entire move + SV_MoveBounds ( start, clip.mins2, clip.maxs2, end, clip.boxmins, clip.boxmaxs ); + + SV_ClipToLinks ( sv_areanodes, &clip ); + } return clip.trace; }