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

fix a nasty bug breaking "deformvertexes move"

Browse Source
This commit is contained in:
Rudolf Polzer 2010-07-16 12:51:56 +02:00
parent 2e0af6a7a0
commit dab02ced76
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2037,14 +2037,25 @@ int FilterWindingIntoTree_r( winding_t *w, mapDrawSurface_t *ds, node_t *node )
{ {
/* 'fatten' the winding by the shader mins/maxs (parsed from vertexDeform move) */ /* 'fatten' the winding by the shader mins/maxs (parsed from vertexDeform move) */
/* note this winding is completely invalid (concave, nonplanar, etc) */ /* note this winding is completely invalid (concave, nonplanar, etc) */
fat = AllocWinding( w->numpoints * 3 ); fat = AllocWinding( w->numpoints * 3 + 3 );
fat->numpoints = w->numpoints * 3; fat->numpoints = w->numpoints * 3 + 3;
for( i = 0; i < w->numpoints; i++ ) for( i = 0; i < w->numpoints; i++ )
{ {
VectorCopy( w->p[ i ], fat->p[ i ] ); VectorCopy( w->p[ i ], fat->p[ i ] );
VectorAdd( w->p[ i ], si->mins, fat->p[ i * 2 ] ); VectorAdd( w->p[ i ], si->mins, fat->p[ i + (w->numpoints+1) ] );
VectorAdd( w->p[ i ], si->maxs, fat->p[ i * 3 ] ); VectorAdd( w->p[ i ], si->maxs, fat->p[ i + (w->numpoints+1) * 2 ] );
} }
VectorCopy( w->p[ 0 ], fat->p[ i ] );
VectorAdd( w->p[ 0 ], si->mins, fat->p[ i + w->numpoints ] );
VectorAdd( w->p[ 0 ], si->maxs, fat->p[ i + w->numpoints * 2 ] );
/*
* note: this winding is STILL not suitable for ClipWindingEpsilon, and
* also does not really fulfill the intention as it only contains
* origin, +mins, +maxs, but thanks to the "closing" points I just
* added to the three sub-windings, the fattening at least doesn't make
* it worse
*/
FreeWinding( w ); FreeWinding( w );
w = fat; w = fat;