--- ray/src/cv/rad2mgf.c	2003/06/08 12:03:09	2.17
+++ ray/src/cv/rad2mgf.c	2005/12/28 18:39:07	2.25
@@ -1,26 +1,24 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rad2mgf.c,v 2.17 2003/06/08 12:03:09 schorsch Exp $";
+static const char	RCSid[] = "$Id: rad2mgf.c,v 2.25 2005/12/28 18:39:07 greg Exp $";
 #endif
 /*
  * Convert Radiance scene description to MGF
  */
 
-#include "standard.h"
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "platform.h"
+#include "rtmath.h"
+#include "rtio.h"
+#include "rtprocess.h"
 #include "object.h"
 #include "color.h"
 #include "lookup.h"
 
 #define C_1SIDEDTHICK	0.005
 
-int	o_face(), o_cone(), o_sphere(), o_ring(), o_cylinder();
-int	o_instance(), o_illum();
-int	o_plastic(), o_metal(), o_glass(), o_dielectric(),
-	o_mirror(), o_trans(), o_light();
 
 LUTAB	rmats = LU_SINIT(free,NULL);		/* defined material table */
 
@@ -53,10 +51,39 @@ struct vert {
 
 LUTAB	vertab = LU_SINIT(free,NULL);	/* our vertex lookup table */
 
+void rad2mgf(char *inp);
+void cvtprim(char *inp, char *mod, char *typ, char *id, FUNARGS *fa);
+void newmat(char *id, char *alias);
+void setmat(char *id);
+void setobj(char *id);
+void init(void);
+void uninit(void);
+void clrverts(void);
+void unspace(char *s);
+void add2dispatch(char *name, int (*func)());
+char *getvertid(char *vname, FVECT vp);
+int o_unsupported(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_face(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_cone(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_sphere(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_cylinder(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_ring(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_instance(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_illum(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_plastic(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_metal(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_glass(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_dielectric(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_mirror(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_trans(char *mod, char *typ, char *id, FUNARGS *fa);
+int o_light(char *mod, char *typ, char *id, FUNARGS *fa);
 
-main(argc, argv)
-int	argc;
-char	**argv;
+
+int
+main(
+	int	argc,
+	char	**argv
+)
 {
 	int	i;
 
@@ -97,14 +124,13 @@ unkopt:
 }
 
 
-rad2mgf(inp)		/* convert a Radiance file to MGF */
-char	*inp;
+void
+rad2mgf(		/* convert a Radiance file to MGF */
+	char	*inp
+)
 {
-#define mod	buf
-#define typ	(buf+128)
-#define id	(buf+256)
-#define alias	(buf+384)
-	char	buf[512];
+	char  buf[512];
+	char  mod[128], typ[32], id[128], alias[128];
 	FUNARGS	fa;
 	register FILE	*fp;
 	register int	c;
@@ -143,14 +169,19 @@ char	*inp;
 			break;
 		default:		/* Radiance primitive */
 			ungetc(c, fp);
-			if (fscanf(fp, "%s %s %s", mod, typ, id) != 3) {
+			if (fgetword(mod, sizeof(mod), fp) == NULL ||
+					fgetword(typ, sizeof(typ), fp) == NULL ||
+					fgetword(id, sizeof(id), fp) == NULL) {
 				fputs(inp, stderr);
 				fputs(": unexpected EOF\n", stderr);
 				exit(1);
 			}
+			unspace(mod);
+			unspace(id);
 			if (!strcmp(typ, "alias")) {
 				strcpy(alias, "EOF");
-				fscanf(fp, "%s", alias);
+				fgetword(alias, sizeof(alias), fp);
+				unspace(alias);
 				newmat(id, alias);
 			} else {
 				if (!readfargs(&fa, fp)) {
@@ -169,23 +200,37 @@ char	*inp;
 		pclose(fp);
 	else
 		fclose(fp);
-#undef mod
-#undef typ
-#undef id
-#undef alias
 }
 
 
-cvtprim(inp, mod, typ, id, fa)	/* process Radiance primitive */
-char	*inp, *mod, *typ, *id;
-FUNARGS	*fa;
+void
+unspace(	/* replace spaces with underscores in s */
+	char *s
+)
 {
+	while (*s) {
+		if (isspace(*s))
+			*s = '_';
+		++s;
+	}
+}
+
+
+void
+cvtprim(	/* process Radiance primitive */
+	char	*inp,
+	char	*mod,
+	char	*typ,
+	char	*id,
+	FUNARGS	*fa
+)
+{
 	int	(*df)();
 
 	df = (int (*)())lu_find(&rdispatch, typ)->data;
 	if (df != NULL) {				/* convert */
 		if ((*df)(mod, typ, id, fa) < 0) {
-			fprintf(stderr, "%s: bad %s \"%s\"\n", typ, id);
+			fprintf(stderr, "%s: bad %s \"%s\"\n", "rad2mgf", typ, id);
 			exit(1);
 		}
 	} else {					/* unsupported */
@@ -196,9 +241,11 @@ FUNARGS	*fa;
 }
 
 
-newmat(id, alias)		/* add a modifier to the alias list */
-char	*id;
-char	*alias;
+void
+newmat(		/* add a modifier to the alias list */
+	char	*id,
+	char	*alias
+)
 {
 	register LUENT	*lp, *lpa;
 
@@ -232,8 +279,10 @@ memerr:
 }
 
 
-setmat(id)			/* set material to this one */
-char	*id;
+void
+setmat(			/* set material to this one */
+	char	*id
+)
 {
 	if (!strcmp(id, curmat))	/* already set? */
 		return;
@@ -244,8 +293,10 @@ char	*id;
 }
 
 
-setobj(id)			/* set object name to this one */
-char	*id;
+void
+setobj(			/* set object name to this one */
+	char	*id
+)
 {
 	register char	*cp, *cp2;
 	char	*end = NULL;
@@ -263,7 +314,7 @@ char	*id;
 		*cp2++ = 'O';
 	}
 	for (cp = id; cp < end; *cp2++ = *cp++) {
-		if (*cp < '!' | *cp > '~')	/* limit to visible chars */
+		if ((*cp < '!') | (*cp > '~'))	/* limit to visible chars */
 			*cp = '?';
 		diff += *cp != *cp2;
 	}
@@ -275,7 +326,8 @@ char	*id;
 }
 
 
-init()			/* initialize dispatch table and output */
+void
+init(void)			/* initialize dispatch table and output */
 {
 	lu_init(&vertab, NVERTS);
 	lu_init(&rdispatch, 22);
@@ -288,6 +340,7 @@ init()			/* initialize dispatch table and output */
 	add2dispatch("tube", o_cylinder);
 	add2dispatch("ring", o_ring);
 	add2dispatch("instance", o_instance);
+	add2dispatch("mesh", o_instance);
 	add2dispatch("plastic", o_plastic);
 	add2dispatch("plastic2", o_plastic);
 	add2dispatch("metal", o_metal);
@@ -308,7 +361,8 @@ init()			/* initialize dispatch table and output */
 }
 
 
-uninit()			/* mark end of MGF file */
+void
+uninit(void)			/* mark end of MGF file */
 {
 	puts("o");
 	if (hasmult)
@@ -320,7 +374,8 @@ uninit()			/* mark end of MGF file */
 }
 
 
-clrverts()			/* clear vertex table */
+void
+clrverts(void)			/* clear vertex table */
 {
 	register int	i;
 
@@ -331,9 +386,11 @@ clrverts()			/* clear vertex table */
 }
 
 
-add2dispatch(name, func)	/* add function to dispatch table */
-char	*name;
-int	(*func)();
+void
+add2dispatch(	/* add function to dispatch table */
+	char	*name,
+	int	(*func)()
+)
 {
 	register LUENT	*lp;
 
@@ -349,9 +406,10 @@ int	(*func)();
 
 
 char *
-getvertid(vname, vp)		/* get/set vertex ID for this point */
-char	*vname;
-FVECT	vp;
+getvertid(		/* get/set vertex ID for this point */
+	char	*vname,
+	FVECT	vp
+)
 {
 	static char	vkey[VKLEN];
 	register LUENT	*lp;
@@ -393,9 +451,12 @@ memerr:
 
 
 int
-o_unsupported(mod, typ, id, fa)		/* mark unsupported primitive */
-char	*mod, *typ, *id;
-FUNARGS	*fa;
+o_unsupported(		/* mark unsupported primitive */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	FUNARGS	*fa
+)
 {
 	register int	i;
 
@@ -420,15 +481,18 @@ FUNARGS	*fa;
 
 
 int
-o_face(mod, typ, id, fa)		/* print out a polygon */
-char	*mod, *typ, *id;
-FUNARGS	*fa;
+o_face(		/* print out a polygon */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	FUNARGS	*fa
+)
 {
 	char	entbuf[2048], *linestart;
 	register char	*cp;
 	register int	i;
 
-	if (fa->nfargs < 9 | fa->nfargs % 3)
+	if ((fa->nfargs < 9) | (fa->nfargs % 3))
 		return(-1);
 	setmat(mod);
 	setobj(id);
@@ -451,9 +515,12 @@ FUNARGS	*fa;
 
 
 int
-o_cone(mod, typ, id, fa)	/* print out a cone */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_cone(	/* print out a cone */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	char	v1[6], v2[6];
 
@@ -474,9 +541,12 @@ register FUNARGS	*fa;
 
 
 int
-o_sphere(mod, typ, id, fa)	/* print out a sphere */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_sphere(	/* print out a sphere */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	char	cent[6];
 
@@ -491,9 +561,12 @@ register FUNARGS	*fa;
 
 
 int
-o_cylinder(mod, typ, id, fa)	/* print out a cylinder */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_cylinder(	/* print out a cylinder */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	char	v1[6], v2[6];
 
@@ -510,9 +583,12 @@ register FUNARGS	*fa;
 
 
 int
-o_ring(mod, typ, id, fa)	/* print out a ring */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_ring(	/* print out a ring */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	if (fa->nfargs != 8)
 		return(-1);
@@ -533,9 +609,12 @@ register FUNARGS	*fa;
 
 
 int
-o_instance(mod, typ, id, fa)	/* convert an instance */
-char	*mod, *typ, *id;
-FUNARGS	*fa;
+o_instance(	/* convert an instance (or mesh) */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	FUNARGS	*fa
+)
 {
 	register int	i;
 	register char	*cp;
@@ -574,9 +653,12 @@ FUNARGS	*fa;
 
 
 int
-o_illum(mod, typ, id, fa)	/* convert an illum material */
-char	*mod, *typ, *id;
-FUNARGS	*fa;
+o_illum(	/* convert an illum material */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	FUNARGS	*fa
+)
 {
 	if (fa->nsargs == 1 && strcmp(fa->sarg[0], VOIDID)) {
 		newmat(id, fa->sarg[0]);	/* just create alias */
@@ -590,9 +672,12 @@ FUNARGS	*fa;
 
 
 int
-o_plastic(mod, typ, id, fa)	/* convert a plastic material */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_plastic(	/* convert a plastic material */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	COLOR	cxyz, rrgb;
 	double	d;
@@ -618,9 +703,12 @@ register FUNARGS	*fa;
 
 
 int
-o_metal(mod, typ, id, fa)	/* convert a metal material */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_metal(	/* convert a metal material */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	COLOR	cxyz, rrgb;
 	double	d;
@@ -644,9 +732,12 @@ register FUNARGS	*fa;
 
 
 int
-o_glass(mod, typ, id, fa)	/* convert a glass material */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_glass(	/* convert a glass material */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	COLOR	cxyz, rrgb, trgb;
 	double	nrfr = 1.52, F, d;
@@ -683,9 +774,12 @@ register FUNARGS	*fa;
 
 
 int
-o_dielectric(mod, typ, id, fa)	/* convert a dielectric material */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_dielectric(	/* convert a dielectric material */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	COLOR	cxyz, trgb;
 	double	F, d;
@@ -713,9 +807,12 @@ register FUNARGS	*fa;
 
 
 int
-o_mirror(mod, typ, id, fa)	/* convert a mirror material */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_mirror(	/* convert a mirror material */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	COLOR	cxyz, rrgb;
 	double	d;
@@ -739,9 +836,12 @@ register FUNARGS	*fa;
 
 
 int
-o_trans(mod, typ, id, fa)	/* convert a trans material */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_trans(	/* convert a trans material */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	COLOR	cxyz, rrgb;
 	double	rough, trans, tspec, d;
@@ -778,9 +878,12 @@ register FUNARGS	*fa;
 
 
 int
-o_light(mod, typ, id, fa)		/* convert a light type */
-char	*mod, *typ, *id;
-register FUNARGS	*fa;
+o_light(		/* convert a light type */
+	char	*mod,
+	char	*typ,
+	char	*id,
+	register FUNARGS	*fa
+)
 {
 	COLOR	cxyz, rrgb;
 	double	d;