#define COLLISION_PLANE_DIST_EPSILON (2.0f / COLLISION_SNAPSCALE)
cvar_t collision_impactnudge = {0, "collision_impactnudge", "0.03125", "how much to back off from the impact"};
-cvar_t collision_startnudge = {0, "collision_startnudge", "0", "how much to bias collision trace start"};
-cvar_t collision_endnudge = {0, "collision_endnudge", "0", "how much to bias collision trace end"};
-cvar_t collision_enternudge = {0, "collision_enternudge", "0", "how much to bias collision entry fraction"};
-cvar_t collision_leavenudge = {0, "collision_leavenudge", "0", "how much to bias collision exit fraction"};
-cvar_t collision_extendmovelength = {0, "collision_extendmovelength", "16", "internal bias on trace length to ensure detection of collisions within the collision_impactnudge/collision_enternudge/collision_leavenudge distance so that short moves do not degrade across frames (this does not alter the final trace length)"};
-cvar_t collision_extendtraceboxlength = {0, "collision_extendtraceboxlength", "1", "internal bias for tracebox() qc builtin to account for collision_impactnudge/collision_enternudge/collision_leavenudge (this does not alter the final trace length)"};
-cvar_t collision_extendtracelinelength = {0, "collision_extendtracelinelength", "1", "internal bias for traceline() qc builtin to account for collision_impactnudge/collision_enternudge/collision_leavenudge (this does not alter the final trace length)"};
+cvar_t collision_extendmovelength = {0, "collision_extendmovelength", "16", "internal bias on trace length to ensure detection of collisions within the collision_impactnudge distance so that short moves do not degrade across frames (this does not alter the final trace length)"};
+cvar_t collision_extendtraceboxlength = {0, "collision_extendtraceboxlength", "1", "internal bias for tracebox() qc builtin to account for collision_impactnudge (this does not alter the final trace length)"};
+cvar_t collision_extendtracelinelength = {0, "collision_extendtracelinelength", "1", "internal bias for traceline() qc builtin to account for collision_impactnudge (this does not alter the final trace length)"};
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)"};
//cvar_t collision_triangle_neighborsides = {0, "collision_triangle_neighborsides", "1", "override automatic side generation if triangle has neighbors with face planes that form a convex edge (perfect solution, but can not work for all edges)"};
void Collision_Init (void)
{
Cvar_RegisterVariable(&collision_impactnudge);
- Cvar_RegisterVariable(&collision_startnudge);
- Cvar_RegisterVariable(&collision_endnudge);
- Cvar_RegisterVariable(&collision_enternudge);
- Cvar_RegisterVariable(&collision_leavenudge);
Cvar_RegisterVariable(&collision_extendmovelength);
Cvar_RegisterVariable(&collision_extendtracelinelength);
Cvar_RegisterVariable(&collision_extendtraceboxlength);
}
startplane[3] = furthestplanedist_float(startplane, other_start->points, othernumpoints);
endplane[3] = furthestplanedist_float(startplane, other_end->points, othernumpoints);
- startdist = nearestplanedist_float(startplane, trace_start->points, tracenumpoints) - startplane[3] - collision_startnudge.value;
- enddist = nearestplanedist_float(endplane, trace_end->points, tracenumpoints) - endplane[3] - collision_endnudge.value;
+ startdist = nearestplanedist_float(startplane, trace_start->points, tracenumpoints) - startplane[3];
+ enddist = nearestplanedist_float(endplane, trace_end->points, tracenumpoints) - endplane[3];
//Con_Printf("%c%i: startdist = %f, enddist = %f, startdist / (startdist - enddist) = %f\n", nplane2 != nplane ? 'b' : 'a', nplane2, startdist, enddist, startdist / (startdist - enddist));
// aside from collisions, this is also used for error correction
- if (startdist <= collision_impactnudge.value && nplane < numplanes1 && (startdepth < startdist || startdepth == 1))
+ if (startdist <= 0.0f && nplane < numplanes1 && (startdepth < startdist || startdepth == 1))
{
startdepth = startdist;
VectorCopy(startplane, startdepthnormal);
if (startdist > enddist)
{
// moving into brush
- if (enddist >= collision_enternudge.value)
+ if (enddist > 0.0f)
return;
if (startdist >= 0)
{
// enter
imove = 1 / (startdist - enddist);
- f = (startdist - collision_enternudge.value) * imove;
- if (f < 0)
- f = 0;
+ f = startdist * imove;
// check if this will reduce the collision time range
if (enterfrac < f)
{
if (enddist > 0)
{
// leave
- f = (startdist + collision_leavenudge.value) / (startdist - enddist);
- if (f > 1)
- f = 1;
+ f = startdist / (startdist - enddist);
// check if this will reduce the collision time range
if (leavefrac > f)
{
startplane[3] = other_start->planes[nplane].dist;
VectorCopy(other_end->planes[nplane].normal, endplane);
endplane[3] = other_end->planes[nplane].dist;
- startdist = DotProduct(linestart, startplane) - startplane[3] - collision_startnudge.value;
- enddist = DotProduct(lineend, endplane) - endplane[3] - collision_endnudge.value;
+ startdist = DotProduct(linestart, startplane) - startplane[3];
+ enddist = DotProduct(lineend, endplane) - endplane[3];
//Con_Printf("%c%i: startdist = %f, enddist = %f, startdist / (startdist - enddist) = %f\n", nplane2 != nplane ? 'b' : 'a', nplane2, startdist, enddist, startdist / (startdist - enddist));
// aside from collisions, this is also used for error correction
- if (startdist < collision_impactnudge.value && (startdepth < startdist || startdepth == 1))
+ if (startdist <= 0.0f && (startdepth < startdist || startdepth == 1))
{
startdepth = startdist;
VectorCopy(startplane, startdepthnormal);
if (startdist > enddist)
{
// moving into brush
- if (enddist >= collision_enternudge.value)
+ if (enddist > 0.0f)
return;
if (startdist > 0)
{
// enter
imove = 1 / (startdist - enddist);
- f = (startdist - collision_enternudge.value) * imove;
- if (f < 0)
- f = 0;
+ f = startdist * imove;
// check if this will reduce the collision time range
if (enterfrac < f)
{
if (enddist > 0)
{
// leave
- f = (startdist + collision_leavenudge.value) / (startdist - enddist);
- if (f > 1)
- f = 1;
+ f = startdist / (startdist - enddist);
// check if this will reduce the collision time range
if (leavefrac > f)
{
// 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);
+ 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_and_dist);
}
for(i = 0; i < brush->numedgedirs; ++i)
{
static int collision_cachedtrace_firstfree;
static int collision_cachedtrace_lastused;
static int collision_cachedtrace_max;
-static int collision_cachedtrace_sequence;
+static unsigned char collision_cachedtrace_sequence;
static int collision_cachedtrace_hashsize;
static int *collision_cachedtrace_hash;
static unsigned int *collision_cachedtrace_arrayfullhashindex;
{
int index;
int range = collision_cachedtrace_lastused + 1;
- int sequence = collision_cachedtrace_sequence;
+ unsigned char sequence = collision_cachedtrace_sequence;
int firstfree = collision_cachedtrace_max;
int lastused = 0;
int *hash = collision_cachedtrace_hash;
unsigned int fullhashindex;
int index = 0;
int range;
- int sequence = collision_cachedtrace_sequence;
+ unsigned char sequence = collision_cachedtrace_sequence;
int *hash = collision_cachedtrace_hash;
unsigned int *arrayfullhashindex = collision_cachedtrace_arrayfullhashindex;
unsigned int *arraynext = collision_cachedtrace_arraynext;
// transform plane
// NOTE: this relies on plane.dist being directly after plane.normal
- Matrix4x4_TransformPositivePlane(matrix, trace->plane.normal[0], trace->plane.normal[1], trace->plane.normal[2], trace->plane.dist, trace->plane.normal);
+ Matrix4x4_TransformPositivePlane(matrix, trace->plane.normal[0], trace->plane.normal[1], trace->plane.normal[2], trace->plane.dist, trace->plane.normal_and_dist);
}
void Collision_ClipToWorld(trace_t *trace, dp_model_t *model, const vec3_t tstart, const vec3_t mins, const vec3_t maxs, const vec3_t tend, int hitsupercontents, float extend)
// transform plane
// NOTE: this relies on plane.dist being directly after plane.normal
- Matrix4x4_TransformPositivePlane(matrix, trace->plane.normal[0], trace->plane.normal[1], trace->plane.normal[2], trace->plane.dist, trace->plane.normal);
+ Matrix4x4_TransformPositivePlane(matrix, trace->plane.normal[0], trace->plane.normal[1], trace->plane.normal[2], trace->plane.dist, trace->plane.normal_and_dist);
}
void Collision_ClipLineToWorld(trace_t *trace, dp_model_t *model, const vec3_t tstart, const vec3_t tend, int hitsupercontents, float extend, qboolean hitsurfaces)
VectorCopy(start, trace->endpos);
// transform plane
// NOTE: this relies on plane.dist being directly after plane.normal
- Matrix4x4_TransformPositivePlane(matrix, trace->plane.normal[0], trace->plane.normal[1], trace->plane.normal[2], trace->plane.dist, trace->plane.normal);
+ Matrix4x4_TransformPositivePlane(matrix, trace->plane.normal[0], trace->plane.normal[1], trace->plane.normal[2], trace->plane.dist, trace->plane.normal_and_dist);
}
void Collision_ClipPointToWorld(trace_t *trace, dp_model_t *model, const vec3_t start, int hitsupercontents)