X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fbrush.c;h=b7c50f4c3348a998a674aca65af4b14dfadc5f76;hb=6b48a837f99ba86e55f811f9c68384660c45da94;hp=12754085cd675a91de7e65d621723de603a35b95;hpb=94cb905da9c38e65cff6dcd9a56874c33c367df2;p=xonotic%2Fnetradiant.git diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.c index 12754085..b7c50f4c 100644 --- a/tools/quake3/q3map2/brush.c +++ b/tools/quake3/q3map2/brush.c @@ -321,8 +321,6 @@ void SnapWeldVectorAccu(vec3_accu_t a, vec3_accu_t b, vec3_accu_t out) } } - - /* FixWinding() - ydnar removes degenerate edges from a winding @@ -458,7 +456,7 @@ returns false if the brush doesn't enclose a valid volume qboolean CreateBrushWindings( brush_t *brush ) { int i, j; -#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES +#if Q3MAP2_EXPERIMENTAL_HIGH_PRECISION_MATH_FIXES winding_accu_t *w; #else winding_t *w; @@ -475,7 +473,7 @@ qboolean CreateBrushWindings( brush_t *brush ) plane = &mapplanes[ side->planenum ]; /* make huge winding */ -#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES +#if Q3MAP2_EXPERIMENTAL_HIGH_PRECISION_MATH_FIXES w = BaseWindingForPlaneAccu(plane->normal, plane->dist); #else w = BaseWindingForPlane( plane->normal, plane->dist ); @@ -491,14 +489,14 @@ qboolean CreateBrushWindings( brush_t *brush ) if( brush->sides[ j ].bevel ) continue; plane = &mapplanes[ brush->sides[ j ].planenum ^ 1 ]; -#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES +#if Q3MAP2_EXPERIMENTAL_HIGH_PRECISION_MATH_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 */ -#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES +#if Q3MAP2_EXPERIMENTAL_HIGH_PRECISION_MATH_FIXES // I think it's better to FixWindingAccu() once after we chop with all planes // so that error isn't multiplied. There is nothing natural about welding // the points unless they are the final endpoints. ChopWindingInPlaceAccu() @@ -509,7 +507,7 @@ qboolean CreateBrushWindings( brush_t *brush ) } /* set side winding */ -#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES +#if Q3MAP2_EXPERIMENTAL_HIGH_PRECISION_MATH_FIXES if (w != NULL) { FixWindingAccu(w);