--- ray/src/cv/tmesh2rad.c	1996/07/24 13:07:44	2.9
+++ ray/src/cv/tmesh2rad.c	2003/11/15 17:54:06	2.15
@@ -1,9 +1,6 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: tmesh2rad.c,v 2.15 2003/11/15 17:54:06 schorsch Exp $";
 #endif
-
 /*
  * Convert a trianglular mesh into a Radiance description.
  *
@@ -32,8 +29,11 @@ static char SCCSid[] = "$SunId$ LBL";
  * It is not necessary for the normal vectors to have unit length.
  */
 
-#include "standard.h"
+#include <stdlib.h>
+#include <stdio.h>
 
+#include "rtmath.h"
+
 #include "tmesh.h"
 
 #define VOIDID		"void"		/* this is defined in object.h */
@@ -55,7 +55,7 @@ typedef struct {
 VERTEX	*vlist = NULL;		/* our vertex list */
 int	nverts = 0;		/* number of vertices in our list */
 
-#define novert(i)	((i)<0|(i)>=nverts || !(vlist[i].flags&V_DEFINED))
+#define novert(i)	(((i)<0)|((i)>=nverts) || !(vlist[i].flags&V_DEFINED))
 
 #define CHUNKSIZ	128	/* vertex allocation chunk size */
 
@@ -65,10 +65,17 @@ char	*defmat = VOIDID;	/* default (starting) material 
 char	*defpat = "";		/* default (starting) picture name */
 char	*defobj = "T";		/* default (starting) object name */
 
+void convert(char *fname, FILE *fp);
+void triangle(char *pn,char *mod,char *obj, VERTEX *v1,VERTEX *v2,VERTEX *v3);
+VERTEX *vnew(int id, double x, double y, double z);
+void syntax(char *fn, FILE *fp, char *er);
 
-main(argc, argv)		/* read in T-mesh files and convert */
-int	argc;
-char	*argv[];
+
+int
+main(		/* read in T-mesh files and convert */
+	int	argc,
+	char	*argv[]
+)
 {
 	FILE	*fp;
 	int	i;
@@ -105,9 +112,11 @@ char	*argv[];
 }
 
 
-convert(fname, fp)		/* convert a T-mesh */
-char	*fname;
-FILE	*fp;
+void
+convert(		/* convert a T-mesh */
+	char	*fname,
+	FILE	*fp
+)
 {
 	char	typ[4];
 	int	id[3];
@@ -198,22 +207,35 @@ FILE	*fp;
 }
 
 
-triangle(pn, mod, obj, v1, v2, v3)	/* put out a triangle */
-char	*pn, *mod, *obj;
-register VERTEX	*v1, *v2, *v3;
+void
+triangle(	/* put out a triangle */
+	char	*pn,
+	char	*mod,
+	char	*obj,
+	register VERTEX	*v1,
+	register VERTEX	*v2,
+	register VERTEX	*v3
+)
 {
+	static char	vfmt[] = "%18.12g %18.12g %18.12g\n";
 	static int	ntri = 0;
+	int		flatness = ISFLAT;
 	BARYCCM	bvecs;
-	FLOAT	bvm[3][3];
+	RREAL	bvm[3][3];
 	register int	i;
 					/* compute barycentric coordinates */
 	if (v1->flags & v2->flags & v3->flags & (V_HASINDX|V_HASNORM))
 		if (comp_baryc(&bvecs, v1->pos, v2->pos, v3->pos) < 0)
 			return;
+					/* check flatness */
+	if (v1->flags & v2->flags & v3->flags & V_HASNORM) {
+		flatness = flat_tri(v1->pos, v2->pos, v3->pos,
+					v1->nor, v2->nor, v3->nor);
+		if (flatness == DEGEN)
+			return;
+	}
 					/* put out texture (if any) */
-	if (v1->flags & v2->flags & v3->flags & V_HASNORM &&
-			!flat_tri(v1->pos, v2->pos, v3->pos,
-					v1->nor, v2->nor, v3->nor)) {
+	if (flatness == ISBENT || flatness == RVBENT) {
 		printf("\n%s texfunc %s\n", mod, TEXNAME);
 		mod = TEXNAME;
 		printf("4 dx dy dz %s\n", TCALNAME);
@@ -238,19 +260,28 @@ register VERTEX	*v1, *v2, *v3;
 		}
 		put_baryc(&bvecs, bvm, 2);
 	}
-					/* put out triangle */
+					/* put out (reversed) triangle */
 	printf("\n%s polygon %s.%d\n", mod, obj, ++ntri);
 	printf("0\n0\n9\n");
-	printf("%18.12g %18.12g %18.12g\n", v1->pos[0],v1->pos[1],v1->pos[2]);
-	printf("%18.12g %18.12g %18.12g\n", v2->pos[0],v2->pos[1],v2->pos[2]);
-	printf("%18.12g %18.12g %18.12g\n", v3->pos[0],v3->pos[1],v3->pos[2]);
+	if (flatness == RVFLAT || flatness == RVBENT) {
+		printf(vfmt, v3->pos[0],v3->pos[1],v3->pos[2]);
+		printf(vfmt, v2->pos[0],v2->pos[1],v2->pos[2]);
+		printf(vfmt, v1->pos[0],v1->pos[1],v1->pos[2]);
+	} else {
+		printf(vfmt, v1->pos[0],v1->pos[1],v1->pos[2]);
+		printf(vfmt, v2->pos[0],v2->pos[1],v2->pos[2]);
+		printf(vfmt, v3->pos[0],v3->pos[1],v3->pos[2]);
+	}
 }
 
 
 VERTEX *
-vnew(id, x, y, z)			/* create a new vertex */
-register int	id;
-double	x, y, z;
+vnew(			/* create a new vertex */
+	register int	id,
+	double	x,
+	double	y,
+	double	z
+)
 {
 	register int	i;
 
@@ -260,7 +291,7 @@ double	x, y, z;
 		if (vlist == NULL)
 			vlist = (VERTEX *)malloc(nverts*sizeof(VERTEX));
 		else
-			vlist = (VERTEX *)realloc((char *)vlist,
+			vlist = (VERTEX *)realloc((void *)vlist,
 					nverts*sizeof(VERTEX));
 		if (vlist == NULL) {
 			fprintf(stderr,
@@ -280,10 +311,12 @@ double	x, y, z;
 }
 
 
-syntax(fn, fp, er)			/* report syntax error and exit */
-char	*fn;
-register FILE	*fp;
-char	*er;
+void
+syntax(			/* report syntax error and exit */
+	char	*fn,
+	register FILE	*fp,
+	char	*er
+)
 {
 	extern long	ftell();
 	register long	cpos;