X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=collision.c;h=73a1bd0a5b374fa1d2c1a847d0150242c8ffae74;hp=305c561245b606455d3d43f8afd8adff24f17b38;hb=ad0206e3d383e1f61887081b9dc80ba7a5a6cdb0;hpb=79d41fc919c7024e27b4e1a0a99a3fecb03a927e

diff --git a/collision.c b/collision.c
index 305c5612..73a1bd0a 100644
--- a/collision.c
+++ b/collision.c
@@ -823,14 +823,23 @@ void Collision_TraceLineBrushFloat(trace_t *trace, const vec3_t linestart, const
 	}
 }
 
-void Collision_TracePointBrushFloat(trace_t *trace, const vec3_t point, const colbrushf_t *thatbrush)
+qboolean Collision_PointInsideBrushFloat(const vec3_t point, const colbrushf_t *brush)
 {
 	int nplane;
 	const colplanef_t *plane;
 
-	for (nplane = 0, plane = thatbrush->planes;nplane < thatbrush->numplanes;nplane++, plane++)
+	if (!BoxesOverlap(point, point, brush->mins, brush->maxs))
+		return false;
+	for (nplane = 0, plane = brush->planes;nplane < brush->numplanes;nplane++, plane++)
 		if (DotProduct(plane->normal, point) > plane->dist)
-			return;
+			return false;
+	return true;
+}
+
+void Collision_TracePointBrushFloat(trace_t *trace, const vec3_t point, const colbrushf_t *thatbrush)
+{
+	if (!Collision_PointInsideBrushFloat(point, thatbrush))
+		return;
 
 	trace->startsupercontents |= thatbrush->supercontents;
 	if (trace->hitsupercontentsmask & thatbrush->supercontents)
@@ -889,12 +898,7 @@ void Collision_TraceBrushTriangleMeshFloat(trace_t *trace, const colbrushf_t *th
 	}
 	for (i = 0;i < numtriangles;i++, element3i += 3)
 	{
-		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])))
+		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);
@@ -947,12 +951,7 @@ void Collision_TraceLineTriangleMeshFloat(trace_t *trace, const vec3_t linestart
 	}
 	for (i = 0;i < numtriangles;i++, element3i += 3)
 	{
-		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])))
+		if (TriangleOverlapsBox(vertex3f + element3i[0]*3, vertex3 + [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);
@@ -1012,7 +1011,9 @@ void Collision_TraceBrushPolygonTransformFloat(trace_t *trace, const colbrushf_t
 
 
 #define MAX_BRUSHFORBOX 16
-static int brushforbox_index = 0;
+static unsigned int brushforbox_index = 0;
+// note: this relies on integer overflow to be consistent with modulo
+// MAX_BRUSHFORBOX, or in other words, MAX_BRUSHFORBOX must be a power of two!
 static colpointf_t brushforbox_point[MAX_BRUSHFORBOX*8];
 static colplanef_t brushforbox_plane[MAX_BRUSHFORBOX*6];
 static colbrushf_t brushforbox_brush[MAX_BRUSHFORBOX];
@@ -1155,7 +1156,7 @@ float Collision_ClipTrace_Line_Sphere(double *linestart, double *lineend, double
 	if (deviationdist > sphereradius*sphereradius)
 		return 1; // miss (off to the side)
 	// nudge back to find the correct impact distance
-	impactdist += deviationdist - sphereradius;
+	impactdist -= sphereradius - deviationdist/sphereradius;
 	if (impactdist >= linelength)
 		return 1; // miss (not close enough)
 	if (impactdist < 0)
@@ -1464,7 +1465,7 @@ void Collision_BoundingBoxOfBrushTraceSegment(const colbrushf_t *start, const co
 
 //===========================================
 
-void Collision_ClipToGenericEntity(trace_t *trace, model_t *model, int frame, const vec3_t bodymins, const vec3_t bodymaxs, int bodysupercontents, matrix4x4_t *matrix, matrix4x4_t *inversematrix, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask)
+void Collision_ClipToGenericEntity(trace_t *trace, dp_model_t *model, int frame, const vec3_t bodymins, const vec3_t bodymaxs, int bodysupercontents, matrix4x4_t *matrix, matrix4x4_t *inversematrix, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask)
 {
 	float tempnormal[3], starttransformed[3], endtransformed[3];
 
@@ -1494,7 +1495,7 @@ void Collision_ClipToGenericEntity(trace_t *trace, model_t *model, int frame, co
 	}
 }
 
-void Collision_ClipToWorld(trace_t *trace, model_t *model, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontents)
+void Collision_ClipToWorld(trace_t *trace, dp_model_t *model, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontents)
 {
 	memset(trace, 0, sizeof(*trace));
 	trace->fraction = trace->realfraction = 1;