X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=collision.h;h=f13f7223c115145a255bb02d796e24f84ab0b542;hb=50179cc6a7fa538adf02e37077776a556e6ba63e;hp=0e746e4ee643f308f44bcc4f7bd426bd1730dea9;hpb=d3135507efcf1249b03e440b62bd07b0f935ca39;p=xonotic%2Fdarkplaces.git diff --git a/collision.h b/collision.h index 0e746e4e..f13f7223 100644 --- a/collision.h +++ b/collision.h @@ -2,6 +2,8 @@ #ifndef COLLISION_H #define COLLISION_H +#include "winding.h" + typedef struct plane_s { vec3_t normal; @@ -11,34 +13,43 @@ plane_t; typedef struct trace_s { - // if true, the entire trace was in solid + // if true, the entire trace was in solid (see hitsupercontentsmask) int allsolid; - // if true, the initial point was in solid + // if true, the initial point was in solid (see hitsupercontentsmask) int startsolid; // if true, the trace passed through empty somewhere + // (set only by Q1BSP tracing) int inopen; - // if true, the trace passed through water somewhere + // if true, the trace passed through water/slime/lava somewhere + // (set only by Q1BSP tracing) int inwater; // fraction of the total distance that was traveled before impact // (1.0 = did not hit anything) double fraction; - // final position + // 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 + // surface normal at impact (not really correct for edge collisions) plane_t plane; // entity the surface is on + // (not set by trace functions, only by physics) void *ent; - // if not zero, treats this value as empty, and all others as solid (impact - // on content change) - int thiscontents; - // the contents at the impact or end point - int endcontents; + // which SUPERCONTENTS bits to collide with, I.E. to consider solid + // (this also affects startsolid/allsolid) + int hitsupercontentsmask; + // the supercontents mask at the start point + int startsupercontents; + // initially false, set when the start leaf is found + // (set only by Q1BSP tracing and entity box tracing) + int startfound; } trace_t; -void Collision_RoundUpToHullSize(const model_t *cmodel, const vec3_t inmins, const vec3_t inmaxs, vec3_t outmins, vec3_t outmaxs); void Collision_Init(void); -void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end); +void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask, int boxsupercontents); typedef struct colpointf_s { @@ -55,53 +66,55 @@ colplanef_t; typedef struct colbrushf_s { + // the content flags of this brush + int supercontents; + // the number of bounding planes on this brush int numplanes; + // the number of corner points on this brush int numpoints; + // the number of renderable triangles on this brush + int numtriangles; + // array of bounding planes on this brush colplanef_t *planes; + // array of corner points on this brush colpointf_t *points; + // renderable triangles, as int[3] elements indexing the points + int *elements; + // used to avoid tracing against the same brush more than once + int markframe; + // culling box + vec3_t mins; + vec3_t maxs; } colbrushf_t; -colbrushf_t *Collision_AllocBrushFloat(mempool_t *mempool, int numpoints, int numplanes); +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); +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); 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); -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); +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); -typedef struct colpointd_s -{ - double v[3]; -} -colpointd_t; +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); -typedef struct colplaned_s -{ - double normal[3]; - double dist; -} -colplaned_t; - -typedef struct colbrushd_s -{ - int numplanes; - int numpoints; - colplaned_t *planes; - colpointd_t *points; -} -colbrushd_t; - -colbrushd_t *Collision_AllocBrushDouble(mempool_t *mempool, int numpoints, int numplanes); -void Collision_CalcPlanesForPolygonBrushDouble(colbrushd_t *brush); -colbrushd_t *Collision_AllocBrushFromPermanentPolygonDouble(mempool_t *mempool, int numpoints, double *points); -void Collision_TraceBrushBrushDouble(trace_t *trace, const colbrushd_t *thisbrush_start, const colbrushd_t *thisbrush_end, const colbrushd_t *thatbrush_start, const colbrushd_t *thatbrush_end); -void Collision_TraceBrushPolygonDouble(trace_t *trace, const colbrushd_t *thisbrush_start, const colbrushd_t *thisbrush_end, int numpoints, const double *points); +colbrushf_t *Collision_BrushForBox(const matrix4x4_t *matrix, const vec3_t mins, const vec3_t maxs); -void Collision_TraceBrushBModel(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, model_t *model); -void Collision_TraceBrushBModelTransform(trace_t *trace, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, model_t *model, const matrix4x4_t *modelmatrixstart, const matrix4x4_t *modelmatrixend); +void Collision_BoundingBoxOfBrushTraceSegment(const colbrushf_t *start, const colbrushf_t *end, vec3_t mins, vec3_t maxs, float startfrac, float endfrac); -void Collision_PolygonClipTrace(trace_t *trace, const void *cent, model_t *cmodel, const vec3_t corigin, const vec3_t cangles, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end); +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); -colbrushf_t *Collision_BrushForBox(const matrix4x4_t *matrix, const vec3_t mins, const vec3_t maxs); +// this enables rather large debugging spew! +// settings: +// 0 = no spew +// 1 = spew trace calls if something odd is happening +// 2 = spew trace calls always +// 3 = spew detailed trace flow (bsp tree recursion info) +#define COLLISIONPARANOID 0 #endif