--- ray/src/common/face.c	1991/07/17 14:10:13	1.4
+++ ray/src/common/face.c	2003/02/22 02:07:22	2.6
@@ -1,13 +1,65 @@
-/* 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.6 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  *  face.c - routines dealing with polygonal faces.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     8/30/85
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
  */
 
 #include  "standard.h"
@@ -27,14 +79,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 +110,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 +144,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 +156,7 @@ OBJREC  *o;
 }
 
 
+void
 freeface(o)			/* free memory associated with face */
 OBJREC  *o;
 {
@@ -106,6 +167,7 @@ OBJREC  *o;
 }
 
 
+int
 inface(p, f)			/* determine if point is in face */
 FVECT  p;
 FACE  *f;
@@ -113,7 +175,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;