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

Comparing ray/src/ot/wfconv.c (file contents):
Revision 2.12 by greg, Fri Jan 24 02:22:49 2014 UTC vs.
Revision 2.13 by greg, Tue Jun 10 23:19:00 2014 UTC

# Line 32 | Line 32 | static char    group[256];     /* current group name */
32   static int      lineno;         /* current line number */
33   static int      faceno;         /* current face number */
34  
35 < static int getstmt(char *av[MAXARG], FILE       *fp);
36 < static int cvtndx(VNDX  vi, char        *vs);
37 < static int putface(int  ac, char        **av);
35 > static int getstmt(char *av[MAXARG], FILE *fp);
36 > static int cvtndx(VNDX vi, char *vs);
37 > static int putface(int ac, char **av);
38   static OBJECT getmod(void);
39 < static int puttri(char  *v1, char       *v2, char       *v3);
39 > static int puttri(char  *v1, char *v2, char *v3);
40   static void freeverts(void);
41 < static int newv(double  x, double       y, double       z);
42 < static int newvn(double x, double       y, double       z);
43 < static int newvt(double x, double       y);
41 > static int newv(double  x, double y, double z);
42 > static int newvn(double x, double y, double z);
43 > static int newvt(double x, double y);
44   static void syntax(char *er);
45  
46  
# Line 304 | Line 304 | putface(                               /* put out an N-sided polygon */
304                  poly->v[i].mY = vlist[vi[0]][ay];
305          }
306                                          /* break into triangles & output */
307 <        if (!polyTriangulate(poly, &tri_out))
308 <                error(WARNING, "self-intersecting face");
307 >        if (!polyTriangulate(poly, &tri_out)) {
308 >                sprintf(errmsg, "self-intersecting face with %d vertices", ac);
309 >                error(WARNING, errmsg);
310 >        }
311          polyFree(poly);
312          return(1);
313   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines