--- ray/src/common/face.c 1991/11/12 16:55:08 2.1 +++ ray/src/common/face.c 1996/03/22 09:01:16 2.5 @@ -1,4 +1,4 @@ -/* Copyright (c) 1991 Regents of the University of California */ +/* Copyright (c) 1995 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -27,14 +27,17 @@ static char SCCSid[] = "$SunId$ LBL"; * The last vertex is automatically connected to the first. */ +#ifdef SMLFLT +#define VERTEPS 1e-2 /* allowed vertex error */ +#else #define VERTEPS 1e-4 /* allowed vertex error */ +#endif FACE * getface(o) /* get arguments for a face */ OBJREC *o; { - double fabs(); double d1; int badvert; FVECT v1, v2, v3; @@ -55,10 +58,15 @@ OBJREC *o; f->va = o->oargs.farg; f->nv = o->oargs.nfargs / 3; + /* check for last==first */ + if (dist2(VERTEX(f,0),VERTEX(f,f->nv-1)) <= FTINY*FTINY) + f->nv--; /* compute area and normal */ f->norm[0] = f->norm[1] = f->norm[2] = 0.0; - v1[0] = v1[1] = v1[2] = 0.0; - for (i = 1; i < f->nv; i++) { + v1[0] = VERTEX(f,1)[0] - VERTEX(f,0)[0]; + v1[1] = VERTEX(f,1)[1] - VERTEX(f,0)[1]; + v1[2] = VERTEX(f,1)[2] - VERTEX(f,0)[2]; + for (i = 2; i < f->nv; i++) { v2[0] = VERTEX(f,i)[0] - VERTEX(f,0)[0]; v2[1] = VERTEX(f,i)[1] - VERTEX(f,0)[1]; v2[2] = VERTEX(f,i)[2] - VERTEX(f,0)[2];