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

Comparing ray/src/common/face.c (file contents):
Revision 1.3 by greg, Fri Jul 28 14:27:44 1989 UTC vs.
Revision 2.7 by greg, Tue Feb 25 02:47:21 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1986 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  face.c - routines dealing with polygonal faces.
9 – *
10 – *     8/30/85
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  "standard.h"
11  
12   #include  "object.h"
# Line 27 | Line 24 | static char SCCSid[] = "$SunId$ LBL";
24   *  The last vertex is automatically connected to the first.
25   */
26  
27 + #ifdef  SMLFLT
28 + #define  VERTEPS        1e-2            /* allowed vertex error */
29 + #else
30   #define  VERTEPS        1e-4            /* allowed vertex error */
31 + #endif
32  
33  
34   FACE *
35   getface(o)                      /* get arguments for a face */
36   OBJREC  *o;
37   {
37 –        double  fabs();
38          double  d1;
39          int  badvert;
40          FVECT  v1, v2, v3;
# Line 55 | Line 55 | OBJREC  *o;
55  
56          f->va = o->oargs.farg;
57          f->nv = o->oargs.nfargs / 3;
58 +                                                /* check for last==first */
59 +        if (dist2(VERTEX(f,0),VERTEX(f,f->nv-1)) <= FTINY*FTINY)
60 +                f->nv--;
61                                                  /* compute area and normal */
62          f->norm[0] = f->norm[1] = f->norm[2] = 0.0;
63 <        v1[0] = v1[1] = v1[2] = 0.0;
64 <        for (i = 1; i < f->nv; i++) {
63 >        v1[0] = VERTEX(f,1)[0] - VERTEX(f,0)[0];
64 >        v1[1] = VERTEX(f,1)[1] - VERTEX(f,0)[1];
65 >        v1[2] = VERTEX(f,1)[2] - VERTEX(f,0)[2];
66 >        for (i = 2; i < f->nv; i++) {
67                  v2[0] = VERTEX(f,i)[0] - VERTEX(f,0)[0];
68                  v2[1] = VERTEX(f,i)[1] - VERTEX(f,0)[1];
69                  v2[2] = VERTEX(f,i)[2] - VERTEX(f,0)[2];
# Line 84 | Line 89 | OBJREC  *o;
89                  badvert += fabs(d1 - f->offset/i) > VERTEPS;
90                  f->offset += d1;
91          }
92 <        f->offset /= f->nv;
92 >        f->offset /= (double)f->nv;
93          if (badvert)
94                  objerror(o, WARNING, "non-planar vertex");
95                                                  /* find axis */
# Line 96 | Line 101 | OBJREC  *o;
101   }
102  
103  
104 + void
105   freeface(o)                     /* free memory associated with face */
106   OBJREC  *o;
107   {
108 +        if (o->os == NULL)
109 +                return;
110          free(o->os);
111          o->os = NULL;
112   }
113  
114  
115 + int
116   inface(p, f)                    /* determine if point is in face */
117   FVECT  p;
118   FACE  *f;
# Line 111 | Line 120 | FACE  *f;
120          int  ncross, n;
121          double  x, y;
122          register int  xi, yi;
123 <        register double  *p0, *p1;
123 >        register FLOAT  *p0, *p1;
124  
125          xi = (f->ax+1)%3;
126          yi = (f->ax+2)%3;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines