--- ray/src/cv/tmesh2rad.c	1994/06/15 15:07:06	2.6
+++ ray/src/cv/tmesh2rad.c	2003/07/27 22:12:02	2.14
@@ -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.14 2003/07/27 22:12:02 schorsch Exp $";
 #endif
-
 /*
  * Convert a trianglular mesh into a Radiance description.
  *
@@ -34,11 +31,10 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include "standard.h"
 
-#define  ABS(x)		((x)>=0 ? (x) : -(x))
+#include "tmesh.h"
 
 #define VOIDID		"void"		/* this is defined in object.h */
 
-#define CALNAME		"tmesh.cal"	/* the name of our auxiliary file */
 #define PATNAME		"T-pat"		/* triangle pattern name (reused) */
 #define TEXNAME		"T-nor"		/* triangle texture name (reused) */
 
@@ -56,13 +52,8 @@ typedef struct {
 VERTEX	*vlist = NULL;		/* our vertex list */
 int	nverts = 0;		/* number of vertices in our list */
 
-typedef struct {
-	int	ax;		/* major axis */
-	FLOAT	tm[2][3];	/* transformation */
-} BARYCCM;
+#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 */
 
 extern VERTEX	*vnew();	/* allocate a vertex (never freed) */
@@ -208,19 +199,28 @@ triangle(pn, mod, obj, v1, v2, v3)	/* put out a triang
 char	*pn, *mod, *obj;
 register VERTEX	*v1, *v2, *v3;
 {
+	static char	vfmt[] = "%18.12g %18.12g %18.12g\n";
 	static int	ntri = 0;
+	int		flatness = ISFLAT;
 	BARYCCM	bvecs;
-	FVECT	bvm[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;
-					/* put out texture (if any) */
+					/* 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 (flatness == ISBENT || flatness == RVBENT) {
 		printf("\n%s texfunc %s\n", mod, TEXNAME);
 		mod = TEXNAME;
-		printf("4 dx dy dz %s\n", CALNAME);
+		printf("4 dx dy dz %s\n", TCALNAME);
 		printf("0\n");
 		for (i = 0; i < 3; i++) {
 			bvm[i][0] = v1->nor[i];
@@ -233,7 +233,7 @@ register VERTEX	*v1, *v2, *v3;
 	if (*pn && (v1->flags & v2->flags & v3->flags & V_HASINDX)) {
 		printf("\n%s colorpict %s\n", mod, PATNAME);
 		mod = PATNAME;
-		printf("7 noneg noneg noneg %s %s u v\n", pn, CALNAME);
+		printf("7 noneg noneg noneg %s %s u v\n", pn, TCALNAME);
 		printf("0\n");
 		for (i = 0; i < 2; i++) {
 			bvm[i][0] = v1->ndx[i];
@@ -242,82 +242,21 @@ 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]);
-}
-
-
-int
-comp_baryc(bcm, v1, v2, v3)		/* compute barycentric vectors */
-register BARYCCM	*bcm;
-FLOAT	*v1, *v2, *v3;
-{
-	FLOAT	*vt;
-	FVECT	va, vab, vcb;
-	double	d;
-	int	ax0, ax1;
-	register int	i, j;
-					/* compute major axis */
-	for (i = 0; i < 3; i++) {
-		vab[i] = v1[i] - v2[i];
-		vcb[i] = v3[i] - v2[i];
+	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]);
 	}
-	fcross(va, vab, vcb);
-	bcm->ax = ABS(va[0]) > ABS(va[1]) ? 0 : 1;
-	bcm->ax = ABS(va[bcm->ax]) > ABS(va[2]) ? bcm->ax : 2;
-	ax0 = (bcm->ax + 1) % 3;
-	ax1 = (bcm->ax + 2) % 3;
-	for (j = 0; j < 2; j++) {
-		vab[0] = v1[ax0] - v2[ax0];
-		vcb[0] = v3[ax0] - v2[ax0];
-		vab[1] = v1[ax1] - v2[ax1];
-		vcb[1] = v3[ax1] - v2[ax1];
-		d = vcb[0]*vcb[0] + vcb[1]*vcb[1];
-		if (d <= FTINY)
-			return(-1);
-		d = (vcb[0]*vab[0]+vcb[1]*vab[1])/d;
-		va[0] = vab[0] - vcb[0]*d;
-		va[1] = vab[1] - vcb[1]*d;
-		d = va[0]*va[0] + va[1]*va[1];
-		if (d <= FTINY)
-			return(-1);
-		bcm->tm[j][0] = va[0] /= d;
-		bcm->tm[j][1] = va[1] /= d;
-		bcm->tm[j][2] = -(v2[ax0]*va[0]+v2[ax1]*va[1]);
-					/* rotate vertices */
-		vt = v1;
-		v1 = v2;
-		v2 = v3;
-		v3 = vt;
-	}
-	return(0);
 }
 
 
-put_baryc(bcm, com, n)			/* put barycentric coord. vectors */
-register BARYCCM	*bcm;
-register FVECT	com[];
-int	n;
-{
-	double	a, b;
-	register int	i, j;
-
-	printf("%d\t%d\n", 1+3*n, bcm->ax);
-	for (i = 0; i < n; i++) {
-		a = com[i][0] - com[i][2];
-		b = com[i][1] - com[i][2];
-		printf("%14.8f %14.8f %14.8f\n",
-			bcm->tm[0][0]*a + bcm->tm[1][0]*b,
-			bcm->tm[0][1]*a + bcm->tm[1][1]*b,
-			bcm->tm[0][2]*a + bcm->tm[1][2]*b + com[i][2]);
-	}
-}
-
-
 VERTEX *
 vnew(id, x, y, z)			/* create a new vertex */
 register int	id;
@@ -331,7 +270,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,