fix glDrawRangeElements issue with mesa

[xonotic/darkplaces.git] / collision.c

diff --git a/collision.c b/collision.c
index 0758a7198fa2903387d8a08b9230a020aa2b497f..31498891d27c96916faedffc83f508a6e0e9847e 100644 (file)
--- a/collision.c
+++ b/collision.c
@@ -901,7 +901,7 @@ void Collision_TraceBrushPolygonFloat(trace_t *trace, const colbrushf_t *thisbru
        Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, &polyf_brush, &polyf_brush);
 }
 
-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)
+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 stride, float *bbox6f, int supercontents, int q3surfaceflags, texture_t *texture, const vec3_t segmentmins, const vec3_t segmentmaxs)
 {
        int i;
        polyf_brush.numpoints = 3;
@@ -914,17 +914,44 @@ void Collision_TraceBrushTriangleMeshFloat(trace_t *trace, const colbrushf_t *th
                polyf_brush.planes[i].q3surfaceflags = q3surfaceflags;
                polyf_brush.planes[i].texture = texture;
        }
-       for (i = 0;i < numtriangles;i++, element3i += 3)
+       if(stride)
        {
-               if (TriangleOverlapsBox(vertex3f + element3i[0]*3, vertex3f + element3i[1]*3, vertex3f + element3i[2]*3, segmentmins, segmentmaxs))
+               int k, cnt, tri;
+               cnt = (numtriangles + stride - 1) / stride;
+               for(i = 0; i < cnt; ++i)
                {
-                       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);
+                       if(BoxesOverlap(bbox6f + i * 6, bbox6f + i * 6 + 3, segmentmins, segmentmaxs))
+                       {
+                               for(k = 0; k < stride; ++k)
+                               {
+                                       tri = i * stride + k;
+                                       if(tri >= numtriangles)
+                                               break;
+                                       VectorCopy(vertex3f + element3i[tri * 3 + 0] * 3, polyf_points[0].v);
+                                       VectorCopy(vertex3f + element3i[tri * 3 + 1] * 3, polyf_points[1].v);
+                                       VectorCopy(vertex3f + element3i[tri * 3 + 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);
+                               }
+                       }
+               }
+       }
+       else
+       {
+               for (i = 0;i < numtriangles;i++, element3i += 3)
+               {
+                       if (TriangleOverlapsBox(vertex3f + element3i[0]*3, vertex3f + element3i[1]*3, vertex3f + element3i[2]*3, segmentmins, segmentmaxs))
+                       {
+                               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);
+                       }
                }
        }
 }
@@ -948,13 +975,34 @@ void Collision_TraceLinePolygonFloat(trace_t *trace, const vec3_t linestart, con
        Collision_TraceLineBrushFloat(trace, linestart, lineend, &polyf_brush, &polyf_brush);
 }
 
-void Collision_TraceLineTriangleMeshFloat(trace_t *trace, const vec3_t linestart, const vec3_t lineend, int numtriangles, const int *element3i, const float *vertex3f, int supercontents, int q3surfaceflags, texture_t *texture, const vec3_t segmentmins, const vec3_t segmentmaxs)
+void Collision_TraceLineTriangleMeshFloat(trace_t *trace, const vec3_t linestart, const vec3_t lineend, int numtriangles, const int *element3i, const float *vertex3f, int stride, float *bbox6f, int supercontents, int q3surfaceflags, texture_t *texture, const vec3_t segmentmins, const vec3_t segmentmaxs)
 {
        int i;
 #if 1
        // FIXME: snap vertices?
-       for (i = 0;i < numtriangles;i++, element3i += 3)
-               Collision_TraceLineTriangleFloat(trace, linestart, lineend, vertex3f + element3i[0] * 3, vertex3f + element3i[1] * 3, vertex3f + element3i[2] * 3, supercontents, q3surfaceflags, texture);
+       if(stride)
+       {
+               int k, cnt, tri;
+               cnt = (numtriangles + stride - 1) / stride;
+               for(i = 0; i < cnt; ++i)
+               {
+                       if(BoxesOverlap(bbox6f + i * 6, bbox6f + i * 6 + 3, segmentmins, segmentmaxs))
+                       {
+                               for(k = 0; k < stride; ++k)
+                               {
+                                       tri = i * stride + k;
+                                       if(tri >= numtriangles)
+                                               break;
+                                       Collision_TraceLineTriangleFloat(trace, linestart, lineend, vertex3f + element3i[tri * 3 + 0] * 3, vertex3f + element3i[tri * 3 + 1] * 3, vertex3f + element3i[tri * 3 + 2] * 3, supercontents, q3surfaceflags, texture);
+                               }
+                       }
+               }
+       }
+       else
+       {
+               for (i = 0;i < numtriangles;i++, element3i += 3)
+                       Collision_TraceLineTriangleFloat(trace, linestart, lineend, vertex3f + element3i[0] * 3, vertex3f + element3i[1] * 3, vertex3f + element3i[2] * 3, supercontents, q3surfaceflags, texture);
+       }
 #else
        polyf_brush.numpoints = 3;
        polyf_brush.numplanes = 5;
@@ -1541,7 +1589,7 @@ void Collision_CombineTraces(trace_t *cliptrace, const trace_t *trace, void *tou
        //      cliptrace->inopen = true;
        if (trace->inwater)
                cliptrace->inwater = true;
-       if ((trace->realfraction <= cliptrace->realfraction) && (VectorLength2(trace->plane->normal) > 0))
+       if ((trace->realfraction <= cliptrace->realfraction) && (VectorLength2(trace->plane.normal) > 0))
        {
                cliptrace->fraction = trace->fraction;
                cliptrace->realfraction = trace->realfraction;
@@ -1554,3 +1602,22 @@ void Collision_CombineTraces(trace_t *cliptrace, const trace_t *trace, void *tou
        }
        cliptrace->startsupercontents |= trace->startsupercontents;
 }
+
+void Collision_ShortenTrace(trace_t *trace, float shorten_factor, const vec3_t end)
+{
+       // now undo our moving end 1 qu farther...
+       trace->fraction = bound(trace->fraction, trace->fraction / shorten_factor - 1e-6, 1); // we subtract 1e-6 to guard for roundoff errors
+       trace->realfraction = bound(trace->realfraction, trace->realfraction / shorten_factor - 1e-6, 1); // we subtract 1e-6 to guard for roundoff errors
+       if(trace->fraction >= 1) // trace would NOT hit if not expanded!
+       {
+               trace->fraction = 1;
+               trace->realfraction = 1;
+               VectorCopy(end, trace->endpos);
+               memset(&trace->plane, 0, sizeof(trace->plane));
+               trace->ent = NULL;
+               trace->hitsupercontentsmask = 0;
+               trace->hitsupercontents = 0;
+               trace->hitq3surfaceflags = 0;
+               trace->hittexture = NULL;
+       }
+}