ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/face.c
(Generate patch)

Comparing ray/src/common/face.c (file contents):
Revision 2.8 by greg, Wed Mar 12 17:26:58 2003 UTC vs.
Revision 2.12 by greg, Thu Mar 2 16:51:54 2006 UTC

# Line 25 | Line 25 | static const char RCSid[] = "$Id$";
25   */
26  
27   #ifdef  SMLFLT
28 < #define  VERTEPS        1e-2            /* allowed vertex error */
28 > #define  VERTEPS        1e-3            /* allowed vertex error */
29   #else
30 < #define  VERTEPS        1e-4            /* allowed vertex error */
30 > #define  VERTEPS        1e-5            /* allowed vertex error */
31   #endif
32  
33  
# Line 36 | Line 36 | getface(o)                     /* get arguments for a face */
36   OBJREC  *o;
37   {
38          double  d1;
39 <        int  badvert;
39 >        int  smalloff, badvert;
40          FVECT  v1, v2, v3;
41          register FACE  *f;
42          register int  i;
# Line 84 | Line 84 | OBJREC  *o;
84                                                  /* compute offset */
85          badvert = 0;
86          f->offset = DOT(f->norm, VERTEX(f,0));
87 +        smalloff = fabs(f->offset) <= VERTEPS;
88          for (i = 1; i < f->nv; i++) {
89                  d1 = DOT(f->norm, VERTEX(f,i));
90 <                badvert += fabs(d1 - f->offset/i) > VERTEPS;
90 >                if (smalloff)
91 >                        badvert += fabs(d1 - f->offset/i) > VERTEPS;
92 >                else
93 >                        badvert += fabs(1.0 - d1*i/f->offset) > VERTEPS;
94                  f->offset += d1;
95          }
96          f->offset /= (double)f->nv;
97 <        if (badvert)
97 >        if (f->nv > 3 && badvert)
98                  objerror(o, WARNING, "non-planar vertex");
99                                                  /* find axis */
100          f->ax = fabs(f->norm[0]) > fabs(f->norm[1]) ? 0 : 1;
# Line 121 | Line 125 | FACE  *f;
125          double  x, y;
126          int  tst;
127          register int  xi, yi;
128 <        register FLOAT  *p0, *p1;
128 >        register RREAL  *p0, *p1;
129  
130 <        xi = (f->ax+1)%3;
131 <        yi = (f->ax+2)%3;
130 >        if ((xi = f->ax + 1) >= 3) xi -= 3;
131 >        if ((yi = xi + 1) >= 3) yi -= 3;
132          x = p[xi];
133          y = p[yi];
134          n = f->nv;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)