X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=collision.h;h=e2c8e6f2e70b6e2cddffb86d7745f30b1bbd8b5d;hb=c77cc6c6dfd662e2baf695cee6d8e906b0764ea5;hp=1f58f9596124c87a33396a73ada863480f58b669;hpb=b74281e908fa2cd02b711856cfbdc983300bf96d;p=xonotic%2Fdarkplaces.git

diff --git a/collision.h b/collision.h
index 1f58f959..e2c8e6f2 100644
--- a/collision.h
+++ b/collision.h
@@ -2,8 +2,6 @@
 #ifndef COLLISION_H
 #define COLLISION_H
 
-#include "winding.h"
-
 typedef struct plane_s
 {
 	vec3_t	normal;
@@ -26,6 +24,10 @@ typedef struct trace_s
 	// fraction of the total distance that was traveled before impact
 	// (1.0 = did not hit anything)
 	double fraction;
+	// like fraction but is not nudged away from the surface (better for
+	// comparisons between two trace structs, as only one nudge for the final
+	// result is ever needed)
+	double realfraction;
 	// final position of the trace (simply a point between start and end)
 	double endpos[3];
 	// surface normal at impact (not really correct for edge collisions)
@@ -87,13 +89,14 @@ colbrushf_t;
 colbrushf_t *Collision_AllocBrushFloat(mempool_t *mempool, int numpoints, int numplanes, int numtriangles, int supercontents);
 void Collision_CalcPlanesForPolygonBrushFloat(colbrushf_t *brush);
 colbrushf_t *Collision_AllocBrushFromPermanentPolygonFloat(mempool_t *mempool, int numpoints, float *points, int supercontents);
-colbrushf_t *Collision_NewBrushFromPlanes(mempool_t *mempool, int numoriginalplanes, const mplane_t *originalplanes, int supercontents, winding_t *temp1, winding_t *temp2);
+colbrushf_t *Collision_NewBrushFromPlanes(mempool_t *mempool, int numoriginalplanes, const mplane_t *originalplanes, int supercontents);
 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);
 void Collision_TraceBrushPolygonFloat(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int numpoints, const float *points, int supercontents);
 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, const vec3_t segmentmins, const vec3_t segmentmaxs);
 void Collision_TraceLineBrushFloat(trace_t *trace, const vec3_t linestart, const vec3_t lineend, const colbrushf_t *thatbrush_start, const colbrushf_t *thatbrush_end);
 void Collision_TraceLinePolygonFloat(trace_t *trace, const vec3_t linestart, const vec3_t lineend, int numpoints, const float *points, int supercontents);
 void Collision_TraceLineTriangleMeshFloat(trace_t *trace, const vec3_t linestart, const vec3_t lineend, int numtriangles, const int *element3i, const float *vertex3f, int supercontents, const vec3_t segmentmins, const vec3_t segmentmaxs);
+void Collision_TracePointBrushFloat(trace_t *trace, const vec3_t point, const colbrushf_t *thatbrush);
 
 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 supercontents);
 
@@ -101,6 +104,9 @@ colbrushf_t *Collision_BrushForBox(const matrix4x4_t *matrix, const vec3_t mins,
 
 void Collision_BoundingBoxOfBrushTraceSegment(const colbrushf_t *start, const colbrushf_t *end, vec3_t mins, vec3_t maxs, float startfrac, float endfrac);
 
+float Collision_ClipTrace_Line_Sphere(double *linestart, double *lineend, double *sphereorigin, double sphereradius, double *impactpoint, double *impactnormal);
+void Collision_TraceLineTriangleFloat(trace_t *trace, const vec3_t linestart, const vec3_t lineend, const float *point0, const float *point1, const float *point2);
+
 // this enables rather large debugging spew!
 // settings:
 // 0 = no spew