--- ray/src/common/face.c 1991/07/17 14:10:13 1.4 +++ ray/src/common/face.c 2003/02/25 02:47:21 2.7 @@ -1,15 +1,12 @@ -/* Copyright (c) 1986 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: face.c,v 2.7 2003/02/25 02:47:21 greg Exp $"; #endif - /* * face.c - routines dealing with polygonal faces. - * - * 8/30/85 */ +#include "copyright.h" + #include "standard.h" #include "object.h" @@ -27,14 +24,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 +55,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]; @@ -84,7 +89,7 @@ OBJREC *o; badvert += fabs(d1 - f->offset/i) > VERTEPS; f->offset += d1; } - f->offset /= f->nv; + f->offset /= (double)f->nv; if (badvert) objerror(o, WARNING, "non-planar vertex"); /* find axis */ @@ -96,6 +101,7 @@ OBJREC *o; } +void freeface(o) /* free memory associated with face */ OBJREC *o; { @@ -106,6 +112,7 @@ OBJREC *o; } +int inface(p, f) /* determine if point is in face */ FVECT p; FACE *f; @@ -113,7 +120,7 @@ FACE *f; int ncross, n; double x, y; register int xi, yi; - register double *p0, *p1; + register FLOAT *p0, *p1; xi = (f->ax+1)%3; yi = (f->ax+2)%3;