From f5126d7ffec6d48e3d0d67c25f6daef70b31a476 Mon Sep 17 00:00:00 2001 From: cignoni Date: Mon, 18 May 2009 15:06:11 +0000 Subject: [PATCH] renamed a EPSILON variabile to avoid name clash --- vcg/space/triangle3.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vcg/space/triangle3.h b/vcg/space/triangle3.h index e8547df9..df439bb2 100644 --- a/vcg/space/triangle3.h +++ b/vcg/space/triangle3.h @@ -228,7 +228,7 @@ bool InterpolationParameters2(const Point2 &V1, template bool InterpolationParameters(const TriangleType t,const Point3 & bq, ScalarType &a, ScalarType &b, ScalarType &_c ) { -const ScalarType EPSILON = ScalarType(0.000001); +const ScalarType _EPSILON = ScalarType(0.000001); #define x1 (t.P(0).X()) #define y1 (t.P(0).Y()) #define z1 (t.P(0).Z()) @@ -253,7 +253,7 @@ const ScalarType EPSILON = ScalarType(0.000001); ScalarType t10 = y1*x2; ScalarType t11 = y1*x3; ScalarType t13 = t8-t9-t10+t11+t5-t6; - if(fabs(t13)>=EPSILON) + if(fabs(t13)>=_EPSILON) { ScalarType t15 = px*y1; ScalarType t16 = py*x1; @@ -274,7 +274,7 @@ const ScalarType EPSILON = ScalarType(0.000001); t10 = z1*x2; t11 = z1*x3; t13 = t8-t9-t10+t11+t5-t6; - if(fabs(t13)>=EPSILON) + if(fabs(t13)>=_EPSILON) { ScalarType t15 = px*z1; ScalarType t16 = pz*x1; @@ -290,7 +290,7 @@ const ScalarType EPSILON = ScalarType(0.000001); t8 = z1*y2; t9 = z1*y3; t10 = y1*z2; t11 = y1*z3; t13 = t8-t9-t10+t11+t5-t6; - if(fabs(t13)>=EPSILON) + if(fabs(t13)>=_EPSILON) { ScalarType t15 = pz*y1; ScalarType t16 = py*z1;