--- ray/src/cv/obj2rad.c	2003/07/27 22:12:02	2.21
+++ ray/src/cv/obj2rad.c	2008/11/10 19:08:18	2.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: obj2rad.c,v 2.21 2003/07/27 22:12:02 schorsch Exp $";
+static const char	RCSid[] = "$Id: obj2rad.c,v 2.25 2008/11/10 19:08:18 greg Exp $";
 #endif
 /*
  * Convert a Wavefront .obj file to Radiance format.
@@ -10,13 +10,16 @@ static const char	RCSid[] = "$Id: obj2rad.c,v 2.21 200
  * I'm not sure they work correctly.  (Taken out -- see TEXMAPS defines.)
  */
 
-#include "standard.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
 
+#include "rtmath.h"
+#include "rtio.h"
+#include "resolu.h"
 #include "trans.h"
-
 #include "tmesh.h"
 
-#include <ctype.h>
 
 #define PATNAME		"M-pat"		/* mesh pattern name (reused) */
 #define TEXNAME		"M-nor"		/* mesh texture name (reused) */
@@ -32,11 +35,13 @@ int	nvns;
 RREAL	(*vtlist)[2];		/* map vertex list */
 int	nvts;
 
+int	ndegen = 0;		/* count of degenerate faces */
+
 typedef int	VNDX[3];	/* vertex index (point,map,normal) */
 
-#define CHUNKSIZ	256	/* vertex allocation chunk size */
+#define CHUNKSIZ	1024	/* vertex allocation chunk size */
 
-#define MAXARG		64	/* maximum # arguments in a statement */
+#define MAXARG		512	/* maximum # arguments in a statement */
 
 				/* qualifiers */
 #define Q_MTL		0
@@ -65,8 +70,6 @@ char	*defobj = DEFOBJ;	/* default (starting) object na
 
 int	flatten = 0;		/* discard surface normal information */
 
-char	*getmtl(), *getonm();
-
 char	mapname[128];		/* current picture file */
 char	matname[64];		/* current material name */
 char	group[16][32];		/* current group names */
@@ -75,10 +78,28 @@ char	*inpfile;		/* input file name */
 int	lineno;			/* current line number */
 int	faceno;			/* current face number */
 
+static void getnames(FILE *fp);
+static void convert(FILE *fp);
+static int getstmt(char *av[MAXARG], FILE *fp);
+static char * getmtl(void);
+static char * getonm(void);
+static int matchrule(RULEHD *rp);
+static int cvtndx(VNDX vi, char *vs);
+static int nonplanar(int ac, char **av);
+static int putface(int ac, char **av);
+static int puttri(char *v1, char *v2, char *v3);
+static void freeverts(void);
+static int newv(double x, double y, double z);
+static int newvn(double x, double y, double z);
+static int newvt(double x, double y);
+static void syntax(char *er);
 
-main(argc, argv)		/* read in .obj file and convert */
-int	argc;
-char	*argv[];
+
+int
+main(		/* read in .obj file and convert */
+	int	argc,
+	char	*argv[]
+)
 {
 	int	donames = 0;
 	int	i;
@@ -121,6 +142,8 @@ char	*argv[];
 		printargs(argc, argv, stdout);
 		convert(stdin);
 	}
+	if (ndegen)
+		printf("# %d degenerate faces\n", ndegen);
 	exit(0);
 userr:
 	fprintf(stderr, "Usage: %s [-o obj][-m mapping][-n][-f] [file.obj]\n",
@@ -129,8 +152,10 @@ userr:
 }
 
 
-getnames(fp)			/* get valid qualifier names */
-FILE	*fp;
+void
+getnames(			/* get valid qualifier names */
+	FILE	*fp
+)
 {
 	char	*argv[MAXARG];
 	int	argc;
@@ -178,8 +203,10 @@ FILE	*fp;
 }
 
 
-convert(fp)			/* convert a T-mesh */
-FILE	*fp;
+void
+convert(			/* convert a T-mesh */
+	FILE	*fp
+)
 {
 	char	*argv[MAXARG];
 	int	argc;
@@ -247,7 +274,7 @@ FILE	*fp;
 				if (!strcmp(argv[1], "off"))
 					mapname[0] = '\0';
 				else
-					sprintf(mapname, "%s.pic", argv[1]);
+					sprintf(mapname, "%s.hdr", argv[1]);
 			} else
 				goto unknown;
 			break;
@@ -282,12 +309,12 @@ FILE	*fp;
 
 
 int
-getstmt(av, fp)				/* read the next statement from fp */
-register char	*av[MAXARG];
-FILE	*fp;
+getstmt(				/* read the next statement from fp */
+	register char	*av[MAXARG],
+	FILE	*fp
+)
 {
-	extern char	*fgetline();
-	static char	sbuf[MAXARG*10];
+	static char	sbuf[MAXARG*16];
 	register char	*cp;
 	register int	i;
 
@@ -301,8 +328,14 @@ FILE	*fp;
 					lineno++;
 				*cp++ = '\0';
 			}
-			if (!*cp || i >= MAXARG-1)
+			if (!*cp)
 				break;
+			if (i >= MAXARG-1) {
+				fprintf(stderr,
+			"warning: line %d: too many arguments (limit %d)\n",
+					lineno+1, MAXARG-1);
+				break;
+			}
 			av[i++] = cp;
 			while (*++cp && !isspace(*cp))
 				;
@@ -316,7 +349,7 @@ FILE	*fp;
 
 
 char *
-getmtl()				/* figure material for this face */
+getmtl(void)				/* figure material for this face */
 {
 	register RULEHD	*rp = ourmapping;
 
@@ -342,7 +375,7 @@ getmtl()				/* figure material for this face */
 
 
 char *
-getonm()				/* invent a good name for object */
+getonm(void)				/* invent a good name for object */
 {
 	static char	name[64];
 	register char	*cp1, *cp2;
@@ -367,8 +400,10 @@ getonm()				/* invent a good name for object */
 }
 
 
-matchrule(rp)				/* check for a match on this rule */
-register RULEHD	*rp;
+int
+matchrule(				/* check for a match on this rule */
+	register RULEHD	*rp
+)
 {
 	ID	tmpid;
 	int	gotmatch;
@@ -418,9 +453,11 @@ register RULEHD	*rp;
 }
 
 
-cvtndx(vi, vs)				/* convert vertex string to index */
-register VNDX	vi;
-register char	*vs;
+int
+cvtndx(				/* convert vertex string to index */
+	register VNDX	vi,
+	register char	*vs
+)
 {
 					/* get point */
 	vi[0] = atoi(vs);
@@ -465,9 +502,11 @@ register char	*vs;
 }
 
 
-nonplanar(ac, av)			/* are vertices non-planar? */
-register int	ac;
-register char	**av;
+int
+nonplanar(			/* are vertices non-planar? */
+	register int	ac,
+	register char	**av
+)
 {
 	VNDX	vi;
 	RREAL	*p0, *p1;
@@ -516,9 +555,11 @@ register char	**av;
 }
 
 
-putface(ac, av)				/* put out an N-sided polygon */
-int	ac;
-register char	**av;
+int
+putface(				/* put out an N-sided polygon */
+	int	ac,
+	register char	**av
+)
 {
 	VNDX	vi;
 	char	*cp;
@@ -537,7 +578,7 @@ register char	**av;
 		return(1);
 	}
 	if ((cp = getmtl()) == NULL)
-		return(-1);
+		return(0);
 	printf("\n%s polygon %s.%d\n", cp, getonm(), faceno);
 	printf("0\n0\n%d\n", 3*ac);
 	for (i = 0; i < ac; i++) {
@@ -549,19 +590,23 @@ register char	**av;
 }
 
 
-puttri(v1, v2, v3)			/* put out a triangle */
-char	*v1, *v2, *v3;
+int
+puttri(			/* put out a triangle */
+	char *v1,
+	char *v2,
+	char *v3
+)
 {
 	char	*mod;
 	VNDX	v1i, v2i, v3i;
 	BARYCCM	bvecs;
 	RREAL	bcoor[3][3];
-	int	texOK, patOK;
+	int	texOK = 0, patOK;
 	int	flatness;
 	register int	i;
 
 	if ((mod = getmtl()) == NULL)
-		return(-1);
+		return(0);
 
 	if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3))
 		return(0);
@@ -574,6 +619,7 @@ char	*v1, *v2, *v3;
 
 	switch (flatness) {
 	case DEGEN:			/* zero area */
+		ndegen++;
 		return(-1);
 	case RVFLAT:			/* reversed normals, but flat */
 	case ISFLAT:			/* smoothing unnecessary */
@@ -594,7 +640,7 @@ char	*v1, *v2, *v3;
 	if (texOK | patOK)
 		if (comp_baryc(&bvecs, vlist[v1i[0]], vlist[v2i[0]],
 				vlist[v3i[0]]) < 0)
-			return(-1);
+			texOK = patOK = 0;
 					/* put out texture (if any) */
 	if (texOK) {
 		printf("\n%s texfunc %s\n", mod, TEXNAME);
@@ -639,7 +685,8 @@ char	*v1, *v2, *v3;
 }
 
 
-freeverts()			/* free all vertices */
+void
+freeverts(void)			/* free all vertices */
 {
 	if (nvs) {
 		free((void *)vlist);
@@ -657,8 +704,11 @@ freeverts()			/* free all vertices */
 
 
 int
-newv(x, y, z)			/* create a new vertex */
-double	x, y, z;
+newv(			/* create a new vertex */
+	double	x,
+	double	y,
+	double	z
+)
 {
 	if (!(nvs%CHUNKSIZ)) {		/* allocate next block */
 		if (nvs == 0)
@@ -681,8 +731,11 @@ double	x, y, z;
 
 
 int
-newvn(x, y, z)			/* create a new vertex normal */
-double	x, y, z;
+newvn(			/* create a new vertex normal */
+	double	x,
+	double	y,
+	double	z
+)
 {
 	if (!(nvns%CHUNKSIZ)) {		/* allocate next block */
 		if (nvns == 0)
@@ -707,8 +760,10 @@ double	x, y, z;
 
 
 int
-newvt(x, y)			/* create a new texture map vertex */
-double	x, y;
+newvt(			/* create a new texture map vertex */
+	double	x,
+	double	y
+)
 {
 	if (!(nvts%CHUNKSIZ)) {		/* allocate next block */
 		if (nvts == 0)
@@ -730,8 +785,10 @@ double	x, y;
 }
 
 
-syntax(er)			/* report syntax error and exit */
-char	*er;
+void
+syntax(			/* report syntax error and exit */
+	char	*er
+)
 {
 	fprintf(stderr, "%s: Wavefront syntax error near line %d: %s\n",
 			inpfile, lineno, er);