]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - collision.c
no time to explain, more changes on the path to q3bsp support
[xonotic/darkplaces.git] / collision.c
index 7a7045cfb3bff14a606c81ff925586eec591f6f1..4936e2d461ec3a4215dcc43963fd42d72bd581c2 100644 (file)
@@ -206,39 +206,6 @@ static void RecursiveHullCheckPoint (RecursiveHullCheckTraceInfo_t *t, int num)
 }
 #endif
 
-void Collision_RoundUpToHullSize(const model_t *cmodel, const vec3_t inmins, const vec3_t inmaxs, vec3_t outmins, vec3_t outmaxs)
-{
-       vec3_t size;
-       const hull_t *hull;
-
-       VectorSubtract(inmaxs, inmins, size);
-       if (cmodel->brushq1.ishlbsp)
-       {
-               if (size[0] < 3)
-                       hull = &cmodel->brushq1.hulls[0]; // 0x0x0
-               else if (size[0] <= 32)
-               {
-                       if (size[2] < 54) // pick the nearest of 36 or 72
-                               hull = &cmodel->brushq1.hulls[3]; // 32x32x36
-                       else
-                               hull = &cmodel->brushq1.hulls[1]; // 32x32x72
-               }
-               else
-                       hull = &cmodel->brushq1.hulls[2]; // 64x64x64
-       }
-       else
-       {
-               if (size[0] < 3)
-                       hull = &cmodel->brushq1.hulls[0]; // 0x0x0
-               else if (size[0] <= 32)
-                       hull = &cmodel->brushq1.hulls[1]; // 32x32x56
-               else
-                       hull = &cmodel->brushq1.hulls[2]; // 64x64x88
-       }
-       VectorCopy(inmins, outmins);
-       VectorAdd(inmins, hull->clip_size, outmaxs);
-}
-
 static hull_t box_hull;
 static dclipnode_t box_clipnodes[6];
 static mplane_t box_planes[6];
@@ -429,7 +396,7 @@ float furthestplanedist_float(const float *normal, const colpointf_t *points, in
 #define COLLISIONEPSILON2 0//(1.0f / 32.0f)
 
 // NOTE: start and end of each brush pair must have same numplanes/numpoints
-float Collision_TraceBrushBrushFloat(const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, const colbrushf_t *thatbrush_start, const colbrushf_t *thatbrush_end, float *impactnormal, int *startsolid, int *allsolid)
+void Collision_TraceBrushBrushFloat(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, const colbrushf_t *thatbrush_start, const colbrushf_t *thatbrush_end)
 {
        int nplane, nplane2, fstartsolid, fendsolid;
        float enterfrac, leavefrac, d1, d2, f, newimpactnormal[3];
@@ -463,7 +430,7 @@ float Collision_TraceBrushBrushFloat(const colbrushf_t *thisbrush_start, const c
                {
                        // moving into brush
                        if (d2 > 0)
-                               return 1;
+                               return;
                        if (d1 < 0)
                                continue;
                        // enter
@@ -480,7 +447,7 @@ float Collision_TraceBrushBrushFloat(const colbrushf_t *thisbrush_start, const c
                {
                        // moving out of brush
                        if (d1 > 0)
-                               return 1;
+                               return;
                        if (d2 < 0)
                                continue;
                        // leave
@@ -494,36 +461,31 @@ float Collision_TraceBrushBrushFloat(const colbrushf_t *thisbrush_start, const c
 
        if (fstartsolid)
        {
-               if (startsolid)
-                       *startsolid = true;
-               if (fendsolid && allsolid)
-                       *allsolid = true;
+               trace->startsolid = true;
+               if (fendsolid)
+                       trace->allsolid = true;
        }
 
        // LordHavoc: we need an epsilon nudge here because for a point trace the
        // penetrating line segment is normally zero length if this brush was
        // generated from a polygon (infinitely thin), and could even be slightly
        // positive or negative due to rounding errors in that case.
-       if (enterfrac > -1 && enterfrac < 1 && enterfrac - (1.0f / 1024.0f) <= leavefrac)
+       if (enterfrac > -1 && enterfrac < trace->fraction && enterfrac - (1.0f / 1024.0f) <= leavefrac)
        {
-               //if (enterfrac < (1.0f / 1024.0f))
-               //      enterfrac = 0;
-               enterfrac = bound(0, enterfrac, 1);
-               VectorCopy(newimpactnormal, impactnormal);
-               return enterfrac;
+               trace->fraction = bound(0, enterfrac, 1);
+               VectorCopy(newimpactnormal, trace->plane.normal);
        }
-       return 1;
 }
 
 static colplanef_t polyf_planes[256 + 2];
 static colbrushf_t polyf_brush;
 
-float Collision_TraceBrushPolygonFloat(const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int numpoints, const float *points, float *impactnormal, int *startsolid, int *allsolid)
+void Collision_TraceBrushPolygonFloat(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int numpoints, const float *points)
 {
        if (numpoints > 256)
        {
                Con_Printf("Polygon with more than 256 points not supported yet (fixme!)\n");
-               return 1;
+               return;
        }
        polyf_brush.numpoints = numpoints;
        polyf_brush.numplanes = numpoints + 2;
@@ -531,20 +493,20 @@ float Collision_TraceBrushPolygonFloat(const colbrushf_t *thisbrush_start, const
        polyf_brush.planes = polyf_planes;
        Collision_CalcPlanesForPolygonBrushFloat(&polyf_brush);
        //Collision_PrintBrushAsQHull(&polyf_brush, "polyf_brush");
-       return Collision_TraceBrushBrushFloat(thisbrush_start, thisbrush_end, &polyf_brush, &polyf_brush, impactnormal, startsolid, allsolid);
+       Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, &polyf_brush, &polyf_brush);
 }
 
 static colpointf_t polyf_pointsstart[256], polyf_pointsend[256];
 static colplanef_t polyf_planesstart[256 + 2], polyf_planesend[256 + 2];
 static colbrushf_t polyf_brushstart, polyf_brushend;
 
-float Collision_TraceBrushPolygonTransformFloat(const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int numpoints, const float *points, float *impactnormal, const matrix4x4_t *polygonmatrixstart, const matrix4x4_t *polygonmatrixend, int *startsolid, int *allsolid)
+void Collision_TraceBrushPolygonTransformFloat(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int numpoints, const float *points, const matrix4x4_t *polygonmatrixstart, const matrix4x4_t *polygonmatrixend)
 {
        int i;
        if (numpoints > 256)
        {
                Con_Printf("Polygon with more than 256 points not supported yet (fixme!)\n");
-               return 1;
+               return;
        }
        polyf_brushstart.numpoints = numpoints;
        polyf_brushstart.numplanes = numpoints + 2;
@@ -564,353 +526,7 @@ float Collision_TraceBrushPolygonTransformFloat(const colbrushf_t *thisbrush_sta
        //Collision_PrintBrushAsQHull(&polyf_brushstart, "polyf_brushstart");
        //Collision_PrintBrushAsQHull(&polyf_brushend, "polyf_brushend");
 
-       return Collision_TraceBrushBrushFloat(thisbrush_start, thisbrush_end, &polyf_brushstart, &polyf_brushend, impactnormal, startsolid, allsolid);
-}
-
-colbrushd_t *Collision_AllocBrushDouble(mempool_t *mempool, int numpoints, int numplanes)
-{
-       colbrushd_t *brush;
-       brush = Mem_Alloc(mempool, sizeof(colbrushd_t) + sizeof(colpointd_t) * numpoints + sizeof(colplaned_t) * numplanes);
-       brush->numpoints = numpoints;
-       brush->numplanes = numplanes;
-       brush->planes = (void *)(brush + 1);
-       brush->points = (void *)(brush->planes + brush->numplanes);
-       return brush;
-}
-
-void Collision_CalcPlanesForPolygonBrushDouble(colbrushd_t *brush)
-{
-       int i;
-       double edge0[3], edge1[3], normal[3], dist, bestdist;
-       colpointd_t *p, *p2;
-
-       // choose best surface normal for polygon's plane
-       bestdist = 0;
-       for (i = 2, p = brush->points + 2;i < brush->numpoints;i++, p++)
-       {
-               VectorSubtract(p[-1].v, p[0].v, edge0);
-               VectorSubtract(p[1].v, p[0].v, edge1);
-               CrossProduct(edge0, edge1, normal);
-               dist = DotProduct(normal, normal);
-               if (i == 2 || bestdist < dist)
-               {
-                       bestdist = dist;
-                       VectorCopy(normal, brush->planes->normal);
-               }
-       }
-
-       VectorNormalize(brush->planes->normal);
-       brush->planes->dist = DotProduct(brush->points->v, brush->planes->normal);
-
-       // negate plane to create other side
-       VectorNegate(brush->planes[0].normal, brush->planes[1].normal);
-       brush->planes[1].dist = -brush->planes[0].dist;
-       for (i = 0, p = brush->points + (brush->numpoints - 1), p2 = brush->points + 2;i < brush->numpoints;i++, p = p2, p2++)
-       {
-               VectorSubtract(p->v, p2->v, edge0);
-               CrossProduct(edge0, brush->planes->normal, brush->planes[i].normal);
-               VectorNormalize(brush->planes[i].normal);
-               brush->planes[i].dist = DotProduct(p->v, brush->planes[i].normal);
-       }
-
-#if 1
-       // validity check - will be disabled later
-       for (i = 0;i < brush->numplanes;i++)
-       {
-               int j;
-               for (j = 0, p = brush->points;j < brush->numpoints;j++, p++)
-                       if (DotProduct(p->v, brush->planes[i].normal) > brush->planes[i].dist + (1.0 / 32.0))
-                               Con_Printf("Error in brush plane generation, plane %i\n");
-       }
-#endif
-}
-
-colbrushd_t *Collision_AllocBrushFromPermanentPolygonDouble(mempool_t *mempool, int numpoints, double *points)
-{
-       colbrushd_t *brush;
-       brush = Mem_Alloc(mempool, sizeof(colbrushd_t) + sizeof(colplaned_t) * (numpoints + 2));
-       brush->numpoints = numpoints;
-       brush->numplanes = numpoints + 2;
-       brush->planes = (void *)(brush + 1);
-       brush->points = (colpointd_t *)points;
-       return brush;
-}
-
-
-double nearestplanedist_double(const double *normal, const colpointd_t *points, int numpoints)
-{
-       double dist, bestdist;
-       bestdist = DotProduct(points->v, normal);
-       points++;
-       while(--numpoints)
-       {
-               dist = DotProduct(points->v, normal);
-               if (bestdist > dist)
-                       bestdist = dist;
-               points++;
-       }
-       return bestdist;
-}
-
-double furthestplanedist_double(const double *normal, const colpointd_t *points, int numpoints)
-{
-       double dist, bestdist;
-       bestdist = DotProduct(points->v, normal);
-       points++;
-       while(--numpoints)
-       {
-               dist = DotProduct(points->v, normal);
-               if (bestdist < dist)
-                       bestdist = dist;
-               points++;
-       }
-       return bestdist;
-}
-
-// NOTE: start and end of each brush pair must have same numplanes/numpoints
-double Collision_TraceBrushBrushDouble(const colbrushd_t *thisbrush_start, const colbrushd_t *thisbrush_end, const colbrushd_t *thatbrush_start, const colbrushd_t *thatbrush_end, double *impactnormal)
-{
-       int nplane;
-       double enterfrac, leavefrac, d1, d2, f, newimpactnormal[3];
-       const colplaned_t *startplane, *endplane;
-
-       enterfrac = -1;
-       leavefrac = 1;
-
-       for (nplane = 0;nplane < thatbrush_start->numplanes;nplane++)
-       {
-               startplane = thatbrush_start->planes + nplane;
-               endplane = thatbrush_end->planes + nplane;
-               d1 = nearestplanedist_double(startplane->normal, thisbrush_start->points, thisbrush_start->numpoints) - furthestplanedist_double(startplane->normal, thatbrush_start->points, thatbrush_start->numpoints);
-               d2 = nearestplanedist_double(endplane->normal, thisbrush_end->points, thisbrush_start->numpoints) - furthestplanedist_double(endplane->normal, thatbrush_end->points, thatbrush_start->numpoints) - (1.0 / 32.0);
-
-               f = d1 - d2;
-               if (f >= 0)
-               {
-                       // moving into brush
-                       if (d2 > 0)
-                               return 1;
-                       if (d1 < 0)
-                               continue;
-                       // enter
-                       f = d1 / f;
-                       if (enterfrac < f)
-                       {
-                               enterfrac = f;
-                               VectorSubtract(endplane->normal, startplane->normal, newimpactnormal);
-                               VectorMA(startplane->normal, enterfrac, impactnormal, newimpactnormal);
-                       }
-               }
-               else
-               {
-                       // moving out of brush
-                       if (d1 > 0)
-                               return 1;
-                       if (d2 < 0)
-                               continue;
-                       // leave
-                       f = d1 / f;
-                       if (leavefrac > f)
-                               leavefrac = f;
-               }
-       }
-
-       for (nplane = 0;nplane < thisbrush_start->numplanes;nplane++)
-       {
-               startplane = thisbrush_start->planes + nplane;
-               endplane = thisbrush_end->planes + nplane;
-               d1 = nearestplanedist_double(startplane->normal, thisbrush_start->points, thisbrush_start->numpoints) - furthestplanedist_double(startplane->normal, thatbrush_start->points, thatbrush_start->numpoints);
-               d2 = nearestplanedist_double(endplane->normal, thisbrush_end->points, thisbrush_start->numpoints) - furthestplanedist_double(endplane->normal, thatbrush_end->points, thatbrush_start->numpoints) - (1.0 / 32.0);
-
-               f = d1 - d2;
-               if (f >= 0)
-               {
-                       // moving into brush
-                       if (d2 > 0)
-                               return 1;
-                       if (d1 < 0)
-                               continue;
-                       // enter
-                       f = d1 / f;
-                       if (enterfrac < f)
-                       {
-                               enterfrac = f;
-                               VectorSubtract(endplane->normal, startplane->normal, newimpactnormal);
-                               VectorMA(startplane->normal, enterfrac, impactnormal, newimpactnormal);
-                       }
-               }
-               else
-               {
-                       // moving out of brush
-                       if (d1 > 0)
-                               return 1;
-                       if (d2 < 0)
-                               continue;
-                       // leave
-                       f = d1 / f;
-                       if (leavefrac > f)
-                               leavefrac = f;
-               }
-       }
-
-       // LordHavoc: we need an epsilon nudge here because for a point trace the
-       // penetrating line segment is normally zero length if this brush was
-       // generated from a polygon (infinitely thin), and could even be slightly
-       // positive or negative due to rounding errors in that case.
-       enterfrac -= (1.0 / 16384.0);
-       if (leavefrac - enterfrac >= 0 && enterfrac > -1)
-       {
-               VectorCopy(newimpactnormal, impactnormal);
-               enterfrac = bound(0, enterfrac, 1);
-               return enterfrac;
-       }
-       return 1;
-}
-
-static colplaned_t polyd_planes[256 + 2];
-static colbrushd_t polyd_brush;
-double Collision_TraceBrushPolygonDouble(const colbrushd_t *thisbrush_start, const colbrushd_t *thisbrush_end, int numpoints, const double *points, double *impactnormal)
-{
-       if (numpoints > 256)
-       {
-               Con_Printf("Polygon with more than 256 points not supported yet (fixme!)\n");
-               return 1;
-       }
-       polyd_brush.numpoints = numpoints;
-       polyd_brush.numplanes = numpoints + 2;
-       polyd_brush.points = (colpointd_t *)points;
-       polyd_brush.planes = polyd_planes;
-       Collision_CalcPlanesForPolygonBrushDouble(&polyd_brush);
-       return Collision_TraceBrushBrushDouble(thisbrush_start, thisbrush_end, &polyd_brush, &polyd_brush, impactnormal);
-}
-
-
-
-
-typedef struct colbrushbmodelinfo_s
-{
-       model_t *model;
-       const matrix4x4_t *modelmatrixstart;
-       const matrix4x4_t *modelmatrixend;
-       const colbrushf_t *thisbrush_start;
-       const colbrushf_t *thisbrush_end;
-       float impactnormal[3];
-       float tempimpactnormal[3];
-       float fraction;
-       int startsolid;
-       int allsolid;
-}
-colbrushbmodelinfo_t;
-
-static int colframecount = 1;
-
-void Collision_RecursiveTraceBrushNode(colbrushbmodelinfo_t *info, mnode_t *node)
-{
-       if (node->contents)
-       {
-               // collide with surfaces marked by this leaf
-               int i, *mark;
-               float result;
-               mleaf_t *leaf = (mleaf_t *)node;
-               msurface_t *surf;
-               for (i = 0, mark = leaf->firstmarksurface;i < leaf->nummarksurfaces;i++, mark++)
-               {
-                       surf = info->model->brushq1.surfaces + *mark;
-                       // don't check a surface twice
-                       if (surf->colframe != colframecount)
-                       {
-                               surf->colframe = colframecount;
-                               if (surf->flags & SURF_SOLIDCLIP)
-                               {
-                                       result = Collision_TraceBrushPolygonFloat(info->thisbrush_start, info->thisbrush_end, surf->poly_numverts, surf->poly_verts, info->tempimpactnormal, &info->startsolid, &info->allsolid);
-                                       //result = Collision_TraceBrushPolygonTransformFloat(info->thisbrush_start, info->thisbrush_end, surf->poly_numverts, surf->poly_verts, info->tempimpactnormal, info->modelmatrixstart, info->modelmatrixend, &info->startsolid, &info->allsolid);
-                                       if (info->fraction > result)
-                                       {
-                                               info->fraction = result;
-                                               // use the surface's plane instead of the actual
-                                               // collision plane because the actual collision plane
-                                               // might be to the side (on a seam between polygons)
-                                               // or something, we want objects to bounce off the
-                                               // front...
-                                               //if (surf->flags & SURF_PLANEBACK)
-                                               //      VectorNegate(surf->plane->normal, info->impactnormal);
-                                               //else
-                                               //      VectorCopy(surf->plane->normal, info->impactnormal);
-                                               VectorCopy(info->tempimpactnormal, info->impactnormal);
-                                       }
-                               }
-                       }
-               }
-       }
-       else
-       {
-               // recurse down node sides
-               int i;
-               float dist;
-               colpointf_t *ps, *pe;
-               // FIXME? if TraceBrushPolygonTransform were to be made usable, the
-               // node planes would need to be transformed too
-               dist = node->plane->dist - (1.0f / 8.0f);
-               for (i = 0, ps = info->thisbrush_start->points, pe = info->thisbrush_end->points;i < info->thisbrush_start->numpoints;i++, ps++, pe++)
-               {
-                       if (DotProduct(ps->v, node->plane->normal) > dist || DotProduct(pe->v, node->plane->normal) > dist)
-                       {
-                               Collision_RecursiveTraceBrushNode(info, node->children[0]);
-                               break;
-                       }
-               }
-               dist = node->plane->dist + (1.0f / 8.0f);
-               for (i = 0, ps = info->thisbrush_start->points, pe = info->thisbrush_end->points;i < info->thisbrush_start->numpoints;i++, ps++, pe++)
-               {
-                       if (DotProduct(ps->v, node->plane->normal) < dist || DotProduct(pe->v, node->plane->normal) < dist)
-                       {
-                               Collision_RecursiveTraceBrushNode(info, node->children[1]);
-                               break;
-                       }
-               }
-       }
-}
-
-float Collision_TraceBrushBModel(const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, model_t *model, float *impactnormal, int *startsolid, int *allsolid)
-{
-       colbrushbmodelinfo_t info;
-       colframecount++;
-       info.model = model;
-       info.thisbrush_start = thisbrush_start;
-       info.thisbrush_end = thisbrush_end;
-       info.fraction = 1;
-       info.startsolid = false;
-       info.allsolid = false;
-       Collision_RecursiveTraceBrushNode(&info, model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode);
-       if (info.fraction < 1)
-               VectorCopy(info.impactnormal, impactnormal);
-       if (startsolid)
-               *startsolid = info.startsolid;
-       if (allsolid)
-               *allsolid = info.allsolid;
-       return info.fraction;
-}
-
-float Collision_TraceBrushBModelTransform(const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, model_t *model, float *impactnormal, const matrix4x4_t *modelmatrixstart, const matrix4x4_t *modelmatrixend, int *startsolid, int *allsolid)
-{
-       colbrushbmodelinfo_t info;
-       colframecount++;
-       info.model = model;
-       info.modelmatrixstart = modelmatrixstart;
-       info.modelmatrixend = modelmatrixend;
-       info.thisbrush_start = thisbrush_start;
-       info.thisbrush_end = thisbrush_end;
-       info.fraction = 1;
-       info.startsolid = false;
-       info.allsolid = false;
-       Collision_RecursiveTraceBrushNode(&info, model->brushq1.nodes);
-       if (info.fraction < 1)
-               VectorCopy(info.impactnormal, impactnormal);
-       if (startsolid)
-               *startsolid = info.startsolid;
-       if (allsolid)
-               *allsolid = info.allsolid;
-       return info.fraction;
+       Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, &polyf_brushstart, &polyf_brushend);
 }
 
 
@@ -961,61 +577,6 @@ colbrushf_t *Collision_BrushForBox(const matrix4x4_t *matrix, const vec3_t mins,
        return brush;
 }
 
-void Collision_PolygonClipTrace (trace_t *trace, const void *cent, model_t *cmodel, const vec3_t corigin, const vec3_t cangles, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end)
-{
-       vec3_t impactnormal;
-       //vec3_t mins2, maxs2;
-       matrix4x4_t cmatrix, cimatrix, startmatrix, endmatrix;
-       matrix4x4_t mstartmatrix, mendmatrix, identitymatrix;
-       colbrushf_t *thisbrush_start, *thisbrush_end, *cbrush;
-
-       Matrix4x4_CreateFromQuakeEntity(&cmatrix, corigin[0], corigin[1], corigin[2], cangles[0], cangles[1], cangles[2], 1);
-       Matrix4x4_Invert_Simple(&cimatrix, &cmatrix);
-       Matrix4x4_CreateTranslate(&startmatrix, start[0], start[1], start[2]);
-       Matrix4x4_CreateTranslate(&endmatrix, end[0], end[1], end[2]);
-
-       Matrix4x4_CreateIdentity(&identitymatrix);
-       Matrix4x4_Concat(&mstartmatrix, &cimatrix, &startmatrix);
-       Matrix4x4_Concat(&mendmatrix, &cimatrix, &endmatrix);
-       thisbrush_start = Collision_BrushForBox(&mstartmatrix, mins, maxs);
-       //mins2[0] = mins[0] - 0.0625;mins2[1] = mins[1] - 0.0625;mins2[2] = mins[2] - 0.0625;
-       //maxs2[0] = maxs[0] + 0.0625;maxs2[1] = maxs[1] + 0.0625;maxs2[2] = maxs[2] + 0.0625;
-       thisbrush_end = Collision_BrushForBox(&mendmatrix, mins, maxs);
-
-       //Collision_PrintBrushAsQHull(thisbrush_start, "thisbrush_start");
-       //Collision_PrintBrushAsQHull(thisbrush_end, "thisbrush_end");
-       memset (trace, 0, sizeof(trace_t));
-       if (cmodel && cmodel->type == mod_brush)
-       {
-               // brush model
-               trace->fraction = Collision_TraceBrushBModel(thisbrush_start, thisbrush_end, cmodel, impactnormal, &trace->startsolid, &trace->allsolid);
-               //trace->fraction = Collision_TraceBrushBModelTransform(thisbrush_start, thisbrush_end, cmodel, trace->plane.normal, &cmatrix, &cmatrix, &trace->startsolid, &trace->allsolid);
-       }
-       else
-       {
-               // bounding box
-               cbrush = Collision_BrushForBox(&identitymatrix, cmins, cmaxs);
-               trace->fraction = Collision_TraceBrushBrushFloat(thisbrush_start, thisbrush_end, cbrush, cbrush, impactnormal, &trace->startsolid, &trace->allsolid);
-               //cbrush = Collision_BrushForBox(&cmatrix, cmins, cmaxs);
-               //trace->fraction = Collision_TraceBrushBrushFloat(thisbrush_start, thisbrush_end, cbrush, cbrush, trace->plane.normal, &trace->startsolid, &trace->allsolid);
-       }
-
-       if (trace->fraction < 0 || trace->fraction > 1)
-               Con_Printf("fraction out of bounds %f %s:%d\n", trace->fraction, __FILE__, __LINE__);
-
-       if (trace->fraction < 1)
-       {
-               trace->ent = (void *) cent;
-               VectorBlend(start, end, trace->fraction, trace->endpos);
-               Matrix4x4_Transform(&cmatrix, impactnormal, trace->plane.normal);
-               VectorNormalize(trace->plane.normal);
-               //Con_Printf("fraction %f normal %f %f %f\n", trace->fraction, trace->plane.normal[0], trace->plane.normal[1], trace->plane.normal[2]);
-       }
-       else
-               VectorCopy(end, trace->endpos);
-}
-
-
 // LordHavoc: currently unused and not yet tested
 // note: this can be used for tracing a moving sphere vs a stationary sphere,
 // by simply adding the moving sphere's radius to the sphereradius parameter,