--- ray/src/cv/obj2rad.c	2008/06/24 02:01:19	2.24
+++ ray/src/cv/obj2rad.c	2013/11/08 16:49:04	2.29
@@ -1,8 +1,8 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: obj2rad.c,v 2.24 2008/06/24 02:01:19 greg Exp $";
+static const char	RCSid[] = "$Id: obj2rad.c,v 2.29 2013/11/08 16:49:04 greg Exp $";
 #endif
 /*
- * Convert a Wavefront .obj file to Radiance format.
+ * Convert a Wavefront .OBJ file to Radiance format.
  *
  * Currently, we support only polygonal geometry.  Non-planar
  * faces are broken rather haphazardly into triangles.
@@ -36,6 +36,7 @@ RREAL	(*vtlist)[2];		/* map vertex list */
 int	nvts;
 
 int	ndegen = 0;		/* count of degenerate faces */
+int	n0norm = 0;		/* count of zero normals */
 
 typedef int	VNDX[3];	/* vertex index (point,map,normal) */
 
@@ -70,10 +71,10 @@ char	*defobj = DEFOBJ;	/* default (starting) object na
 
 int	flatten = 0;		/* discard surface normal information */
 
-char	mapname[128];		/* current picture file */
-char	matname[64];		/* current material name */
-char	group[16][32];		/* current group names */
-char	objname[128];		/* current object name */
+char	mapname[256];		/* current picture file */
+char	matname[256];		/* current material name */
+char	group[8][256];		/* current group name(s) */
+char	objname[256];		/* current object name */
 char	*inpfile;		/* input file name */
 int	lineno;			/* current line number */
 int	faceno;			/* current face number */
@@ -96,7 +97,7 @@ static void syntax(char *er);
 
 
 int
-main(		/* read in .obj file and convert */
+main(		/* read in .OBJ file and convert */
 	int	argc,
 	char	*argv[]
 )
@@ -144,6 +145,8 @@ main(		/* read in .obj file and convert */
 	}
 	if (ndegen)
 		printf("# %d degenerate faces\n", ndegen);
+	if (n0norm)
+		printf("# %d invalid (zero) normals\n", n0norm);
 	exit(0);
 userr:
 	fprintf(stderr, "Usage: %s [-o obj][-m mapping][-n][-f] [file.obj]\n",
@@ -160,7 +163,7 @@ getnames(			/* get valid qualifier names */
 	char	*argv[MAXARG];
 	int	argc;
 	ID	tmpid;
-	register int	i;
+	int	i;
 
 	while ( (argc = getstmt(argv, fp)) )
 		switch (argv[0][0]) {
@@ -204,14 +207,14 @@ getnames(			/* get valid qualifier names */
 
 
 void
-convert(			/* convert a T-mesh */
+convert(			/* convert an OBJ stream */
 	FILE	*fp
 )
 {
 	char	*argv[MAXARG];
 	int	argc;
 	int	nstats, nunknown;
-	register int	i;
+	int	i;
 
 	nstats = nunknown = 0;
 					/* scan until EOF */
@@ -274,7 +277,7 @@ convert(			/* convert a T-mesh */
 				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;
@@ -290,7 +293,7 @@ convert(			/* convert a T-mesh */
 				goto unknown;
 			for (i = 1; i < argc; i++)
 				strcpy(group[i-1], argv[i]);
-			group[i-1][0] = '\0';
+			group[argc-1][0] = '\0';
 			break;
 		case '#':		/* comment */
 			printargs(argc, argv, stdout);
@@ -310,13 +313,13 @@ convert(			/* convert a T-mesh */
 
 int
 getstmt(				/* read the next statement from fp */
-	register char	*av[MAXARG],
+	char	*av[MAXARG],
 	FILE	*fp
 )
 {
 	static char	sbuf[MAXARG*16];
-	register char	*cp;
-	register int	i;
+	char	*cp;
+	int	i;
 
 	do {
 		if (fgetline(cp=sbuf, sizeof(sbuf), fp) == NULL)
@@ -351,7 +354,7 @@ getstmt(				/* read the next statement from fp */
 char *
 getmtl(void)				/* figure material for this face */
 {
-	register RULEHD	*rp = ourmapping;
+	RULEHD	*rp = ourmapping;
 
 	if (rp == NULL) {		/* no rule set */
 		if (matname[0])
@@ -378,8 +381,8 @@ char *
 getonm(void)				/* invent a good name for object */
 {
 	static char	name[64];
-	register char	*cp1, *cp2;
-	register int	i;
+	char	*cp1, *cp2;
+	int	i;
 					/* check for preset */
 	if (objname[0])
 		return(objname);
@@ -402,12 +405,12 @@ getonm(void)				/* invent a good name for object */
 
 int
 matchrule(				/* check for a match on this rule */
-	register RULEHD	*rp
+	RULEHD	*rp
 )
 {
 	ID	tmpid;
 	int	gotmatch;
-	register int	i;
+	int	i;
 
 	if (rp->qflg & FL(Q_MTL)) {
 		if (!matname[0])
@@ -455,8 +458,8 @@ matchrule(				/* check for a match on this rule */
 
 int
 cvtndx(				/* convert vertex string to index */
-	register VNDX	vi,
-	register char	*vs
+	VNDX	vi,
+	char	*vs
 )
 {
 					/* get point */
@@ -498,21 +501,24 @@ cvtndx(				/* convert vertex string to index */
 			return(0);
 	} else
 		vi[2] = -1;
+					/* zero normal is not normal */
+	if (vi[2] >= 0 && DOT(vnlist[vi[2]],vnlist[vi[2]]) <= FTINY)
+		vi[2] = -1;
 	return(1);
 }
 
 
 int
 nonplanar(			/* are vertices non-planar? */
-	register int	ac,
-	register char	**av
+	int	ac,
+	char	**av
 )
 {
 	VNDX	vi;
 	RREAL	*p0, *p1;
 	FVECT	v1, v2, nsum, newn;
 	double	d;
-	register int	i;
+	int	i;
 
 	if (!cvtndx(vi, av[0]))
 		return(0);
@@ -558,12 +564,12 @@ nonplanar(			/* are vertices non-planar? */
 int
 putface(				/* put out an N-sided polygon */
 	int	ac,
-	register char	**av
+	char	**av
 )
 {
 	VNDX	vi;
 	char	*cp;
-	register int	i;
+	int	i;
 
 	if (nonplanar(ac, av)) {	/* break into triangles */
 		while (ac > 2) {
@@ -578,7 +584,7 @@ putface(				/* put out an N-sided polygon */
 		return(1);
 	}
 	if ((cp = getmtl()) == NULL)
-		return(0);
+		return(-1);
 	printf("\n%s polygon %s.%d\n", cp, getonm(), faceno);
 	printf("0\n0\n%d\n", 3*ac);
 	for (i = 0; i < ac; i++) {
@@ -603,10 +609,10 @@ puttri(			/* put out a triangle */
 	RREAL	bcoor[3][3];
 	int	texOK = 0, patOK;
 	int	flatness;
-	register int	i;
+	int	i;
 
 	if ((mod = getmtl()) == NULL)
-		return(0);
+		return(-1);
 
 	if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3))
 		return(0);
@@ -753,8 +759,7 @@ newvn(			/* create a new vertex normal */
 	vnlist[nvns][0] = x;
 	vnlist[nvns][1] = y;
 	vnlist[nvns][2] = z;
-	if (normalize(vnlist[nvns]) == 0.0)
-		return(0);
+	n0norm += (normalize(vnlist[nvns]) == 0.0);
 	return(++nvns);
 }