#include "quakedef.h"
+#include "winding.h"
typedef struct
{
// end - start
double dist[3];
+
+ // overrides the CONTENTS_SOLID in the box bsp tree
+ int boxsupercontents;
}
RecursiveHullCheckTraceInfo_t;
// check for empty
if (num < 0)
{
- t->trace->endcontents = num;
- if (t->trace->thiscontents)
+ // translate the fake CONTENTS values in the box bsp tree
+ if (num == CONTENTS_SOLID)
+ num = t->boxsupercontents;
+ else
+ num = 0;
+ if (!t->trace->startfound)
{
- if (num == t->trace->thiscontents)
- t->trace->allsolid = false;
- else
- {
- // if the first leaf is solid, set startsolid
- if (t->trace->allsolid)
- t->trace->startsolid = true;
- return HULLCHECKSTATE_SOLID;
- }
- return HULLCHECKSTATE_EMPTY;
+ t->trace->startfound = true;
+ t->trace->startsupercontents |= num;
+ }
+ if (num & t->trace->hitsupercontentsmask)
+ {
+ // if the first leaf is solid, set startsolid
+ if (t->trace->allsolid)
+ t->trace->startsolid = true;
+ return HULLCHECKSTATE_SOLID;
}
else
{
- if (num != CONTENTS_SOLID)
- {
- t->trace->allsolid = false;
- if (num == CONTENTS_EMPTY)
- t->trace->inopen = true;
- else
- t->trace->inwater = true;
- }
- else
- {
- // if the first leaf is solid, set startsolid
- if (t->trace->allsolid)
- t->trace->startsolid = true;
- return HULLCHECKSTATE_SOLID;
- }
+ t->trace->allsolid = false;
return HULLCHECKSTATE_EMPTY;
}
}
}
#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];
}
}
-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)
+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
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->allsolid = true;
VectorCopy(start, rhc.start);
Con_Printf("%g %g %g %g\n", brush->planes[i].normal[0], brush->planes[i].normal[1], brush->planes[i].normal[2], brush->planes[i].dist);
}
+void Collision_ValidateBrush(colbrushf_t *brush)
+{
+ int j, k;
+ if (!brush->numpoints)
+ {
+ Con_Printf("Collision_ValidateBrush: brush with no points!\n");
+ Collision_PrintBrushAsQHull(brush, "unnamed");
+ return;
+ }
+ // it's ok for a brush to have one point and no planes...
+ if (brush->numplanes == 0 && brush->numpoints != 1)
+ {
+ Con_Printf("Collision_ValidateBrush: brush with no planes and more than one point!\n");
+ Collision_PrintBrushAsQHull(brush, "unnamed");
+ return;
+ }
+ for (k = 0;k < brush->numplanes;k++)
+ {
+ for (j = 0;j < brush->numpoints;j++)
+ {
+ if (DotProduct(brush->points[j].v, brush->planes[k].normal) - brush->planes[k].dist > (1.0f / 8.0f))
+ {
+ Con_Printf("Collision_NewBrushFromPlanes: point #%i (%f %f %f) infront of plane #%i (%f %f %f %f)\n", j, brush->points[j].v[0], brush->points[j].v[1], brush->points[j].v[2], k, brush->planes[k].normal[0], brush->planes[k].normal[1], brush->planes[k].normal[2], brush->planes[k].dist);
+ Collision_PrintBrushAsQHull(brush, "unnamed");
+ return;
+ }
+ }
+ }
+}
+
-colbrushf_t *Collision_AllocBrushFloat(mempool_t *mempool, int numpoints, int numplanes)
+colbrushf_t *Collision_NewBrushFromPlanes(mempool_t *mempool, int numoriginalplanes, const mplane_t *originalplanes, int supercontents)
{
+ int j, k, m;
+ int numpoints, maxpoints, numplanes, maxplanes, numelements, maxelements, numtriangles, numpolypoints, maxpolypoints;
+ winding_t *w;
colbrushf_t *brush;
- brush = Mem_Alloc(mempool, sizeof(colbrushf_t) + sizeof(colpointf_t) * numpoints + sizeof(colplanef_t) * numplanes);
- brush->numpoints = numpoints;
+ colpointf_t pointsbuf[256];
+ colplanef_t planesbuf[256];
+ int elementsbuf[1024];
+ int polypointbuf[256];
+ // construct a collision brush (points, planes, and renderable mesh) from
+ // a set of planes, this also optimizes out any unnecessary planes (ones
+ // whose polygon is clipped away by the other planes)
+ numpoints = 0;maxpoints = 256;
+ numplanes = 0;maxplanes = 256;
+ numelements = 0;maxelements = 1024;
+ numtriangles = 0;
+ maxpolypoints = 256;
+ for (j = 0;j < numoriginalplanes;j++)
+ {
+ // add the plane uniquely (no duplicates)
+ for (k = 0;k < numplanes;k++)
+ if (VectorCompare(planesbuf[k].normal, originalplanes[j].normal) && planesbuf[k].dist == originalplanes[j].dist)
+ break;
+ // if the plane is a duplicate, skip it
+ if (k < numplanes)
+ continue;
+ // check if there are too many and skip the brush
+ if (numplanes >= 256)
+ {
+ Con_Printf("Mod_Q3BSP_LoadBrushes: failed to build collision brush: too many planes for buffer\n");
+ return NULL;
+ }
+
+ // create a large polygon from the plane
+ w = Winding_NewFromPlane(originalplanes[j].normal[0], originalplanes[j].normal[1], originalplanes[j].normal[2], originalplanes[j].dist);
+ // clip it by all other planes
+ for (k = 0;k < numoriginalplanes && w;k++)
+ {
+ if (k != j)
+ {
+ // we want to keep the inside of the brush plane so we flip
+ // the cutting plane
+ w = Winding_Clip(w, -originalplanes[k].normal[0], -originalplanes[k].normal[1], -originalplanes[k].normal[2], -originalplanes[k].dist, true);
+ }
+ }
+ // if nothing is left, skip it
+ if (!w)
+ continue;
+
+ // copy off the number of points for later when the winding is freed
+ numpolypoints = w->numpoints;
+
+ // check if there are too many polygon vertices for buffer
+ if (numpolypoints > maxpolypoints)
+ {
+ Con_Printf("Collision_NewBrushFromPlanes: failed to build collision brush: too many points for buffer\n");
+ return NULL;
+ }
+
+ // check if there are too many triangle elements for buffer
+ if (numelements + (w->numpoints - 2) * 3 > maxelements)
+ {
+ Con_Printf("Collision_NewBrushFromPlanes: failed to build collision brush: too many triangle elements for buffer\n");
+ return NULL;
+ }
+
+ for (k = 0;k < w->numpoints;k++)
+ {
+ // check if there is already a matching point (no duplicates)
+ for (m = 0;m < numpoints;m++)
+ if (VectorDistance2(w->points[k], pointsbuf[m].v) < DIST_EPSILON)
+ break;
+
+ // if there is no match, add a new one
+ if (m == numpoints)
+ {
+ // check if there are too many and skip the brush
+ if (numpoints >= 256)
+ {
+ Con_Printf("Collision_NewBrushFromPlanes: failed to build collision brush: too many points for buffer\n");
+ Winding_Free(w);
+ return NULL;
+ }
+ // add the new one
+ VectorCopy(w->points[k], pointsbuf[numpoints].v);
+ numpoints++;
+ }
+
+ // store the index into a buffer
+ polypointbuf[k] = m;
+ }
+ Winding_Free(w);
+ w = NULL;
+
+ // add the triangles for the polygon
+ // (this particular code makes a triangle fan)
+ for (k = 0;k < numpolypoints - 2;k++)
+ {
+ numtriangles++;
+ elementsbuf[numelements++] = polypointbuf[0];
+ elementsbuf[numelements++] = polypointbuf[k + 1];
+ elementsbuf[numelements++] = polypointbuf[k + 2];
+ }
+
+ // add the new plane
+ VectorCopy(originalplanes[j].normal, planesbuf[numplanes].normal);
+ planesbuf[numplanes].dist = originalplanes[j].dist;
+ numplanes++;
+ }
+
+ // if nothing is left, there's nothing to allocate
+ if (numtriangles < 4 || numplanes < 4 || numpoints < 4)
+ return NULL;
+
+ // allocate the brush and copy to it
+ brush = Collision_AllocBrushFloat(mempool, numpoints, numplanes, numtriangles, supercontents);
+ memcpy(brush->points, pointsbuf, numpoints * sizeof(colpointf_t));
+ memcpy(brush->planes, planesbuf, numplanes * sizeof(colplanef_t));
+ memcpy(brush->elements, elementsbuf, numtriangles * sizeof(int[3]));
+ Collision_ValidateBrush(brush);
+ return brush;
+}
+
+
+
+colbrushf_t *Collision_AllocBrushFloat(mempool_t *mempool, int numpoints, int numplanes, int numtriangles, int supercontents)
+{
+ colbrushf_t *brush;
+ brush = Mem_Alloc(mempool, sizeof(colbrushf_t) + sizeof(colpointf_t) * numpoints + sizeof(colplanef_t) * numplanes + sizeof(int[3]) * numtriangles);
+ brush->supercontents = supercontents;
brush->numplanes = numplanes;
+ brush->numpoints = numpoints;
+ brush->numtriangles = numtriangles;
brush->planes = (void *)(brush + 1);
brush->points = (void *)(brush->planes + brush->numplanes);
+ brush->elements = (void *)(brush->points + brush->numpoints);
return brush;
}
#endif
}
-colbrushf_t *Collision_AllocBrushFromPermanentPolygonFloat(mempool_t *mempool, int numpoints, float *points)
+colbrushf_t *Collision_AllocBrushFromPermanentPolygonFloat(mempool_t *mempool, int numpoints, float *points, int supercontents)
{
colbrushf_t *brush;
brush = Mem_Alloc(mempool, sizeof(colbrushf_t) + sizeof(colplanef_t) * (numpoints + 2));
+ brush->supercontents = supercontents;
brush->numpoints = numpoints;
brush->numplanes = numpoints + 2;
brush->planes = (void *)(brush + 1);
brush->points = (colpointf_t *)points;
+ Host_Error("Collision_AllocBrushFromPermanentPolygonFloat: FIXME: this code needs to be updated to generate a mesh...\n");
return brush;
}
while(--numpoints)
{
dist = DotProduct(points->v, normal);
- if (bestdist > dist)
- bestdist = dist;
+ bestdist = min(bestdist, dist);
points++;
}
return bestdist;
while(--numpoints)
{
dist = DotProduct(points->v, normal);
- if (bestdist < dist)
- bestdist = dist;
+ bestdist = max(bestdist, dist);
points++;
}
return bestdist;
// NOTE: start and end of each brush pair must have same numplanes/numpoints
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;
+ int nplane, nplane2, fstartsolid, fendsolid, brushsolid;
float enterfrac, leavefrac, d1, d2, f, newimpactnormal[3];
const colplanef_t *startplane, *endplane;
}
}
+ brushsolid = trace->hitsupercontentsmask & thatbrush_start->supercontents;
if (fstartsolid)
{
- trace->startsolid = true;
- if (fendsolid)
- trace->allsolid = true;
+ trace->startsupercontents |= thatbrush_start->supercontents;
+ if (brushsolid)
+ {
+ 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 < trace->fraction && enterfrac - (1.0f / 1024.0f) <= leavefrac)
+ if (brushsolid && enterfrac > -1 && enterfrac < trace->fraction && enterfrac - (1.0f / 1024.0f) <= leavefrac)
{
trace->fraction = bound(0, enterfrac, 1);
VectorCopy(newimpactnormal, trace->plane.normal);
}
}
-static colplanef_t polyf_planes[256 + 2];
-static colbrushf_t polyf_brush;
-
-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;
- }
- polyf_brush.numpoints = numpoints;
- polyf_brush.numplanes = numpoints + 2;
- polyf_brush.points = (colpointf_t *)points;
- polyf_brush.planes = polyf_planes;
- Collision_CalcPlanesForPolygonBrushFloat(&polyf_brush);
- //Collision_PrintBrushAsQHull(&polyf_brush, "polyf_brush");
- 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;
-
-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;
- }
- polyf_brushstart.numpoints = numpoints;
- polyf_brushstart.numplanes = numpoints + 2;
- polyf_brushstart.points = polyf_pointsstart;//(colpointf_t *)points;
- polyf_brushstart.planes = polyf_planesstart;
- for (i = 0;i < numpoints;i++)
- Matrix4x4_Transform(polygonmatrixstart, points + i * 3, polyf_brushstart.points[i].v);
- polyf_brushend.numpoints = numpoints;
- polyf_brushend.numplanes = numpoints + 2;
- polyf_brushend.points = polyf_pointsend;//(colpointf_t *)points;
- polyf_brushend.planes = polyf_planesend;
- for (i = 0;i < numpoints;i++)
- Matrix4x4_Transform(polygonmatrixend, points + i * 3, polyf_brushend.points[i].v);
- Collision_CalcPlanesForPolygonBrushFloat(&polyf_brushstart);
- Collision_CalcPlanesForPolygonBrushFloat(&polyf_brushend);
-
- //Collision_PrintBrushAsQHull(&polyf_brushstart, "polyf_brushstart");
- //Collision_PrintBrushAsQHull(&polyf_brushend, "polyf_brushend");
-
- Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, &polyf_brushstart, &polyf_brushend);
-}
-
-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)
+// NOTE: start and end of brush pair must have same numplanes/numpoints
+void Collision_TraceLineBrushFloat(trace_t *trace, const vec3_t linestart, const vec3_t lineend, const colbrushf_t *thatbrush_start, const colbrushf_t *thatbrush_end)
{
- 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
-void Collision_TraceBrushBrushDouble(trace_t *trace, const colbrushd_t *thisbrush_start, const colbrushd_t *thisbrush_end, const colbrushd_t *thatbrush_start, const colbrushd_t *thatbrush_end)
-{
- int nplane, nplane2, fstartsolid, fendsolid;
- double enterfrac, leavefrac, d1, d2, f, newimpactnormal[3];
- const colplaned_t *startplane, *endplane;
+ int nplane, fstartsolid, fendsolid, brushsolid;
+ float enterfrac, leavefrac, d1, d2, f, newimpactnormal[3];
+ const colplanef_t *startplane, *endplane;
enterfrac = -1;
leavefrac = 1;
fstartsolid = true;
fendsolid = true;
- for (nplane = 0;nplane < thatbrush_start->numplanes + thisbrush_start->numplanes;nplane++)
+ for (nplane = 0;nplane < thatbrush_start->numplanes;nplane++)
{
- nplane2 = nplane;
- if (nplane2 >= thatbrush_start->numplanes)
- {
- nplane2 -= thatbrush_start->numplanes;
- startplane = thisbrush_start->planes + nplane2;
- endplane = thisbrush_end->planes + nplane2;
- }
- else
- {
- startplane = thatbrush_start->planes + nplane2;
- endplane = thatbrush_end->planes + nplane2;
- }
- 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_end->numpoints) - furthestplanedist_double(endplane->normal, thatbrush_end->points, thatbrush_end->numpoints) - COLLISIONEPSILON2;
- //Con_Printf("%c%i: d1 = %f, d2 = %f, d1 / (d1 - d2) = %f\n", nplane2 != nplane ? 'b' : 'a', nplane2, d1, d2, d1 / (d1 - d2));
+ startplane = thatbrush_start->planes + nplane;
+ endplane = thatbrush_end->planes + nplane;
+ d1 = DotProduct(startplane->normal, linestart) - startplane->dist;
+ d2 = DotProduct(endplane->normal, lineend) - endplane->dist;
f = d1 - d2;
if (f >= 0)
}
}
+ brushsolid = trace->hitsupercontentsmask & thatbrush_start->supercontents;
if (fstartsolid)
{
- trace->startsolid = true;
- if (fendsolid)
- trace->allsolid = true;
+ trace->startsupercontents |= thatbrush_start->supercontents;
+ if (brushsolid)
+ {
+ 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 < trace->fraction && enterfrac - (1.0f / 1024.0f) <= leavefrac)
+ if (brushsolid && enterfrac > -1 && enterfrac < trace->fraction && enterfrac - (1.0f / 1024.0f) <= leavefrac)
{
trace->fraction = bound(0, enterfrac, 1);
VectorCopy(newimpactnormal, trace->plane.normal);
}
}
-static colplaned_t polyd_planes[256 + 2];
-static colbrushd_t polyd_brush;
-void Collision_TraceBrushPolygonDouble(trace_t *trace, const colbrushd_t *thisbrush_start, const colbrushd_t *thisbrush_end, int numpoints, const double *points)
+static colplanef_t polyf_planes[256 + 2];
+static colbrushf_t polyf_brush;
+
+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;
}
- polyd_brush.numpoints = numpoints;
- polyd_brush.numplanes = numpoints + 2;
- polyd_brush.points = (colpointd_t *)points;
- polyd_brush.planes = polyd_planes;
- Collision_CalcPlanesForPolygonBrushDouble(&polyd_brush);
- Collision_TraceBrushBrushDouble(trace, thisbrush_start, thisbrush_end, &polyd_brush, &polyd_brush);
-}
-
-
-
-
-typedef struct colbrushbmodelinfo_s
-{
- model_t *model;
- trace_t *trace;
- const matrix4x4_t *modelmatrixstart;
- const matrix4x4_t *modelmatrixend;
- const colbrushf_t *thisbrush_start;
- const colbrushf_t *thisbrush_end;
+ polyf_brush.numpoints = numpoints;
+ polyf_brush.numplanes = numpoints + 2;
+ polyf_brush.points = (colpointf_t *)points;
+ polyf_brush.planes = polyf_planes;
+ Collision_CalcPlanesForPolygonBrushFloat(&polyf_brush);
+ //Collision_PrintBrushAsQHull(&polyf_brush, "polyf_brush");
+ Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, &polyf_brush, &polyf_brush);
}
-colbrushbmodelinfo_t;
-static int colframecount = 1;
+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;
-void Collision_RecursiveTraceBrushNode(colbrushbmodelinfo_t *info, mnode_t *node)
+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)
{
- if (node->contents)
- {
- // collide with surfaces marked by this leaf
- int i, *mark;
- 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)
- {
- Collision_TraceBrushPolygonFloat(info->trace, info->thisbrush_start, info->thisbrush_end, surf->poly_numverts, surf->poly_verts);
- //Collision_TraceBrushPolygonTransformFloat(info->trace, info->thisbrush_start, info->thisbrush_end, surf->poly_numverts, surf->poly_verts, info->modelmatrixstart, info->modelmatrixend);
- }
- }
- }
- }
- else
+ int i;
+ if (numpoints > 256)
{
- // 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;
- }
- }
+ Con_Printf("Polygon with more than 256 points not supported yet (fixme!)\n");
+ return;
}
-}
+ polyf_brushstart.numpoints = numpoints;
+ polyf_brushstart.numplanes = numpoints + 2;
+ polyf_brushstart.points = polyf_pointsstart;//(colpointf_t *)points;
+ polyf_brushstart.planes = polyf_planesstart;
+ for (i = 0;i < numpoints;i++)
+ Matrix4x4_Transform(polygonmatrixstart, points + i * 3, polyf_brushstart.points[i].v);
+ polyf_brushend.numpoints = numpoints;
+ polyf_brushend.numplanes = numpoints + 2;
+ polyf_brushend.points = polyf_pointsend;//(colpointf_t *)points;
+ polyf_brushend.planes = polyf_planesend;
+ for (i = 0;i < numpoints;i++)
+ Matrix4x4_Transform(polygonmatrixend, points + i * 3, polyf_brushend.points[i].v);
+ Collision_CalcPlanesForPolygonBrushFloat(&polyf_brushstart);
+ Collision_CalcPlanesForPolygonBrushFloat(&polyf_brushend);
-void Collision_TraceBrushBModel(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, model_t *model)
-{
- colbrushbmodelinfo_t info;
- colframecount++;
- memset(trace, 0, sizeof(*trace));
- trace->fraction = 1;
- info.trace = trace;
- info.model = model;
- info.thisbrush_start = thisbrush_start;
- info.thisbrush_end = thisbrush_end;
- Collision_RecursiveTraceBrushNode(&info, model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode);
-}
+ //Collision_PrintBrushAsQHull(&polyf_brushstart, "polyf_brushstart");
+ //Collision_PrintBrushAsQHull(&polyf_brushend, "polyf_brushend");
-void Collision_TraceBrushBModelTransform(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, model_t *model, const matrix4x4_t *modelmatrixstart, const matrix4x4_t *modelmatrixend)
-{
- colbrushbmodelinfo_t info;
- colframecount++;
- memset(trace, 0, sizeof(*trace));
- trace->fraction = 1;
- info.trace = trace;
- info.model = model;
- info.modelmatrixstart = modelmatrixstart;
- info.modelmatrixend = modelmatrixend;
- info.thisbrush_start = thisbrush_start;
- info.thisbrush_end = thisbrush_end;
- Collision_RecursiveTraceBrushNode(&info, model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode);
+ Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, &polyf_brushstart, &polyf_brushend);
}
int i;
for (i = 0;i < MAX_BRUSHFORBOX;i++)
{
+ brushforbox_brush[i].supercontents = SUPERCONTENTS_SOLID;
brushforbox_brush[i].numpoints = 8;
brushforbox_brush[i].numplanes = 6;
brushforbox_brush[i].points = brushforbox_point + i * 8;
VectorNormalize(brush->planes[i].normal);
brush->planes[i].dist = furthestplanedist_float(brush->planes[i].normal, brush->points, brush->numpoints);
}
+ Collision_ValidateBrush(brush);
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)
+void Collision_ClipTrace_BrushBox(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)
{
- 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]);
-
+ colbrushf_t *boxbrush, *thisbrush_start, *thisbrush_end;
+ matrix4x4_t identitymatrix;
+ vec3_t startmins, startmaxs, endmins, endmaxs;
+
+ // create brushes for the collision
+ VectorAdd(start, mins, startmins);
+ VectorAdd(start, maxs, startmaxs);
+ VectorAdd(end, mins, endmins);
+ VectorAdd(end, maxs, endmaxs);
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
- Collision_TraceBrushBModel(trace, thisbrush_start, thisbrush_end, cmodel);
- //Collision_TraceBrushBModelTransform(trace, thisbrush_start, thisbrush_end, cmodel, &cmatrix, &cmatrix);
- }
- else
- {
- // bounding box
- cbrush = Collision_BrushForBox(&identitymatrix, cmins, cmaxs);
- Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, cbrush, cbrush);
- //cbrush = Collision_BrushForBox(&cmatrix, cmins, cmaxs);
- //trace->fraction = Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, cbrush, cbrush);
- }
-
- if (trace->fraction < 0 || trace->fraction > 1)
- Con_Printf("fraction out of bounds %f %s:%d\n", trace->fraction, __FILE__, __LINE__);
+ boxbrush = Collision_BrushForBox(&identitymatrix, cmins, cmaxs);
+ thisbrush_start = Collision_BrushForBox(&identitymatrix, startmins, startmaxs);
+ thisbrush_end = Collision_BrushForBox(&identitymatrix, endmins, endmaxs);
- VectorBlend(start, end, trace->fraction, trace->endpos);
- if (trace->fraction < 1)
- {
- trace->ent = (void *) cent;
- VectorCopy(trace->plane.normal, impactnormal);
- 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]);
- }
+ memset(trace, 0, sizeof(trace_t));
+ trace->hitsupercontentsmask = hitsupercontentsmask;
+ trace->fraction = 1;
+ trace->allsolid = true;
+ Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, boxbrush, boxbrush);
}
-
// 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,
projects / xonotic / darkplaces.git / blobdiff