--- ray/src/common/face.c	1989/02/02 10:34:31	1.1
+++ ray/src/common/face.c	2016/09/16 15:09:21	2.13
@@ -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.13 2016/09/16 15:09:21 greg Exp $";
 #endif
-
 /*
  *  face.c - routines dealing with polygonal faces.
- *
- *     8/30/85
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #include  "object.h"
@@ -27,19 +24,23 @@ static char SCCSid[] = "$SunId$ LBL";
  *  The last vertex is automatically connected to the first.
  */
 
-#define  VERTEPS	1e-4		/* allowed vertex error */
+#ifdef  SMLFLT
+#define  VERTEPS	1e-3		/* allowed vertex error */
+#else
+#define  VERTEPS	1e-5		/* allowed vertex error */
+#endif
 
 
 FACE *
-getface(o)			/* get arguments for a face */
-OBJREC  *o;
+getface(				/* get arguments for a face */
+	OBJREC  *o
+)
 {
-	double  fabs();
 	double  d1;
-	int  badvert;
+	int  smalloff, badvert;
 	FVECT  v1, v2, v3;
-	register FACE  *f;
-	register int  i;
+	FACE  *f;
+	int  i;
 
 	if ((f = (FACE *)o->os) != NULL)
 		return(f);			/* already done */
@@ -51,12 +52,19 @@ OBJREC  *o;
 	if (o->oargs.nfargs < 9 || o->oargs.nfargs % 3)
 		objerror(o, USER, "bad # arguments");
 
+	o->os = (char *)f;			/* save face */
+
 	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];
@@ -69,51 +77,61 @@ OBJREC  *o;
 	f->area = normalize(f->norm);
 	if (f->area == 0.0) {
 		objerror(o, WARNING, "zero area");	/* used to be fatal */
-		f->const = 0.0;
+		f->offset = 0.0;
 		f->ax = 0;
 		return(f);
 	}
 	f->area *= 0.5;
-						/* compute constant */
+						/* compute offset */
 	badvert = 0;
-	f->const = DOT(f->norm, VERTEX(f,0));
+	f->offset = DOT(f->norm, VERTEX(f,0));
+	smalloff = fabs(f->offset) <= VERTEPS;
 	for (i = 1; i < f->nv; i++) {
 		d1 = DOT(f->norm, VERTEX(f,i));
-		badvert += fabs(d1 - f->const/i) > VERTEPS;
-		f->const += d1;
+		if (smalloff)
+			badvert += fabs(d1 - f->offset/i) > VERTEPS;
+		else
+			badvert += fabs(1.0 - d1*i/f->offset) > VERTEPS;
+		f->offset += d1;
 	}
-	f->const /= f->nv;
-	if (badvert)
+	f->offset /= (double)f->nv;
+	if (f->nv > 3 && badvert)
 		objerror(o, WARNING, "non-planar vertex");
 						/* find axis */
 	f->ax = fabs(f->norm[0]) > fabs(f->norm[1]) ? 0 : 1;
 	if (fabs(f->norm[2]) > fabs(f->norm[f->ax]))
 		f->ax = 2;
 
-	(FACE *)o->os = f;			/* save face */
 	return(f);
 }
 
 
-freeface(o)			/* free memory associated with face */
-OBJREC  *o;
+void
+freeface(			/* free memory associated with face */
+	OBJREC  *o
+)
 {
+	if (o->os == NULL)
+		return;
 	free(o->os);
 	o->os = NULL;
 }
 
 
-inface(p, f)			/* determine if point is in face */
-FVECT  p;
-FACE  *f;
+int
+inface(				/* determine if point is in face */
+	FVECT  p,
+	FACE  *f
+)
 {
 	int  ncross, n;
 	double  x, y;
-	register int  xi, yi;
-	register double  *p0, *p1;
+	int  tst;
+	int  xi, yi;
+	RREAL  *p0, *p1;
 
-	xi = (f->ax+1)%3;
-	yi = (f->ax+2)%3;
+	if ((xi = f->ax + 1) >= 3) xi -= 3;
+	if ((yi = xi + 1) >= 3) yi -= 3;
 	x = p[xi];
 	y = p[yi];
 	n = f->nv;
@@ -122,13 +140,15 @@ FACE  *f;
 	ncross = 0;
 					/* positive x axis cross test */
 	while (n--) {
-		if ((p0[yi] > y) ^ (p1[yi] > y))
-			if (p0[xi] > x && p1[xi] > x)
+		if ((p0[yi] > y) ^ (p1[yi] > y)) {
+			tst = (p0[xi] > x) + (p1[xi] > x);
+			if (tst == 2)
 				ncross++;
-			else if (p0[xi] > x || p1[xi] > x)
+			else if (tst)
 				ncross += (p1[yi] > p0[yi]) ^
 						((p0[yi]-y)*(p1[xi]-x) >
 						(p0[xi]-x)*(p1[yi]-y));
+		}
 		p0 = p1;
 		p1 += 3;
 	}