--- ray/src/cv/obj2rad.c	1994/06/22 12:35:59	2.15
+++ ray/src/cv/obj2rad.c	2003/07/27 22:12:02	2.21
@@ -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: obj2rad.c,v 2.21 2003/07/27 22:12:02 schorsch Exp $";
 #endif
-
 /*
  * Convert a Wavefront .obj file to Radiance format.
  *
@@ -32,7 +29,7 @@ FVECT	*vlist;			/* our vertex list */
 int	nvs;			/* number of vertices in our list */
 FVECT	*vnlist;		/* vertex normal list */
 int	nvns;
-FLOAT	(*vtlist)[2];		/* map vertex list */
+RREAL	(*vtlist)[2];		/* map vertex list */
 int	nvts;
 
 typedef int	VNDX[3];	/* vertex index (point,map,normal) */
@@ -103,7 +100,7 @@ char	*argv[];
 		default:
 			goto userr;
 		}
-	if (i > argc | i < argc-1)
+	if ((i > argc) | (i < argc-1))
 		goto userr;
 	if (i == argc)
 		inpfile = "<stdin>";
@@ -140,7 +137,7 @@ FILE	*fp;
 	ID	tmpid;
 	register int	i;
 
-	while (argc = getstmt(argv, fp))
+	while ( (argc = getstmt(argv, fp)) )
 		switch (argv[0][0]) {
 		case 'f':				/* face */
 			if (!argv[0][1])
@@ -191,7 +188,7 @@ FILE	*fp;
 
 	nstats = nunknown = 0;
 					/* scan until EOF */
-	while (argc = getstmt(argv, fp)) {
+	while ( (argc = getstmt(argv, fp)) ) {
 		switch (argv[0][0]) {
 		case 'v':		/* vertex */
 			switch (argv[0][1]) {
@@ -360,7 +357,7 @@ getonm()				/* invent a good name for object */
 		cp2 = group[i];
 		if (cp1 > name)
 			*cp1++ = '.';
-		while (*cp1 = *cp2++)
+		while ( (*cp1 = *cp2++) )
 			if (++cp1 >= name+sizeof(name)-2) {
 				*cp1 = '\0';
 				return(name);
@@ -473,7 +470,7 @@ register int	ac;
 register char	**av;
 {
 	VNDX	vi;
-	FLOAT	*p0, *p1;
+	RREAL	*p0, *p1;
 	FVECT	v1, v2, nsum, newn;
 	double	d;
 	register int	i;
@@ -558,8 +555,9 @@ char	*v1, *v2, *v3;
 	char	*mod;
 	VNDX	v1i, v2i, v3i;
 	BARYCCM	bvecs;
-	FLOAT	bcoor[3][3];
+	RREAL	bcoor[3][3];
 	int	texOK, patOK;
+	int	flatness;
 	register int	i;
 
 	if ((mod = getmtl()) == NULL)
@@ -568,7 +566,26 @@ char	*v1, *v2, *v3;
 	if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3))
 		return(0);
 					/* compute barycentric coordinates */
-	texOK = !flatten && (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0);
+	if (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0)
+		flatness = flat_tri(vlist[v1i[0]], vlist[v2i[0]], vlist[v3i[0]],
+				vnlist[v1i[2]], vnlist[v2i[2]], vnlist[v3i[2]]);
+	else
+		flatness = ISFLAT;
+
+	switch (flatness) {
+	case DEGEN:			/* zero area */
+		return(-1);
+	case RVFLAT:			/* reversed normals, but flat */
+	case ISFLAT:			/* smoothing unnecessary */
+		texOK = 0;
+		break;
+	case RVBENT:			/* reversed normals with smoothing */
+	case ISBENT:			/* proper smoothing */
+		texOK = 1;
+		break;
+	}
+	if (flatten)
+		texOK = 0;
 #ifdef TEXMAPS
 	patOK = mapname[0] && (v1i[1]>=0 && v2i[1]>=0 && v3i[1]>=0);
 #else
@@ -606,13 +623,18 @@ char	*v1, *v2, *v3;
 		put_baryc(&bvecs, bcoor, 2);
 	}
 #endif
-					/* put out triangle */
+					/* put out (reversed) triangle */
 	printf("\n%s polygon %s.%d\n", mod, getonm(), faceno);
 	printf("0\n0\n9\n");
-	pvect(vlist[v1i[0]]);
-	pvect(vlist[v2i[0]]);
-	pvect(vlist[v3i[0]]);
-
+	if (flatness == RVFLAT || flatness == RVBENT) {
+		pvect(vlist[v3i[0]]);
+		pvect(vlist[v2i[0]]);
+		pvect(vlist[v1i[0]]);
+	} else {
+		pvect(vlist[v1i[0]]);
+		pvect(vlist[v2i[0]]);
+		pvect(vlist[v3i[0]]);
+	}
 	return(1);
 }
 
@@ -620,15 +642,15 @@ char	*v1, *v2, *v3;
 freeverts()			/* free all vertices */
 {
 	if (nvs) {
-		free((char *)vlist);
+		free((void *)vlist);
 		nvs = 0;
 	}
 	if (nvts) {
-		free((char *)vtlist);
+		free((void *)vtlist);
 		nvts = 0;
 	}
 	if (nvns) {
-		free((char *)vnlist);
+		free((void *)vnlist);
 		nvns = 0;
 	}
 }
@@ -642,7 +664,7 @@ double	x, y, z;
 		if (nvs == 0)
 			vlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT));
 		else
-			vlist = (FVECT *)realloc((char *)vlist,
+			vlist = (FVECT *)realloc((void *)vlist,
 					(nvs+CHUNKSIZ)*sizeof(FVECT));
 		if (vlist == NULL) {
 			fprintf(stderr,
@@ -666,7 +688,7 @@ double	x, y, z;
 		if (nvns == 0)
 			vnlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT));
 		else
-			vnlist = (FVECT *)realloc((char *)vnlist,
+			vnlist = (FVECT *)realloc((void *)vnlist,
 					(nvns+CHUNKSIZ)*sizeof(FVECT));
 		if (vnlist == NULL) {
 			fprintf(stderr,
@@ -690,10 +712,10 @@ double	x, y;
 {
 	if (!(nvts%CHUNKSIZ)) {		/* allocate next block */
 		if (nvts == 0)
-			vtlist = (FLOAT (*)[2])malloc(CHUNKSIZ*2*sizeof(FLOAT));
+			vtlist = (RREAL (*)[2])malloc(CHUNKSIZ*2*sizeof(RREAL));
 		else
-			vtlist = (FLOAT (*)[2])realloc((char *)vtlist,
-					(nvts+CHUNKSIZ)*2*sizeof(FLOAT));
+			vtlist = (RREAL (*)[2])realloc((void *)vtlist,
+					(nvts+CHUNKSIZ)*2*sizeof(RREAL));
 		if (vtlist == NULL) {
 			fprintf(stderr,
 			"Out of memory while allocating texture vertex %d\n",