From: havoc Date: Wed, 9 Mar 2005 23:41:01 +0000 (+0000) Subject: removed some unused code X-Git-Tag: xonotic-v0.1.0preview~5091 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=341b16da302f73ad1a5698bd590e262930f90f14;p=xonotic%2Fdarkplaces.git removed some unused code git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5077 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/collision.c b/collision.c index 776337ca..88a47951 100644 --- a/collision.c +++ b/collision.c @@ -11,246 +11,6 @@ cvar_t collision_endnudge = {0, "collision_endnudge", "0"}; cvar_t collision_enternudge = {0, "collision_enternudge", "0"}; cvar_t collision_leavenudge = {0, "collision_leavenudge", "0"}; -#if 0 -typedef struct -{ - // the hull we're tracing through - const hull_t *hull; - - // the trace structure to fill in - trace_t *trace; - - // start and end of the trace (in model space) - double start[3]; - double end[3]; - - // end - start - double dist[3]; - - // overrides the CONTENTS_SOLID in the box bsp tree - int boxsupercontents; -} -RecursiveHullCheckTraceInfo_t; - -#define HULLCHECKSTATE_EMPTY 0 -#define HULLCHECKSTATE_SOLID 1 -#define HULLCHECKSTATE_DONE 2 - -static int RecursiveHullCheck(RecursiveHullCheckTraceInfo_t *t, int num, double p1f, double p2f, double p1[3], double p2[3]) -{ - // status variables, these don't need to be saved on the stack when - // recursing... but are because this should be thread-safe - // (note: tracing against a bbox is not thread-safe, yet) - int ret; - mplane_t *plane; - double t1, t2; - - // variables that need to be stored on the stack when recursing - dclipnode_t *node; - int side; - double midf, mid[3]; - - // LordHavoc: a goto! everyone flee in terror... :) -loc0: - // check for empty - if (num < 0) - { - num = Mod_Q1BSP_SuperContentsFromNativeContents(NULL, num); - if (!t->trace->startfound) - { - t->trace->startfound = true; - t->trace->startsupercontents |= num; - } - if (num & SUPERCONTENTS_LIQUIDSMASK) - t->trace->inwater = true; - if (num == 0) - t->trace->inopen = true; - if (num & t->trace->hitsupercontentsmask) - { - // if the first leaf is solid, set startsolid - if (t->trace->allsolid) - t->trace->startsolid = true; -#if COLLISIONPARANOID >= 3 - Con_Print("S"); -#endif - return HULLCHECKSTATE_SOLID; - } - else - { - t->trace->allsolid = false; -#if COLLISIONPARANOID >= 3 - Con_Print("E"); -#endif - return HULLCHECKSTATE_EMPTY; - } - } - - // find the point distances - node = t->hull->clipnodes + num; - - plane = t->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) - { -#if COLLISIONPARANOID >= 3 - Con_Print("<"); -#endif - num = node->children[1]; - goto loc0; - } - side = 1; - } - else - { - if (t2 >= 0) - { -#if COLLISIONPARANOID >= 3 - Con_Print(">"); -#endif - num = node->children[0]; - goto loc0; - } - side = 0; - } - - // the line intersects, find intersection point - // LordHavoc: this uses the original trace for maximum accuracy -#if COLLISIONPARANOID >= 3 - Con_Print("M"); -#endif - if (plane->type < 3) - { - t1 = t->start[plane->type] - plane->dist; - t2 = t->end[plane->type] - plane->dist; - } - else - { - t1 = DotProduct (plane->normal, t->start) - plane->dist; - t2 = DotProduct (plane->normal, t->end) - plane->dist; - } - - midf = t1 / (t1 - t2); - midf = bound(p1f, midf, p2f); - VectorMA(t->start, midf, t->dist, mid); - - // recurse both sides, front side first - ret = RecursiveHullCheck (t, node->children[side], p1f, midf, p1, mid); - // if this side is not empty, return what it is (solid or done) - if (ret != HULLCHECKSTATE_EMPTY) - return ret; - - ret = RecursiveHullCheck (t, node->children[side ^ 1], midf, p2f, mid, p2); - // if other side is not solid, return what it is (empty or done) - if (ret != HULLCHECKSTATE_SOLID) - return ret; - - // front is air and back is solid, this is the impact point... - if (side) - { - t->trace->plane.dist = -plane->dist; - VectorNegate (plane->normal, t->trace->plane.normal); - } - else - { - t->trace->plane.dist = plane->dist; - VectorCopy (plane->normal, t->trace->plane.normal); - } - - // calculate the true fraction - t1 = DotProduct(t->trace->plane.normal, t->start) - t->trace->plane.dist - collision_startnudge.value; - t2 = DotProduct(t->trace->plane.normal, t->end) - t->trace->plane.dist - collision_endnudge.value; - midf = t1 / (t1 - t2); - t->trace->realfraction = bound(0, midf, 1); - - // calculate the return fraction which is nudged off the surface a bit - midf = (t1 - collision_impactnudge.value) / (t1 - t2); - t->trace->fraction = bound(0, midf, 1); - -#if COLLISIONPARANOID >= 3 - Con_Print("D"); -#endif - return HULLCHECKSTATE_DONE; -} - -static hull_t box_hull; -static dclipnode_t box_clipnodes[6]; -static mplane_t box_planes[6]; - -void Mod_Q1BSP_Collision_Init (void) -{ - int i; - int side; - - //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. - - 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; - } -} - -void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask, int boxsupercontents) -{ - RecursiveHullCheckTraceInfo_t rhc; - // fill in a default trace - memset(&rhc, 0, sizeof(rhc)); - memset(trace, 0, sizeof(trace_t)); - //To keep everything totally uniform, bounding boxes are turned into small - //BSP trees instead of being compared directly. - // create a temp hull from bounding box sizes - box_planes[0].dist = cmaxs[0] - mins[0]; - box_planes[1].dist = cmins[0] - maxs[0]; - box_planes[2].dist = cmaxs[1] - mins[1]; - box_planes[3].dist = cmins[1] - maxs[1]; - box_planes[4].dist = cmaxs[2] - mins[2]; - box_planes[5].dist = cmins[2] - maxs[2]; - // trace a line through the generated clipping hull - rhc.boxsupercontents = boxsupercontents; - rhc.hull = &box_hull; - rhc.trace = trace; - rhc.trace->hitsupercontentsmask = hitsupercontentsmask; - rhc.trace->fraction = 1; - rhc.trace->realfraction = 1; - rhc.trace->allsolid = true; - VectorCopy(start, rhc.start); - VectorCopy(end, rhc.end); - VectorSubtract(rhc.end, rhc.start, rhc.dist); - Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end); - VectorMA(rhc.start, rhc.trace->fraction, rhc.dist, rhc.trace->endpos); - if (rhc.trace->startsupercontents) - rhc.trace->startsupercontents = boxsupercontents; -} -#endif - void Collision_Init (void) { Cvar_RegisterVariable(&collision_impactnudge);