quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audit all uses of ClipWindingEpsilon and choose the strict variant or not, and explain why

Browse Source
This commit is contained in:
Rudolf Polzer 2011-11-23 09:44:05 +01:00
parent 323c01a983
commit 6b01d68ba6
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/quake3/q3map2/brush.c
View File

@ -1027,8 +1027,8 @@ void SplitBrush( brush_t *brush, int planenum, brush_t **front, brush_t **back )
w = s->winding; w = s->winding;
if (!w) if (!w)
continue; continue;
ClipWindingEpsilon (w, plane->normal, plane->dist, ClipWindingEpsilonStrict (w, plane->normal, plane->dist,
0 /*PLANESIDE_EPSILON*/, &cw[0], &cw[1]); 0 /*PLANESIDE_EPSILON*/, &cw[0], &cw[1]); /* strict, in parallel case we get the face back because it also is the midwinding */
for (j=0 ; j<2 ; j++) for (j=0 ; j<2 ; j++)
{ {
if (!cw[j]) if (!cw[j])

2
tools/quake3/q3map2/decals.c
View File

@ -594,7 +594,7 @@ static void ProjectDecalOntoWinding( decalProjector_t *dp, mapDrawSurface_t *ds,
for( i = 0; i < dp->numPlanes; i++ ) for( i = 0; i < dp->numPlanes; i++ )
{ {
/* chop winding by the plane */ /* chop winding by the plane */
ClipWindingEpsilon( w, dp->planes[ i ], dp->planes[ i ][ 3 ], 0.0625f, &front, &back ); ClipWindingEpsilonStrict( w, dp->planes[ i ], dp->planes[ i ][ 3 ], 0.0625f, &front, &back ); /* strict, if identical plane we don't want to keep it */
FreeWinding( w ); FreeWinding( w );
/* lose the front fragment */ /* lose the front fragment */

4
tools/quake3/q3map2/facebsp.c
View File

@ -295,8 +295,8 @@ void BuildFaceTree_r( node_t *node, face_t *list )
/* switch on side */ /* switch on side */
if( side == SIDE_CROSS ) if( side == SIDE_CROSS )
{ {
ClipWindingEpsilon( split->w, plane->normal, plane->dist, CLIP_EPSILON * 2, ClipWindingEpsilonStrict( split->w, plane->normal, plane->dist, CLIP_EPSILON * 2,
&frontWinding, &backWinding ); &frontWinding, &backWinding ); /* strict; if no winding is left, we have a "virtually identical" plane and don't want to split by it */
if( frontWinding ) { if( frontWinding ) {
newFace = AllocBspFace(); newFace = AllocBspFace();
newFace->w = frontWinding; newFace->w = frontWinding;

2
tools/quake3/q3map2/fog.c
View File

@ -408,7 +408,7 @@ qboolean ChopFaceSurfaceByBrush( entity_t *e, mapDrawSurface_t *ds, brush_t *b )
continue; continue;
/* general case */ /* general case */
ClipWindingEpsilon( w, plane->normal, plane->dist, ON_EPSILON, &front, &back ); ClipWindingEpsilonStrict( w, plane->normal, plane->dist, ON_EPSILON, &front, &back ); /* strict; if plane is "almost identical" to face, both ways to continue can be wrong, so we better not fog it */
FreeWinding( w ); FreeWinding( w );
if( back == NULL ) if( back == NULL )

2
tools/quake3/q3map2/portals.c
View File

@ -410,7 +410,7 @@ void SplitNodePortals (node_t *node)
// cut the portal into two portals, one on each side of the cut plane // cut the portal into two portals, one on each side of the cut plane
// //
ClipWindingEpsilon (p->winding, plane->normal, plane->dist, ClipWindingEpsilon (p->winding, plane->normal, plane->dist,
SPLIT_WINDING_EPSILON, &frontwinding, &backwinding); SPLIT_WINDING_EPSILON, &frontwinding, &backwinding); /* not strict, we want to always keep one of them even if coplanar */
if (frontwinding && WindingIsTiny(frontwinding)) if (frontwinding && WindingIsTiny(frontwinding))
{ {

14
tools/quake3/q3map2/surface.c
View File

@ -1356,7 +1356,7 @@ static void SubdivideFace_r( entity_t *e, brush_t *brush, side_t *side, winding_
if( (subCeil - subFloor) > subdivisions ) if( (subCeil - subFloor) > subdivisions )
{ {
/* clip the winding */ /* clip the winding */
ClipWindingEpsilon( w, planeNormal, d, epsilon, &frontWinding, &backWinding ); ClipWindingEpsilon( w, planeNormal, d, epsilon, &frontWinding, &backWinding ); /* not strict; we assume we always keep a winding */
/* the clip may not produce two polygons if it was epsilon close */ /* the clip may not produce two polygons if it was epsilon close */
if( frontWinding == NULL ) if( frontWinding == NULL )
@ -1498,8 +1498,14 @@ void ClipSideIntoTree_r( winding_t *w, side_t *side, node_t *node )
} }
plane = &mapplanes[ node->planenum ]; plane = &mapplanes[ node->planenum ];
ClipWindingEpsilon ( w, plane->normal, plane->dist, ClipWindingEpsilonStrict ( w, plane->normal, plane->dist,
ON_EPSILON, &front, &back ); ON_EPSILON, &front, &back ); /* strict, we handle the "winding disappeared" case */
if(!front && !back)
{
/* in doubt, register it in both nodes */
front = CopyWinding(w);
back = CopyWinding(w);
}
FreeWinding( w ); FreeWinding( w );
ClipSideIntoTree_r( front, side, node->children[0] ); ClipSideIntoTree_r( front, side, node->children[0] );
@ -2108,7 +2114,7 @@ int FilterWindingIntoTree_r( winding_t *w, mapDrawSurface_t *ds, node_t *node )
} }
/* clip the winding by this plane */ /* clip the winding by this plane */
ClipWindingEpsilonStrict( w, plane1, plane1[ 3 ], ON_EPSILON, &front, &back ); ClipWindingEpsilonStrict( w, plane1, plane1[ 3 ], ON_EPSILON, &front, &back ); /* strict; we handle the "winding disappeared" case */
/* filter by this plane */ /* filter by this plane */
refs = 0; refs = 0;