* Bug fix to collision optimisation (arQon)
This commit is contained in:
parent
5692e30fa9
commit
da8f451263
4 changed files with 44 additions and 3 deletions
|
@ -250,7 +250,7 @@ int CM_PointContents( const vec3_t p, clipHandle_t model ) {
|
|||
brushnum = cm.leafbrushes[leaf->firstLeafBrush+k];
|
||||
b = &cm.brushes[brushnum];
|
||||
|
||||
if ( !BoundsIntersectPoint( b->bounds[0], b->bounds[1], p ) ) {
|
||||
if ( !CM_BoundsIntersectPoint( b->bounds[0], b->bounds[1], p ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -480,3 +480,42 @@ int CM_WriteAreaBits (byte *buffer, int area)
|
|||
return bytes;
|
||||
}
|
||||
|
||||
/*
|
||||
====================
|
||||
CM_BoundsIntersect
|
||||
====================
|
||||
*/
|
||||
qboolean CM_BoundsIntersect( const vec3_t mins, const vec3_t maxs, const vec3_t mins2, const vec3_t maxs2 )
|
||||
{
|
||||
if (maxs[0] < mins2[0] - SURFACE_CLIP_EPSILON ||
|
||||
maxs[1] < mins2[1] - SURFACE_CLIP_EPSILON ||
|
||||
maxs[2] < mins2[2] - SURFACE_CLIP_EPSILON ||
|
||||
mins[0] > maxs2[0] + SURFACE_CLIP_EPSILON ||
|
||||
mins[1] > maxs2[1] + SURFACE_CLIP_EPSILON ||
|
||||
mins[2] > maxs2[2] + SURFACE_CLIP_EPSILON)
|
||||
{
|
||||
return qfalse;
|
||||
}
|
||||
|
||||
return qtrue;
|
||||
}
|
||||
|
||||
/*
|
||||
====================
|
||||
CM_BoundsIntersectPoint
|
||||
====================
|
||||
*/
|
||||
qboolean CM_BoundsIntersectPoint( const vec3_t mins, const vec3_t maxs, const vec3_t point )
|
||||
{
|
||||
if (maxs[0] < point[0] - SURFACE_CLIP_EPSILON ||
|
||||
maxs[1] < point[1] - SURFACE_CLIP_EPSILON ||
|
||||
maxs[2] < point[2] - SURFACE_CLIP_EPSILON ||
|
||||
mins[0] > point[0] + SURFACE_CLIP_EPSILON ||
|
||||
mins[1] > point[1] + SURFACE_CLIP_EPSILON ||
|
||||
mins[2] > point[2] + SURFACE_CLIP_EPSILON)
|
||||
{
|
||||
return qfalse;
|
||||
}
|
||||
|
||||
return qtrue;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue