]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - collision.c
projects / xonotic / darkplaces.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
the record command now disconnects you if starting a new map, this fixes a crash...
[xonotic/darkplaces.git] / collision.c
diff --git a/collision.c b/collision.c
index 20fc83997119c3973d3561eafe3d08651e93806d..50812e5ec78b38ec0ce6144f84955c326c4941d3 100644 (file)
--- a/collision.c
+++ b/collision.c
@@ -668,31 +668,33 @@ void Collision_TraceBrushBrushFloat(trace_t *trace, const colbrushf_t *thisbrush
        // at this point we know the trace overlaps the brush because it was not
        // rejected at any point in the loop above
 
-       // see if this brush can block the trace or not according to contents
-       if (trace->hitsupercontentsmask & thatbrush_start->supercontents)
+       // see if the trace started outside the brush or not
+       if (enterfrac > -1)
        {
-               if (enterfrac == -1)
+               // started outside, and overlaps, therefore there is a collision here
+               // store out the impact information
+               if (trace->hitsupercontentsmask & thatbrush_start->supercontents)
                {
-                       trace->startsupercontents |= thatbrush_start->supercontents;
-                       trace->startsolid = true;
-                       if (leavefrac < 1)
-                               trace->allsolid = true;
+                       trace->hitsupercontents = thatbrush_start->supercontents;
+                       trace->hitq3surfaceflags = hitq3surfaceflags;
+                       trace->hittexture = hittexture;
+                       trace->realfraction = bound(0, enterfrac, 1);
+                       trace->fraction = bound(0, enterfrac2, 1);
+                       if (collision_prefernudgedfraction.integer)
+                               trace->realfraction = trace->fraction;
+                       VectorCopy(newimpactnormal, trace->plane.normal);
                }
-               // store out the impact information
-               trace->hitsupercontents = thatbrush_start->supercontents;
-               trace->hitq3surfaceflags = hitq3surfaceflags;
-               trace->hittexture = hittexture;
-               trace->realfraction = bound(0, enterfrac, 1);
-               trace->fraction = bound(0, enterfrac2, 1);
-               if (collision_prefernudgedfraction.integer)
-                       trace->realfraction = trace->fraction;
-               VectorCopy(newimpactnormal, trace->plane.normal);
        }
        else
        {
-               // this brush can not block the trace, but it can update start contents
-               if (enterfrac == -1)
-                       trace->startsupercontents |= thatbrush_start->supercontents;
+               // started inside, update startsolid and friends
+               trace->startsupercontents |= thatbrush_start->supercontents;
+               if (trace->hitsupercontentsmask & thatbrush_start->supercontents)
+               {
+                       trace->startsolid = true;
+                       if (leavefrac < 1)
+                               trace->allsolid = true;
+               }
        }
 }
 
@@ -785,31 +787,33 @@ void Collision_TraceLineBrushFloat(trace_t *trace, const vec3_t linestart, const
        // at this point we know the trace overlaps the brush because it was not
        // rejected at any point in the loop above
 
-       // see if this brush can block the trace or not according to contents
-       if (trace->hitsupercontentsmask & thatbrush_start->supercontents)
+       // see if the trace started outside the brush or not
+       if (enterfrac > -1)
+       {
+               // started outside, and overlaps, therefore there is a collision here
+               // store out the impact information
+               if (trace->hitsupercontentsmask & thatbrush_start->supercontents)
+               {
+                       trace->hitsupercontents = thatbrush_start->supercontents;
+                       trace->hitq3surfaceflags = hitq3surfaceflags;
+                       trace->hittexture = hittexture;
+                       trace->realfraction = bound(0, enterfrac, 1);
+                       trace->fraction = bound(0, enterfrac2, 1);
+                       if (collision_prefernudgedfraction.integer)
+                               trace->realfraction = trace->fraction;
+                       VectorCopy(newimpactnormal, trace->plane.normal);
+               }
+       }
+       else
        {
-               if (enterfrac == -1)
+               // started inside, update startsolid and friends
+               trace->startsupercontents |= thatbrush_start->supercontents;
+               if (trace->hitsupercontentsmask & thatbrush_start->supercontents)
                {
-                       trace->startsupercontents |= thatbrush_start->supercontents;
                        trace->startsolid = true;
                        if (leavefrac < 1)
                                trace->allsolid = true;
                }
-               // store out the impact information
-               trace->hitsupercontents = thatbrush_start->supercontents;
-               trace->hitq3surfaceflags = hitq3surfaceflags;
-               trace->hittexture = hittexture;
-               trace->realfraction = bound(0, enterfrac, 1);
-               trace->fraction = bound(0, enterfrac2, 1);
-               if (collision_prefernudgedfraction.integer)
-                       trace->realfraction = trace->fraction;
-               VectorCopy(newimpactnormal, trace->plane.normal);
-       }
-       else
-       {
-               // this brush can not block the trace, but it can update start contents
-               if (enterfrac == -1)
-                       trace->startsupercontents |= thatbrush_start->supercontents;
        }
 }
 
@@ -836,11 +840,12 @@ static colbrushf_t polyf_brush;
 
 void Collision_SnapCopyPoints(int numpoints, const colpointf_t *in, colpointf_t *out, float fractionprecision, float invfractionprecision)
 {
-       while (numpoints--)
+       int i;
+       for (i = 0;i < numpoints;i++)
        {
-               out->v[0] = floor(in->v[0] * fractionprecision + 0.5f) * invfractionprecision;
-               out->v[1] = floor(in->v[1] * fractionprecision + 0.5f) * invfractionprecision;
-               out->v[2] = floor(in->v[2] * fractionprecision + 0.5f) * invfractionprecision;
+               out[i].v[0] = floor(in[i].v[0] * fractionprecision + 0.5f) * invfractionprecision;
+               out[i].v[1] = floor(in[i].v[1] * fractionprecision + 0.5f) * invfractionprecision;
+               out[i].v[2] = floor(in[i].v[2] * fractionprecision + 0.5f) * invfractionprecision;
        }
 }
 
@@ -857,7 +862,7 @@ void Collision_TraceBrushPolygonFloat(trace_t *trace, const colbrushf_t *thisbru
        polyf_brush.planes = polyf_planes;
        polyf_brush.supercontents = supercontents;
        polyf_brush.points = polyf_points;
-       Collision_SnapCopyPoints(numpoints, (colpointf_t *)points, polyf_points, COLLISION_SNAPSCALE, COLLISION_SNAP);
+       Collision_SnapCopyPoints(polyf_brush.numpoints, (colpointf_t *)points, polyf_points, COLLISION_SNAPSCALE, COLLISION_SNAP);
        Collision_CalcPlanesForPolygonBrushFloat(&polyf_brush);
        //Collision_PrintBrushAsQHull(&polyf_brush, "polyf_brush");
        Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, &polyf_brush, &polyf_brush);
@@ -866,7 +871,6 @@ void Collision_TraceBrushPolygonFloat(trace_t *trace, const colbrushf_t *thisbru
 void Collision_TraceBrushTriangleMeshFloat(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int numtriangles, const int *element3i, const float *vertex3f, int supercontents, int q3surfaceflags, texture_t *texture, const vec3_t segmentmins, const vec3_t segmentmaxs)
 {
        int i;
-       float facemins[3], facemaxs[3];
        polyf_brush.numpoints = 3;
        polyf_brush.numplanes = 5;
        polyf_brush.points = polyf_points;
@@ -879,18 +883,17 @@ void Collision_TraceBrushTriangleMeshFloat(trace_t *trace, const colbrushf_t *th
        }
        for (i = 0;i < numtriangles;i++, element3i += 3)
        {
-               VectorCopy(vertex3f + element3i[0] * 3, polyf_points[0].v);
-               VectorCopy(vertex3f + element3i[1] * 3, polyf_points[1].v);
-               VectorCopy(vertex3f + element3i[2] * 3, polyf_points[2].v);
-               Collision_SnapCopyPoints(3, polyf_points, polyf_points, COLLISION_SNAPSCALE, COLLISION_SNAP);
-               facemins[0] = min(polyf_points[0].v[0], min(polyf_points[1].v[0], polyf_points[2].v[0]));
-               facemins[1] = min(polyf_points[0].v[1], min(polyf_points[1].v[1], polyf_points[2].v[1]));
-               facemins[2] = min(polyf_points[0].v[2], min(polyf_points[1].v[2], polyf_points[2].v[2]));
-               facemaxs[0] = max(polyf_points[0].v[0], max(polyf_points[1].v[0], polyf_points[2].v[0]));
-               facemaxs[1] = max(polyf_points[0].v[1], max(polyf_points[1].v[1], polyf_points[2].v[1]));
-               facemaxs[2] = max(polyf_points[0].v[2], max(polyf_points[1].v[2], polyf_points[2].v[2]));
-               if (BoxesOverlap(segmentmins, segmentmaxs, facemins, facemaxs))
+               if (segmentmaxs[0] >= min(vertex3f[element3i[0]*3+0], min(vertex3f[element3i[1]*3+0], vertex3f[element3i[2]*3+0]))
+                && segmentmins[0] <= max(vertex3f[element3i[0]*3+0], max(vertex3f[element3i[1]*3+0], vertex3f[element3i[2]*3+0]))
+                && segmentmaxs[1] >= min(vertex3f[element3i[0]*3+1], min(vertex3f[element3i[1]*3+1], vertex3f[element3i[2]*3+1]))
+                && segmentmins[1] <= max(vertex3f[element3i[0]*3+1], max(vertex3f[element3i[1]*3+1], vertex3f[element3i[2]*3+1]))
+                && segmentmaxs[2] >= min(vertex3f[element3i[0]*3+2], min(vertex3f[element3i[1]*3+2], vertex3f[element3i[2]*3+2]))
+                && segmentmins[2] <= max(vertex3f[element3i[0]*3+2], max(vertex3f[element3i[1]*3+2], vertex3f[element3i[2]*3+2])))
                {
+                       VectorCopy(vertex3f + element3i[0] * 3, polyf_points[0].v);
+                       VectorCopy(vertex3f + element3i[1] * 3, polyf_points[1].v);
+                       VectorCopy(vertex3f + element3i[2] * 3, polyf_points[2].v);
+                       Collision_SnapCopyPoints(polyf_brush.numpoints, polyf_points, polyf_points, COLLISION_SNAPSCALE, COLLISION_SNAP);
                        Collision_CalcPlanesForPolygonBrushFloat(&polyf_brush);
                        //Collision_PrintBrushAsQHull(&polyf_brush, "polyf_brush");
                        Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, &polyf_brush, &polyf_brush);
@@ -909,7 +912,7 @@ void Collision_TraceLinePolygonFloat(trace_t *trace, const vec3_t linestart, con
        polyf_brush.numplanes = numpoints + 2;
        //polyf_brush.points = (colpointf_t *)points;
        polyf_brush.points = polyf_points;
-       Collision_SnapCopyPoints(numpoints, (colpointf_t *)points, polyf_points, COLLISION_SNAPSCALE, COLLISION_SNAP);
+       Collision_SnapCopyPoints(polyf_brush.numpoints, (colpointf_t *)points, polyf_points, COLLISION_SNAPSCALE, COLLISION_SNAP);
        polyf_brush.planes = polyf_planes;
        polyf_brush.supercontents = supercontents;
        Collision_CalcPlanesForPolygonBrushFloat(&polyf_brush);
@@ -938,19 +941,17 @@ void Collision_TraceLineTriangleMeshFloat(trace_t *trace, const vec3_t linestart
        }
        for (i = 0;i < numtriangles;i++, element3i += 3)
        {
-               float facemins[3], facemaxs[3];
-               VectorCopy(vertex3f + element3i[0] * 3, polyf_points[0].v);
-               VectorCopy(vertex3f + element3i[1] * 3, polyf_points[1].v);
-               VectorCopy(vertex3f + element3i[2] * 3, polyf_points[2].v);
-               Collision_SnapCopyPoints(numpoints, polyf_points, polyf_points, COLLISION_SNAPSCALE, COLLISION_SNAP);
-               facemins[0] = min(polyf_points[0].v[0], min(polyf_points[1].v[0], polyf_points[2].v[0]));
-               facemins[1] = min(polyf_points[0].v[1], min(polyf_points[1].v[1], polyf_points[2].v[1]));
-               facemins[2] = min(polyf_points[0].v[2], min(polyf_points[1].v[2], polyf_points[2].v[2]));
-               facemaxs[0] = max(polyf_points[0].v[0], max(polyf_points[1].v[0], polyf_points[2].v[0]));
-               facemaxs[1] = max(polyf_points[0].v[1], max(polyf_points[1].v[1], polyf_points[2].v[1]));
-               facemaxs[2] = max(polyf_points[0].v[2], max(polyf_points[1].v[2], polyf_points[2].v[2]));
-               if (BoxesOverlap(segmentmins, segmentmaxs, facemins, facemaxs))
+               if (segmentmaxs[0] >= min(vertex3f[element3i[0]*3+0], min(vertex3f[element3i[1]*3+0], vertex3f[element3i[2]*3+0]))
+                && segmentmins[0] <= max(vertex3f[element3i[0]*3+0], max(vertex3f[element3i[1]*3+0], vertex3f[element3i[2]*3+0]))
+                && segmentmaxs[1] >= min(vertex3f[element3i[0]*3+1], min(vertex3f[element3i[1]*3+1], vertex3f[element3i[2]*3+1]))
+                && segmentmins[1] <= max(vertex3f[element3i[0]*3+1], max(vertex3f[element3i[1]*3+1], vertex3f[element3i[2]*3+1]))
+                && segmentmaxs[2] >= min(vertex3f[element3i[0]*3+2], min(vertex3f[element3i[1]*3+2], vertex3f[element3i[2]*3+2]))
+                && segmentmins[2] <= max(vertex3f[element3i[0]*3+2], max(vertex3f[element3i[1]*3+2], vertex3f[element3i[2]*3+2])))
                {
+                       VectorCopy(vertex3f + element3i[0] * 3, polyf_points[0].v);
+                       VectorCopy(vertex3f + element3i[1] * 3, polyf_points[1].v);
+                       VectorCopy(vertex3f + element3i[2] * 3, polyf_points[2].v);
+                       Collision_SnapCopyPoints(polyf_brush.numpoints, polyf_points, polyf_points, COLLISION_SNAPSCALE, COLLISION_SNAP);
                        Collision_CalcPlanesForPolygonBrushFloat(&polyf_brush);
                        //Collision_PrintBrushAsQHull(&polyf_brush, "polyf_brush");
                        Collision_TraceLineBrushFloat(trace, linestart, lineend, &polyf_brush, &polyf_brush);
@@ -991,8 +992,8 @@ void Collision_TraceBrushPolygonTransformFloat(trace_t *trace, const colbrushf_t
                polyf_brushstart.planes[i].q3surfaceflags = q3surfaceflags;
                polyf_brushstart.planes[i].texture = texture;
        }
-       Collision_SnapCopyPoints(numpoints, polyf_pointsstart, polyf_pointsstart, COLLISION_SNAPSCALE, COLLISION_SNAP);
-       Collision_SnapCopyPoints(numpoints, polyf_pointsend, polyf_pointsend, COLLISION_SNAPSCALE, COLLISION_SNAP);
+       Collision_SnapCopyPoints(polyf_brushstart.numpoints, polyf_pointsstart, polyf_pointsstart, COLLISION_SNAPSCALE, COLLISION_SNAP);
+       Collision_SnapCopyPoints(polyf_brushend.numpoints, polyf_pointsend, polyf_pointsend, COLLISION_SNAPSCALE, COLLISION_SNAP);
        Collision_CalcPlanesForPolygonBrushFloat(&polyf_brushstart);
        Collision_CalcPlanesForPolygonBrushFloat(&polyf_brushend);