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

use memcpy in CopyWindingAccuIncreaseSizeAndFreeOld

Browse Source 
rephrase ChopWindingInPlaceAccu::fineEpsilon
This commit is contained in:
Garux 2020-01-13 12:43:18 +03:00
parent 4d9a6cc2a9
commit 7492d3d8c5
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/quake3/common/polylib.c
View File

@ -422,19 +422,11 @@ winding_t *CopyWinding( const winding_t *w ){
================== ==================
*/ */
winding_accu_t *CopyWindingAccuIncreaseSizeAndFreeOld( winding_accu_t *w ){ winding_accu_t *CopyWindingAccuIncreaseSizeAndFreeOld( winding_accu_t *w ){
int i;
winding_accu_t *c;
if ( !w ) { if ( !w ) {
Error( "CopyWindingAccuIncreaseSizeAndFreeOld: winding is NULL" ); Error( "CopyWindingAccuIncreaseSizeAndFreeOld: winding is NULL" );
} }
c = AllocWindingAccu( w->numpoints + 1 ); winding_accu_t *c = memcpy( AllocWindingAccu( w->numpoints + 1 ), w, offsetof( winding_accu_t, p[w->numpoints] ) );
c->numpoints = w->numpoints;
for ( i = 0; i < c->numpoints; i++ )
{
VectorCopyAccu( w->p[i], c->p[i] );
}
FreeWindingAccu( w ); FreeWindingAccu( w );
return c; return c;
} }
@ -613,7 +605,6 @@ void ClipWindingEpsilon( winding_t *in, vec3_t normal, vec_t dist,
============= =============
*/ */
void ChopWindingInPlaceAccu( winding_accu_t **inout, vec3_t normal, vec_t dist, vec_t crudeEpsilon ){ void ChopWindingInPlaceAccu( winding_accu_t **inout, vec3_t normal, vec_t dist, vec_t crudeEpsilon ){
vec_accu_t fineEpsilon;
winding_accu_t *in; winding_accu_t *in;
int counts[3]; int counts[3];
int i, j; int i, j;
@ -658,10 +649,7 @@ void ChopWindingInPlaceAccu( winding_accu_t **inout, vec3_t normal, vec_t dist,
// 64-bit land inside of the epsilon for all numbers we're dealing with. // 64-bit land inside of the epsilon for all numbers we're dealing with.
static const vec_accu_t smallestEpsilonAllowed = ( (vec_accu_t) VEC_SMALLEST_EPSILON_AROUND_ONE ) * 0.5; static const vec_accu_t smallestEpsilonAllowed = ( (vec_accu_t) VEC_SMALLEST_EPSILON_AROUND_ONE ) * 0.5;
if ( crudeEpsilon < smallestEpsilonAllowed ) { const vec_accu_t fineEpsilon = ( crudeEpsilon < smallestEpsilonAllowed )? smallestEpsilonAllowed : (vec_accu_t) crudeEpsilon;
fineEpsilon = smallestEpsilonAllowed;
}
else{fineEpsilon = (vec_accu_t) crudeEpsilon; }
in = *inout; in = *inout;
counts[0] = counts[1] = counts[2] = 0; counts[0] = counts[1] = counts[2] = 0;