cvar_t collision_endposnudge = {0, "collision_endposnudge", "0", "workaround to fix trace_endpos sometimes being returned where it would be inside solid by making that collision hit (recommended: values like 1)"};
#endif
cvar_t collision_debug_tracelineasbox = {0, "collision_debug_tracelineasbox", "0", "workaround for any bugs in Collision_TraceLineBrushFloat by using Collision_TraceBrushBrushFloat"};
+cvar_t collision_cache = {0, "collision_cache", "1", "store results of collision traces for next frame to reuse if possible (optimization)"};
+
+mempool_t *collision_mempool;
void Collision_Init (void)
{
Cvar_RegisterVariable(&collision_endposnudge);
#endif
Cvar_RegisterVariable(&collision_debug_tracelineasbox);
+ Cvar_RegisterVariable(&collision_cache);
+ collision_mempool = Mem_AllocPool("collision cache", 0, NULL);
+ Collision_Cache_Init(collision_mempool);
}
-void Collision_PrintBrushAsQHull(colbrushf_t *brush, const char *name)
+static void Collision_PrintBrushAsQHull(colbrushf_t *brush, const char *name)
{
int i;
Con_Printf("3 %s\n%i\n", name, brush->numpoints);
Con_Printf("%f %f %f %f\n", brush->planes[i].normal[0], brush->planes[i].normal[1], brush->planes[i].normal[2], brush->planes[i].dist);
}
-void Collision_ValidateBrush(colbrushf_t *brush)
+static void Collision_ValidateBrush(colbrushf_t *brush)
{
int j, k, pointsoffplanes, pointonplanes, pointswithinsufficientplanes, printbrush;
float d;
Collision_PrintBrushAsQHull(brush, "unnamed");
}
-float nearestplanedist_float(const float *normal, const colpointf_t *points, int numpoints)
+static float nearestplanedist_float(const float *normal, const colpointf_t *points, int numpoints)
{
float dist, bestdist;
if (!numpoints)
return bestdist;
}
-float furthestplanedist_float(const float *normal, const colpointf_t *points, int numpoints)
+static float furthestplanedist_float(const float *normal, const colpointf_t *points, int numpoints)
{
float dist, bestdist;
if (!numpoints)
return bestdist;
}
-void Collision_CalcEdgeDirsForPolygonBrushFloat(colbrushf_t *brush)
+static void Collision_CalcEdgeDirsForPolygonBrushFloat(colbrushf_t *brush)
{
int i, j;
for (i = 0, j = brush->numpoints - 1;i < brush->numpoints;j = i, i++)
}
}
-void Collision_SnapCopyPoints(int numpoints, const colpointf_t *in, colpointf_t *out, float fractionprecision, float invfractionprecision)
+static void Collision_SnapCopyPoints(int numpoints, const colpointf_t *in, colpointf_t *out, float fractionprecision, float invfractionprecision)
{
int i;
for (i = 0;i < numpoints;i++)
//Collision_ValidateBrush(&boxbrush->brush);
}
-void Collision_ClipTrace_BrushBox(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 supercontents, int q3surfaceflags, texture_t *texture)
-{
- colboxbrushf_t boxbrush, thisbrush_start, thisbrush_end;
- vec3_t startmins, startmaxs, endmins, endmaxs;
-
- // create brushes for the collision
- VectorAdd(start, mins, startmins);
- VectorAdd(start, maxs, startmaxs);
- VectorAdd(end, mins, endmins);
- VectorAdd(end, maxs, endmaxs);
- Collision_BrushForBox(&boxbrush, cmins, cmaxs, supercontents, q3surfaceflags, texture);
- Collision_BrushForBox(&thisbrush_start, startmins, startmaxs, 0, 0, NULL);
- Collision_BrushForBox(&thisbrush_end, endmins, endmaxs, 0, 0, NULL);
-
- memset(trace, 0, sizeof(trace_t));
- trace->hitsupercontentsmask = hitsupercontentsmask;
- trace->fraction = 1;
- trace->realfraction = 1;
- trace->allsolid = true;
- Collision_TraceBrushBrushFloat(trace, &thisbrush_start.brush, &thisbrush_end.brush, &boxbrush.brush, &boxbrush.brush);
-}
-
//pseudocode for detecting line/sphere overlap without calculating an impact point
//linesphereorigin = sphereorigin - linestart;linediff = lineend - linestart;linespherefrac = DotProduct(linesphereorigin, linediff) / DotProduct(linediff, linediff);return VectorLength2(linesphereorigin - bound(0, linespherefrac, 1) * linediff) >= sphereradius*sphereradius;
// all the results are correct (impactpoint, impactnormal, and fraction)
float Collision_ClipTrace_Line_Sphere(double *linestart, double *lineend, double *sphereorigin, double sphereradius, double *impactpoint, double *impactnormal)
{
- double dir[3], scale, v[3], deviationdist, impactdist, linelength;
+ double dir[3], scale, v[3], deviationdist2, impactdist, linelength;
// make sure the impactpoint and impactnormal are valid even if there is
// no collision
VectorCopy(lineend, impactpoint);
// of the line from the sphereorigin (deviation, how off-center it is)
VectorMA(linestart, impactdist, dir, v);
VectorSubtract(v, sphereorigin, v);
- deviationdist = VectorLength2(v);
- // if outside the radius, it's a miss for sure
- // (we do this comparison using squared radius to avoid a sqrt)
- if (deviationdist > sphereradius*sphereradius)
+ deviationdist2 = sphereradius * sphereradius - VectorLength2(v);
+ // if squared offset length is outside the squared sphere radius, miss
+ if (deviationdist2 < 0)
return 1; // miss (off to the side)
// nudge back to find the correct impact distance
- impactdist -= sphereradius - deviationdist/sphereradius;
+ impactdist -= sqrt(deviationdist2);
if (impactdist >= linelength)
return 1; // miss (not close enough)
if (impactdist < 0)
#endif
}
-typedef struct colbspnode_s
-{
- mplane_t plane;
- struct colbspnode_s *children[2];
- // the node is reallocated or split if max is reached
- int numcolbrushf;
- int maxcolbrushf;
- colbrushf_t **colbrushflist;
- //int numcolbrushd;
- //int maxcolbrushd;
- //colbrushd_t **colbrushdlist;
-}
-colbspnode_t;
-
-typedef struct colbsp_s
-{
- mempool_t *mempool;
- colbspnode_t *nodes;
-}
-colbsp_t;
-
-colbsp_t *Collision_CreateCollisionBSP(mempool_t *mempool)
-{
- colbsp_t *bsp;
- bsp = (colbsp_t *)Mem_Alloc(mempool, sizeof(colbsp_t));
- bsp->mempool = mempool;
- bsp->nodes = (colbspnode_t *)Mem_Alloc(bsp->mempool, sizeof(colbspnode_t));
- return bsp;
-}
-
-void Collision_FreeCollisionBSPNode(colbspnode_t *node)
-{
- if (node->children[0])
- Collision_FreeCollisionBSPNode(node->children[0]);
- if (node->children[1])
- Collision_FreeCollisionBSPNode(node->children[1]);
- while (--node->numcolbrushf)
- Mem_Free(node->colbrushflist[node->numcolbrushf]);
- //while (--node->numcolbrushd)
- // Mem_Free(node->colbrushdlist[node->numcolbrushd]);
- Mem_Free(node);
-}
-
-void Collision_FreeCollisionBSP(colbsp_t *bsp)
-{
- Collision_FreeCollisionBSPNode(bsp->nodes);
- Mem_Free(bsp);
-}
-
void Collision_BoundingBoxOfBrushTraceSegment(const colbrushf_t *start, const colbrushf_t *end, vec3_t mins, vec3_t maxs, float startfrac, float endfrac)
{
int i;
//===========================================
+static void Collision_TranslateBrush(const vec3_t shift, colbrushf_t *brush)
+{
+ int i;
+ // now we can transform the data
+ for(i = 0; i < brush->numplanes; ++i)
+ {
+ brush->planes[i].dist += DotProduct(shift, brush->planes[i].normal);
+ }
+ for(i = 0; i < brush->numpoints; ++i)
+ {
+ VectorAdd(brush->points[i].v, shift, brush->points[i].v);
+ }
+ VectorAdd(brush->mins, shift, brush->mins);
+ VectorAdd(brush->maxs, shift, brush->maxs);
+}
+
+static void Collision_TransformBrush(const matrix4x4_t *matrix, colbrushf_t *brush)
+{
+ int i;
+ vec3_t v;
+ // we're breaking any AABB properties here...
+ brush->isaabb = false;
+ brush->hasaabbplanes = false;
+ // now we can transform the data
+ for(i = 0; i < brush->numplanes; ++i)
+ {
+ Matrix4x4_TransformPositivePlane(matrix, brush->planes[i].normal[0], brush->planes[i].normal[1], brush->planes[i].normal[2], brush->planes[i].dist, brush->planes[i].normal);
+ }
+ for(i = 0; i < brush->numedgedirs; ++i)
+ {
+ Matrix4x4_Transform(matrix, brush->edgedirs[i].v, v);
+ VectorCopy(v, brush->edgedirs[i].v);
+ }
+ for(i = 0; i < brush->numpoints; ++i)
+ {
+ Matrix4x4_Transform(matrix, brush->points[i].v, v);
+ VectorCopy(v, brush->points[i].v);
+ }
+ VectorCopy(brush->points[0].v, brush->mins);
+ VectorCopy(brush->points[0].v, brush->maxs);
+ for(i = 1; i < brush->numpoints; ++i)
+ {
+ if(brush->points[i].v[0] < brush->mins[0]) brush->mins[0] = brush->points[i].v[0];
+ if(brush->points[i].v[1] < brush->mins[1]) brush->mins[1] = brush->points[i].v[1];
+ if(brush->points[i].v[2] < brush->mins[2]) brush->mins[2] = brush->points[i].v[2];
+ if(brush->points[i].v[0] > brush->maxs[0]) brush->maxs[0] = brush->points[i].v[0];
+ if(brush->points[i].v[1] > brush->maxs[1]) brush->maxs[1] = brush->points[i].v[1];
+ if(brush->points[i].v[2] > brush->maxs[2]) brush->maxs[2] = brush->points[i].v[2];
+ }
+}
+
+typedef struct collision_cachedtrace_parameters_s
+{
+ dp_model_t *model;
+ vec3_t end;
+ vec3_t start;
+ int hitsupercontentsmask;
+ matrix4x4_t matrix;
+}
+collision_cachedtrace_parameters_t;
+
+typedef struct collision_cachedtrace_s
+{
+ qboolean valid;
+ collision_cachedtrace_parameters_t p;
+ trace_t result;
+}
+collision_cachedtrace_t;
+
+static mempool_t *collision_cachedtrace_mempool;
+static collision_cachedtrace_t *collision_cachedtrace_array;
+static int collision_cachedtrace_firstfree;
+static int collision_cachedtrace_lastused;
+static int collision_cachedtrace_max;
+static int collision_cachedtrace_sequence;
+static int collision_cachedtrace_hashsize;
+static int *collision_cachedtrace_hash;
+static unsigned int *collision_cachedtrace_arrayfullhashindex;
+static unsigned int *collision_cachedtrace_arrayhashindex;
+static unsigned int *collision_cachedtrace_arraynext;
+static unsigned char *collision_cachedtrace_arrayused;
+static qboolean collision_cachedtrace_rebuildhash;
+
+void Collision_Cache_Reset(qboolean resetlimits)
+{
+ if (collision_cachedtrace_hash)
+ Mem_Free(collision_cachedtrace_hash);
+ if (collision_cachedtrace_array)
+ Mem_Free(collision_cachedtrace_array);
+ if (collision_cachedtrace_arrayfullhashindex)
+ Mem_Free(collision_cachedtrace_arrayfullhashindex);
+ if (collision_cachedtrace_arrayhashindex)
+ Mem_Free(collision_cachedtrace_arrayhashindex);
+ if (collision_cachedtrace_arraynext)
+ Mem_Free(collision_cachedtrace_arraynext);
+ if (collision_cachedtrace_arrayused)
+ Mem_Free(collision_cachedtrace_arrayused);
+ if (resetlimits || !collision_cachedtrace_max)
+ collision_cachedtrace_max = collision_cache.integer ? 128 : 1;
+ collision_cachedtrace_firstfree = 1;
+ collision_cachedtrace_lastused = 0;
+ collision_cachedtrace_hashsize = collision_cachedtrace_max;
+ collision_cachedtrace_array = (collision_cachedtrace_t *)Mem_Alloc(collision_cachedtrace_mempool, collision_cachedtrace_max * sizeof(collision_cachedtrace_t));
+ collision_cachedtrace_hash = (int *)Mem_Alloc(collision_cachedtrace_mempool, collision_cachedtrace_hashsize * sizeof(int));
+ collision_cachedtrace_arrayfullhashindex = (unsigned int *)Mem_Alloc(collision_cachedtrace_mempool, collision_cachedtrace_max * sizeof(unsigned int));
+ collision_cachedtrace_arrayhashindex = (unsigned int *)Mem_Alloc(collision_cachedtrace_mempool, collision_cachedtrace_max * sizeof(unsigned int));
+ collision_cachedtrace_arraynext = (unsigned int *)Mem_Alloc(collision_cachedtrace_mempool, collision_cachedtrace_max * sizeof(unsigned int));
+ collision_cachedtrace_arrayused = (unsigned char *)Mem_Alloc(collision_cachedtrace_mempool, collision_cachedtrace_max * sizeof(unsigned char));
+ collision_cachedtrace_sequence = 1;
+ collision_cachedtrace_rebuildhash = false;
+}
+
+void Collision_Cache_Init(mempool_t *mempool)
+{
+ collision_cachedtrace_mempool = mempool;
+ Collision_Cache_Reset(true);
+}
+
+static void Collision_Cache_RebuildHash(void)
+{
+ int index;
+ int range = collision_cachedtrace_lastused + 1;
+ int sequence = collision_cachedtrace_sequence;
+ int firstfree = collision_cachedtrace_max;
+ int lastused = 0;
+ int *hash = collision_cachedtrace_hash;
+ unsigned int hashindex;
+ unsigned int *arrayhashindex = collision_cachedtrace_arrayhashindex;
+ unsigned int *arraynext = collision_cachedtrace_arraynext;
+ collision_cachedtrace_rebuildhash = false;
+ memset(collision_cachedtrace_hash, 0, collision_cachedtrace_hashsize * sizeof(int));
+ for (index = 1;index < range;index++)
+ {
+ if (collision_cachedtrace_arrayused[index] == sequence)
+ {
+ hashindex = arrayhashindex[index];
+ arraynext[index] = hash[hashindex];
+ hash[hashindex] = index;
+ lastused = index;
+ }
+ else
+ {
+ if (firstfree > index)
+ firstfree = index;
+ collision_cachedtrace_arrayused[index] = 0;
+ }
+ }
+ collision_cachedtrace_firstfree = firstfree;
+ collision_cachedtrace_lastused = lastused;
+}
+
+void Collision_Cache_NewFrame(void)
+{
+ if (collision_cache.integer)
+ {
+ if (collision_cachedtrace_max < 128)
+ Collision_Cache_Reset(true);
+ }
+ else
+ {
+ if (collision_cachedtrace_max > 1)
+ Collision_Cache_Reset(true);
+ }
+ // rebuild hash if sequence would overflow byte, otherwise increment
+ if (collision_cachedtrace_sequence == 255)
+ {
+ Collision_Cache_RebuildHash();
+ collision_cachedtrace_sequence = 1;
+ }
+ else
+ {
+ collision_cachedtrace_rebuildhash = true;
+ collision_cachedtrace_sequence++;
+ }
+}
+
+static unsigned int Collision_Cache_HashIndexForArray(unsigned int *array, unsigned int size)
+{
+ unsigned int i;
+ unsigned int hashindex = 0;
+ // this is a super-cheesy checksum, designed only for speed
+ for (i = 0;i < size;i++)
+ hashindex += array[i] * (1 + i);
+ return hashindex;
+}
+
+static collision_cachedtrace_t *Collision_Cache_Lookup(dp_model_t *model, const matrix4x4_t *matrix, const matrix4x4_t *inversematrix, const vec3_t start, const vec3_t end, int hitsupercontentsmask)
+{
+ int hashindex = 0;
+ unsigned int fullhashindex;
+ int index = 0;
+ int range;
+ int sequence = collision_cachedtrace_sequence;
+ int *hash = collision_cachedtrace_hash;
+ unsigned int *arrayfullhashindex = collision_cachedtrace_arrayfullhashindex;
+ unsigned int *arraynext = collision_cachedtrace_arraynext;
+ collision_cachedtrace_t *cached = collision_cachedtrace_array + index;
+ collision_cachedtrace_parameters_t params;
+ // all non-cached traces use the same index
+ if (!collision_cache.integer)
+ r_refdef.stats.collisioncache_traced++;
+ else
+ {
+ // cached trace lookup
+ memset(¶ms, 0, sizeof(params));
+ params.model = model;
+ VectorCopy(start, params.start);
+ VectorCopy(end, params.end);
+ params.hitsupercontentsmask = hitsupercontentsmask;
+ params.matrix = *matrix;
+ fullhashindex = Collision_Cache_HashIndexForArray((unsigned int *)¶ms, sizeof(params) / sizeof(unsigned int));
+ hashindex = (int)(fullhashindex % (unsigned int)collision_cachedtrace_hashsize);
+ for (index = hash[hashindex];index;index = arraynext[index])
+ {
+ if (arrayfullhashindex[index] != fullhashindex)
+ continue;
+ cached = collision_cachedtrace_array + index;
+ //if (memcmp(&cached->p, ¶ms, sizeof(params)))
+ if (cached->p.model != params.model
+ || cached->p.end[0] != params.end[0]
+ || cached->p.end[1] != params.end[1]
+ || cached->p.end[2] != params.end[2]
+ || cached->p.start[0] != params.start[0]
+ || cached->p.start[1] != params.start[1]
+ || cached->p.start[2] != params.start[2]
+ || cached->p.hitsupercontentsmask != params.hitsupercontentsmask
+ || cached->p.matrix.m[0][0] != params.matrix.m[0][0]
+ || cached->p.matrix.m[0][1] != params.matrix.m[0][1]
+ || cached->p.matrix.m[0][2] != params.matrix.m[0][2]
+ || cached->p.matrix.m[0][3] != params.matrix.m[0][3]
+ || cached->p.matrix.m[1][0] != params.matrix.m[1][0]
+ || cached->p.matrix.m[1][1] != params.matrix.m[1][1]
+ || cached->p.matrix.m[1][2] != params.matrix.m[1][2]
+ || cached->p.matrix.m[1][3] != params.matrix.m[1][3]
+ || cached->p.matrix.m[2][0] != params.matrix.m[2][0]
+ || cached->p.matrix.m[2][1] != params.matrix.m[2][1]
+ || cached->p.matrix.m[2][2] != params.matrix.m[2][2]
+ || cached->p.matrix.m[2][3] != params.matrix.m[2][3]
+ || cached->p.matrix.m[3][0] != params.matrix.m[3][0]
+ || cached->p.matrix.m[3][1] != params.matrix.m[3][1]
+ || cached->p.matrix.m[3][2] != params.matrix.m[3][2]
+ || cached->p.matrix.m[3][3] != params.matrix.m[3][3]
+ )
+ continue;
+ // found a matching trace in the cache
+ r_refdef.stats.collisioncache_cached++;
+ cached->valid = true;
+ collision_cachedtrace_arrayused[index] = collision_cachedtrace_sequence;
+ return cached;
+ }
+ r_refdef.stats.collisioncache_traced++;
+ // find an unused cache entry
+ for (index = collision_cachedtrace_firstfree, range = collision_cachedtrace_max;index < range;index++)
+ if (collision_cachedtrace_arrayused[index] == 0)
+ break;
+ if (index == range)
+ {
+ // all claimed, but probably some are stale...
+ for (index = 1, range = collision_cachedtrace_max;index < range;index++)
+ if (collision_cachedtrace_arrayused[index] != sequence)
+ break;
+ if (index < range)
+ {
+ // found a stale one, rebuild the hash
+ Collision_Cache_RebuildHash();
+ }
+ else
+ {
+ // we need to grow the cache
+ collision_cachedtrace_max *= 2;
+ Collision_Cache_Reset(false);
+ index = 1;
+ }
+ }
+ // link the new cache entry into the hash bucket
+ collision_cachedtrace_firstfree = index + 1;
+ if (collision_cachedtrace_lastused < index)
+ collision_cachedtrace_lastused = index;
+ cached = collision_cachedtrace_array + index;
+ collision_cachedtrace_arraynext[index] = collision_cachedtrace_hash[hashindex];
+ collision_cachedtrace_hash[hashindex] = index;
+ collision_cachedtrace_arrayhashindex[index] = hashindex;
+ cached->valid = false;
+ cached->p = params;
+ collision_cachedtrace_arrayfullhashindex[index] = fullhashindex;
+ collision_cachedtrace_arrayused[index] = collision_cachedtrace_sequence;
+ }
+ return cached;
+}
+
+void Collision_Cache_ClipLineToGenericEntitySurfaces(trace_t *trace, dp_model_t *model, matrix4x4_t *matrix, matrix4x4_t *inversematrix, const vec3_t start, const vec3_t end, int hitsupercontentsmask)
+{
+ collision_cachedtrace_t *cached = Collision_Cache_Lookup(model, matrix, inversematrix, start, end, hitsupercontentsmask);
+ if (cached->valid)
+ {
+ *trace = cached->result;
+ return;
+ }
+
+ Collision_ClipLineToGenericEntity(trace, model, NULL, NULL, vec3_origin, vec3_origin, 0, matrix, inversematrix, start, end, hitsupercontentsmask, true);
+
+ cached->result = *trace;
+}
+
+void Collision_Cache_ClipLineToWorldSurfaces(trace_t *trace, dp_model_t *model, const vec3_t start, const vec3_t end, int hitsupercontents)
+{
+ collision_cachedtrace_t *cached = Collision_Cache_Lookup(model, &identitymatrix, &identitymatrix, start, end, hitsupercontents);
+ if (cached->valid)
+ {
+ *trace = cached->result;
+ return;
+ }
+
+ Collision_ClipLineToWorld(trace, model, start, end, hitsupercontents, true);
+
+ cached->result = *trace;
+}
+
void Collision_ClipToGenericEntity(trace_t *trace, dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, 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 starttransformed[3], endtransformed[3];
#endif
if (model && model->TraceBox)
- model->TraceBox(model, frameblend, skeleton, trace, starttransformed, mins, maxs, endtransformed, hitsupercontentsmask);
- else
+ {
+ if(model->TraceBrush && (inversematrix->m[0][1] || inversematrix->m[0][2] || inversematrix->m[1][0] || inversematrix->m[1][2] || inversematrix->m[2][0] || inversematrix->m[2][1]))
+ {
+ // we get here if TraceBrush exists, AND we have a rotation component (SOLID_BSP case)
+ // using starttransformed, endtransformed is WRONG in this case!
+ // should rather build a brush and trace using it
+ colboxbrushf_t thisbrush_start, thisbrush_end;
+ Collision_BrushForBox(&thisbrush_start, mins, maxs, 0, 0, NULL);
+ Collision_BrushForBox(&thisbrush_end, mins, maxs, 0, 0, NULL);
+ Collision_TranslateBrush(start, &thisbrush_start.brush);
+ Collision_TranslateBrush(end, &thisbrush_end.brush);
+ Collision_TransformBrush(inversematrix, &thisbrush_start.brush);
+ Collision_TransformBrush(inversematrix, &thisbrush_end.brush);
+ //Collision_TranslateBrush(starttransformed, &thisbrush_start.brush);
+ //Collision_TranslateBrush(endtransformed, &thisbrush_end.brush);
+ model->TraceBrush(model, frameblend, skeleton, trace, &thisbrush_start.brush, &thisbrush_end.brush, hitsupercontentsmask);
+ }
+ else // this is only approximate if rotated, quite useless
+ model->TraceBox(model, frameblend, skeleton, trace, starttransformed, mins, maxs, endtransformed, hitsupercontentsmask);
+ }
+ else // and this requires that the transformation matrix doesn't have angles components, like SV_TraceBox ensures; FIXME may get called if a model is SOLID_BSP but has no TraceBox function
Collision_ClipTrace_Box(trace, bodymins, bodymaxs, starttransformed, mins, maxs, endtransformed, hitsupercontentsmask, bodysupercontents, 0, NULL);
trace->fraction = bound(0, trace->fraction, 1);
trace->realfraction = bound(0, trace->realfraction, 1);
{
memset(trace, 0, sizeof(*trace));
trace->fraction = trace->realfraction = 1;
+ // ->TraceBox: TraceBrush not needed here, as worldmodel is never rotated
if (model && model->TraceBox)
model->TraceBox(model, NULL, NULL, trace, start, mins, maxs, end, hitsupercontents);
trace->fraction = bound(0, trace->fraction, 1);
VectorLerp(start, trace->fraction, end, trace->endpos);
}
-void Collision_ClipLineToGenericEntity(trace_t *trace, dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, const vec3_t bodymins, const vec3_t bodymaxs, int bodysupercontents, matrix4x4_t *matrix, matrix4x4_t *inversematrix, const vec3_t start, const vec3_t end, int hitsupercontentsmask)
+void Collision_ClipLineToGenericEntity(trace_t *trace, dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, const vec3_t bodymins, const vec3_t bodymaxs, int bodysupercontents, matrix4x4_t *matrix, matrix4x4_t *inversematrix, const vec3_t start, const vec3_t end, int hitsupercontentsmask, qboolean hitsurfaces)
{
float starttransformed[3], endtransformed[3];
-
memset(trace, 0, sizeof(*trace));
trace->fraction = trace->realfraction = 1;
Con_Printf("trans(%f %f %f -> %f %f %f, %f %f %f -> %f %f %f)", start[0], start[1], start[2], starttransformed[0], starttransformed[1], starttransformed[2], end[0], end[1], end[2], endtransformed[0], endtransformed[1], endtransformed[2]);
#endif
- if (model && model->TraceLine)
+ if (model && model->TraceLineAgainstSurfaces && hitsurfaces)
+ model->TraceLineAgainstSurfaces(model, frameblend, skeleton, trace, starttransformed, endtransformed, hitsupercontentsmask);
+ else if (model && model->TraceLine)
model->TraceLine(model, frameblend, skeleton, trace, starttransformed, endtransformed, hitsupercontentsmask);
else
Collision_ClipTrace_Box(trace, bodymins, bodymaxs, starttransformed, vec3_origin, vec3_origin, endtransformed, hitsupercontentsmask, bodysupercontents, 0, NULL);
Matrix4x4_TransformPositivePlane(matrix, trace->plane.normal[0], trace->plane.normal[1], trace->plane.normal[2], trace->plane.dist, trace->plane.normal);
}
-void Collision_ClipLineToWorld(trace_t *trace, dp_model_t *model, const vec3_t start, const vec3_t end, int hitsupercontents)
+void Collision_ClipLineToWorld(trace_t *trace, dp_model_t *model, const vec3_t start, const vec3_t end, int hitsupercontents, qboolean hitsurfaces)
{
memset(trace, 0, sizeof(*trace));
trace->fraction = trace->realfraction = 1;
- if (model && model->TraceLine)
+ if (model && model->TraceLineAgainstSurfaces && hitsurfaces)
+ model->TraceLineAgainstSurfaces(model, NULL, NULL, trace, start, end, hitsupercontents);
+ else if (model && model->TraceLine)
model->TraceLine(model, NULL, NULL, trace, start, end, hitsupercontents);
trace->fraction = bound(0, trace->fraction, 1);
trace->realfraction = bound(0, trace->realfraction, 1);
void Collision_ClipPointToGenericEntity(trace_t *trace, dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, const vec3_t bodymins, const vec3_t bodymaxs, int bodysupercontents, matrix4x4_t *matrix, matrix4x4_t *inversematrix, const vec3_t start, int hitsupercontentsmask)
{
float starttransformed[3];
-
memset(trace, 0, sizeof(*trace));
trace->fraction = trace->realfraction = 1;
projects / xonotic / darkplaces.git / blobdiff