ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moving #define of EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES to q3map2.h.

Browse source 
Intead of #ifdef, now using #if.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-math-fix-experiments@388 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
rambetter 2010-12-31 00:50:46 +00:00
parent 938dddb6b2
commit 6a93408fd3
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/quake3/q3map2/brush.c
View file

@ -403,7 +403,6 @@ qboolean FixWindingAccu(winding_accu_t *w)
return valid;
}
#define EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES 1
/*
CreateBrushWindings()
@ -414,7 +413,7 @@ returns false if the brush doesn't enclose a valid volume
qboolean CreateBrushWindings( brush_t *brush )
{
int i, j;
#ifdef EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
winding_accu_t *w;
#else
winding_t *w;
@ -431,7 +430,7 @@ qboolean CreateBrushWindings( brush_t *brush )
plane = &mapplanes[ side->planenum ];
/* make huge winding */
#ifdef EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
w = BaseWindingForPlaneAccu(plane->normal, plane->dist);
#else
w = BaseWindingForPlane( plane->normal, plane->dist );
@ -447,14 +446,14 @@ qboolean CreateBrushWindings( brush_t *brush )
if( brush->sides[ j ].bevel )
continue;
plane = &mapplanes[ brush->sides[ j ].planenum ^ 1 ];
#ifdef EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
ChopWindingInPlaceAccu(&w, plane->normal, plane->dist, 0);
#else
ChopWindingInPlace( &w, plane->normal, plane->dist, 0 ); // CLIP_EPSILON );
#endif
/* ydnar: fix broken windings that would generate trifans */
#ifdef EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
FixWindingAccu(w);
#else
FixWinding( w );
@ -462,7 +461,7 @@ qboolean CreateBrushWindings( brush_t *brush )
}
/* set side winding */
#ifdef EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
side->winding = CopyWindingAccuToNormal(w);
FreeWindingAccu(w);
#else

3
tools/quake3/q3map2/q3map2.h
View file

@ -122,6 +122,9 @@ constants
------------------------------------------------------------------------------- */
/* temporary hacks and tests (please keep off in SVN to prevent anyone's legacy map from screwing up) */
#define EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES 0
/* general */
#define MAX_QPATH 64