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

fix two other bugs in the same function

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@200 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-02-25 15:49:25 +00:00
parent 05ec869106
commit 8b446e3fbe
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/quake3/q3map2/tjunction.c
View File

@ -516,7 +516,6 @@ int c_broken = 0;
qboolean FixBrokenSurface( mapDrawSurface_t *ds ) qboolean FixBrokenSurface( mapDrawSurface_t *ds )
{ {
qboolean valid = qtrue;
bspDrawVert_t *dv1, *dv2, avg; bspDrawVert_t *dv1, *dv2, avg;
int i, j, k; int i, j, k;
float dist; float dist;
@ -531,10 +530,6 @@ qboolean FixBrokenSurface( mapDrawSurface_t *ds )
/* check all verts */ /* check all verts */
for( i = 0; i < ds->numVerts; i++ ) for( i = 0; i < ds->numVerts; i++ )
{ {
/* don't remove points if winding is a triangle */
if( ds->numVerts == 3 )
return valid;
/* get verts */ /* get verts */
dv1 = &ds->verts[ i ]; dv1 = &ds->verts[ i ];
dv2 = &ds->verts[ (i + 1) % ds->numVerts ]; dv2 = &ds->verts[ (i + 1) % ds->numVerts ];
@ -544,7 +539,6 @@ qboolean FixBrokenSurface( mapDrawSurface_t *ds )
dist = VectorLength( avg.xyz ); dist = VectorLength( avg.xyz );
if( dist < DEGENERATE_EPSILON ) if( dist < DEGENERATE_EPSILON )
{ {
//valid = qfalse; // no, valid = qfalse is only done if less than 3 verts are left
Sys_FPrintf( SYS_VRB, "WARNING: Degenerate T-junction edge found, fixing...\n" ); Sys_FPrintf( SYS_VRB, "WARNING: Degenerate T-junction edge found, fixing...\n" );
/* create an average drawvert */ /* create an average drawvert */
@ -578,13 +572,16 @@ qboolean FixBrokenSurface( mapDrawSurface_t *ds )
memcpy( dv2, dv1, sizeof( bspDrawVert_t ) ); memcpy( dv2, dv1, sizeof( bspDrawVert_t ) );
} }
ds->numVerts--; ds->numVerts--;
/* after welding, we have to consider the same vertex again, as it now has a new neighbor dv2 */
--i;
/* should ds->numVerts have become 0, then i is now -1. In the next iteration, the loop will abort. */
} }
} }
/* one last check and return */ /* one last check and return */
if( ds->numVerts < 3 ) return ds->numVerts >= 3;
valid = qfalse;
return valid;
} }