remove the exec default.cfg call from the reset to defaults, I have no idea why it...

[xonotic/darkplaces.git] / collision.h

diff --git a/collision.h b/collision.h
index 1f58f9596124c87a33396a73ada863480f58b669..f13f7223c115145a255bb02d796e24f84ab0b542 100644 (file)
--- a/collision.h
+++ b/collision.h
@@ -26,6 +26,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)
@@ -94,6 +98,7 @@ void Collision_TraceBrushTriangleMeshFloat(trace_t *trace, const colbrushf_t *th
 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 +106,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