--- ray/src/gen/mkillum.c	1991/07/23 12:00:29	1.1
+++ ray/src/gen/mkillum.c	2009/12/12 19:00:59	2.36
@@ -1,156 +1,159 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: mkillum.c,v 2.36 2009/12/12 19:00:59 greg Exp $";
 #endif
-
 /*
  * Make illum sources for optimizing rendering process
  */
 
-#include  "standard.h"
+#include  <signal.h>
+#include  <ctype.h>
 
-#include  "object.h"
+#include  "mkillum.h"
 
-#include  "otypes.h"
-
 				/* default parameters */
-#define  SAMPDENS	128		/* points per projected steradian */
+#define  SAMPDENS	48		/* points per projected steradian */
 #define  NSAMPS		32		/* samples per point */
 #define  DFLMAT		"illum_mat"	/* material name */
+#define  DFLDAT		"illum"		/* data file name */
 				/* selection options */
 #define  S_NONE		0		/* select none */
 #define  S_ELEM		1		/* select specified element */
 #define  S_COMPL	2		/* select all but element */
 #define  S_ALL		3		/* select all */
 
-				/* rtrace command and defaults */
-char  *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-ab", "2",
-		"-ad", "256", "-as", "128", "-aa", ".15" };
-int  rtargc = 13;
-				/* overriding rtrace options */
-char  *myrtopts[] = { "-I-", "-i-", "-di+", "-ov", "-h-", "-fff", NULL };
+struct illum_args  thisillum = {	/* our illum and default values */
+		0,
+		UDzpos,
+		0.,
+		DFLMAT,
+		DFLDAT,
+		0,
+		VOIDID,
+		SAMPDENS,
+		NSAMPS,
+		NULL,
+		0.,
+	};
 
-				/* illum flags */
-#define  IL_FLAT	0x1		/* flat surface */
-#define  IL_LIGHT	0x2		/* light rather than illum */
-#define  IL_COLDST	0x4		/* colored distribution */
-#define  IL_COLAVG	0x8		/* compute average color */
-#define  IL_DATCLB	0x10		/* OK to clobber data file */
-
-struct illum_args {
-	int	flags;			/* flags from list above */
-	char	matname[MAXSTR];	/* illum material name */
-	char	datafile[MAXSTR];	/* distribution data file name */
-	int	dfnum;			/* data file number */
-	char	altmatname[MAXSTR];	/* alternate material name */
-	int	nsamps;			/* # of samples in each direction */
-	int	nalt, nazi;		/* # of altitude and azimuth angles */
-	FVECT	orient;			/* coordinate system orientation */
-} thisillum = {			/* default values */
-	0,
-	DFLMAT,
-	DFLMAT,
-	0,
-	VOIDID,
-	NSAMPS,
-};
-
-int	sampdens = SAMPDENS;	/* sample point density */
 char	matcheck[MAXSTR];	/* current material to include or exclude */
 int	matselect = S_ALL;	/* selection criterion */
 
-int	rt_pd[3];		/* rtrace pipe descriptors */
-float	*rt_buf;		/* rtrace i/o buffer */
-int	rt_bsiz;		/* maximum rays for rtrace buffer */
-int	rt_nrays;		/* current length of rtrace buffer */
-
 int	gargc;			/* global argc */
 char	**gargv;		/* global argv */
-#define  progname	gargv[0]
 
 int	doneheader = 0;		/* printed header yet? */
+#define  checkhead()	if (!doneheader++) printhead(gargc,gargv)
 
-extern char	*fgetline(), *fgetword(), *sskip(), 
-		*atos(), *iskip(), *fskip();
-extern FILE	*popen();
+int	warnings = 1;		/* print warnings? */
 
+void init(char *octnm, int np);
+void filter(register FILE	*infp, char	*name);
+void xoptions(char	*s, char	*nm);
+void printopts(void);
+void printhead(register int  ac, register char  **av);
+void xobject(FILE  *fp, char  *nm);
 
-main(argc, argv)		/* compute illum distributions using rtrace */
-int	argc;
-char	*argv[];
+
+int
+main(		/* compute illum distributions using rtrace */
+	int	argc,
+	char	*argv[]
+)
 {
-	extern char	*getenv(), *getpath();
-	char	*rtpath;
+	int	nprocs = 1;
+	FILE	*fp;
+	int	rval;
 	register int	i;
 				/* set global arguments */
-	gargc = argc; gargv = argv;
-				/* set up rtrace command */
-	if (argc < 2)
-		error(USER, "too few arguments");
-	for (i = 1; i < argc-1; i++)
-		rtargv[rtargc++] = argv[i];
-	for (i = 0; myrtopts[i] != NULL; i++)
-		rtargv[rtargc++] = myrtopts[i];
-	rtargv[rtargc++] = argv[argc-1];
-	rtargv[rtargc] = NULL;
-				/* just asking for defaults? */
-	if (!strcmp(argv[argc-1], "-defaults")) {
-		rtpath = getpath(rtargv[0], getenv("PATH"), X_OK);
-		if (rtpath == NULL) {
-			eputs(rtargv[0]);
-			eputs(": command not found\n");
-			exit(1);
+	gargv = argv;
+	progname = gargv[0];
+				/* set up rendering defaults */
+	dstrsrc = 0.5;
+	directrelay = 3;
+	directvis = 0;
+	ambounce = 2;
+				/* get options from command line */
+	for (i = 1; i < argc; i++) {
+		while ((rval = expandarg(&argc, &argv, i)) > 0)
+			;
+		if (rval < 0) {
+			sprintf(errmsg, "cannot expand '%s'", argv[i]);
+			error(SYSTEM, errmsg);
 		}
-		execv(rtpath, rtargv);
-		perror(rtpath);
-		exit(1);
+		if (argv[i][0] != '-')
+			break;
+		if (!strcmp(argv[i], "-w")) {
+			warnings = 0;
+			continue;
+		}
+		if (!strcmp(argv[i], "-n")) {
+			nprocs = atoi(argv[++i]);
+			if (nprocs <= 0)
+				error(USER, "illegal number of processes");
+			continue;
+		}
+		if (!strcmp(argv[i], "-defaults")) {
+			printopts();
+			print_rdefaults();
+			quit(0);
+		}
+		rval = getrenderopt(argc-i, argv+i);
+		if (rval < 0) {
+			sprintf(errmsg, "bad render option at '%s'", argv[i]);
+			error(USER, errmsg);
+		}
+		i += rval;
 	}
+	gargc = ++i;
+				/* add "mandatory" render options */
+	do_irrad = 0;
+	if (gargc > argc || argv[gargc-1][0] == '-')
+		error(USER, "missing octree argument");
 				/* else initialize and run our calculation */
-	init();
-	mkillum(stdin, "standard input");
-	exit(cleanup());	/* cleanup returns rtrace status */
+	init(argv[gargc-1], nprocs);
+	if (gargc < argc) {
+		if (gargc == argc-1 || argv[gargc][0] != '<' || argv[gargc][1])
+			error(USER, "use '< file1 file2 ..' for multiple inputs");
+		for (i = gargc+1; i < argc; i++) {
+			if ((fp = fopen(argv[i], "r")) == NULL) {
+				sprintf(errmsg,
+				"cannot open scene file \"%s\"", argv[i]);
+				error(SYSTEM, errmsg);
+			}
+			filter(fp, argv[i]);
+			fclose(fp);
+		}
+	} else
+		filter(stdin, "standard input");
+	quit(0);
+	return 0; /* pro forma return */
 }
 
 
-init()				/* start rtrace and set up buffers */
+void
+init(char *octnm, int np)		/* start rendering process(es) */
 {
-	int	maxbytes;
-
-	maxbytes = open_process(rt_pd, rtargv);
-	if (maxbytes == 0) {
-		eputs(rtargv[0]);
-		eputs(": command not found\n");
-		exit(1);
-	}
-	if (maxbytes < 0)
-		error(SYSTEM, "cannot start rtrace process");
-	rt_bsiz = maxbytes/(6*sizeof(float));
-	rt_buf = (float *)malloc(rt_bsiz*(6*sizeof(float)));
-	if (rt_buf == NULL)
-		error(SYSTEM, "out of memory in init");
-	rt_bsiz--;			/* allow for flush ray */
-	rt_nrays = 0;
+					/* set up signal handling */
+	signal(SIGINT, quit);
+#ifdef SIGHUP
+	signal(SIGHUP, quit);
+#endif
+#ifdef SIGTERM
+	signal(SIGTERM, quit);
+#endif
+#ifdef SIGPIPE
+	signal(SIGPIPE, quit);
+#endif
+					/* start rendering process(es) */
+	ray_pinit(octnm, np);
 }
 
 
-int
-cleanup()			/* close rtrace process and return status */
+void
+eputs(				/* put string to stderr */
+	register char  *s
+)
 {
-	int	status;
-
-	free((char *)rt_buf);
-	rt_bsiz = 0;
-	status = close_process(rt_pd);
-	if (status < 0)
-		return(0);		/* unknown status */
-	return(status);
-}
-
-
-eputs(s)				/* put string to stderr */
-register char  *s;
-{
 	static int  midline = 0;
 
 	if (!*s) return;
@@ -163,10 +166,31 @@ register char  *s;
 }
 
 
-mkillum(infp, name)		/* process stream */
-register FILE	*infp;
-char	*name;
+void
+wputs(s)			/* print warning if enabled */
+char  *s;
 {
+	if (warnings)
+		eputs(s);
+}
+
+
+void
+quit(ec)			/* make sure exit is called */
+int	ec;
+{
+	if (ray_pnprocs > 0)	/* close children if any */
+		ray_pclose(0);		
+	exit(ec);
+}
+
+
+void
+filter(		/* process stream */
+	register FILE	*infp,
+	char	*name
+)
+{
 	char	buf[512];
 	FILE	*pfp;
 	register int	c;
@@ -177,8 +201,7 @@ char	*name;
 		if (c == '#') {				/* comment/options */
 			buf[0] = c;
 			fgets(buf+1, sizeof(buf)-1, infp);
-			fputs(buf, stdout);
-			getoptions(buf, name);
+			xoptions(buf, name);
 		} else if (c == '!') {			/* command */
 			buf[0] = c;
 			fgetline(buf+1, sizeof(buf)-1, infp);
@@ -186,7 +209,7 @@ char	*name;
 				sprintf(errmsg, "cannot execute \"%s\"", buf);
 				error(SYSTEM, errmsg);
 			}
-			mkillum(pfp, buf);
+			filter(pfp, buf);
 			pclose(pfp);
 		} else {				/* object */
 			ungetc(c, infp);
@@ -196,30 +219,37 @@ char	*name;
 }
 
 
-getoptions(s, nm)		/* get options from string s */
-char	*s;
-char	*nm;
+void
+xoptions(			/* process options in string s */
+	char	*s,
+	char	*nm
+)
 {
 	extern FILE	*freopen();
 	char	buf[64];
+	int	negax;
 	int	nerrs = 0;
 	register char	*cp;
 
-	if (strncmp(s, "#@mkillum", 9) || !isspace(s[9]))
+	if (strncmp(s, "#@mkillum", 9) || !isspace(s[9])) {
+		fputs(s, stdout);		/* not for us */
 		return;
+	}
 	cp = s+10;
 	while (*cp) {
 		switch (*cp) {
 		case ' ':
 		case '\t':
 		case '\n':
+		case '\r':
+		case '\f':
 			cp++;
 			continue;
 		case 'm':			/* material name */
-			cp++;
-			if (*cp != '=')
+			if (*++cp != '=')
 				break;
-			cp++;
+			if (!*++cp || isspace(*cp))
+				break;
 			atos(thisillum.matname, MAXSTR, cp);
 			cp = sskip(cp);
 			if (!(thisillum.flags & IL_DATCLB)) {
@@ -228,11 +258,11 @@ char	*nm;
 			}
 			continue;
 		case 'f':			/* data file name */
-			cp++;
-			if (*cp != '=')
+			if (*++cp != '=')
 				break;
-			cp++;
-			if (*cp == '\0') {
+			if (!*++cp || isspace(*cp)) {
+				strcpy(thisillum.datafile,thisillum.matname);
+				thisillum.dfnum = 0;
 				thisillum.flags &= ~IL_DATCLB;
 				continue;
 			}
@@ -243,10 +273,10 @@ char	*nm;
 			continue;
 		case 'i':			/* include material */
 		case 'e':			/* exclude material */
-			matselect = (*cp++ == 'i') ? S_ELEM : S_COMPL;
-			if (*cp != '=')
+			if (cp[1] != '=')
 				break;
-			cp++;
+			matselect = (*cp == 'i') ? S_ELEM : S_COMPL;
+			cp += 2;
 			atos(matcheck, MAXSTR, cp);
 			cp = sskip(cp);
 			continue;
@@ -259,18 +289,15 @@ char	*nm;
 			matselect = S_NONE;
 			continue;
 		case 'c':			/* color calculation */
-			cp++;
-			if (*cp != '=')
+			if (*++cp != '=')
 				break;
-			cp++;
-			switch (*cp) {
+			switch (*++cp) {
 			case 'a':			/* average */
-				thisillum.flags |= IL_COLAVG;
-				thisillum.flags &= ~IL_COLDST;
+				thisillum.flags = (thisillum.flags|IL_COLAVG)
+							& ~IL_COLDST;
 				break;
 			case 'd':			/* distribution */
-				thisillum.flags |= IL_COLDST;
-				thisillum.flags &= ~IL_COLAVG;
+				thisillum.flags |= (IL_COLDST|IL_COLAVG);
 				break;
 			case 'n':			/* none */
 				thisillum.flags &= ~(IL_COLAVG|IL_COLDST);
@@ -280,31 +307,58 @@ char	*nm;
 			}
 			cp = sskip(cp);
 			continue;
-		case 'd':			/* point sample density */
-			cp++;
-			if (*cp != '=')
+		case 'd':			/* sample density / BSDF data */
+			if (*++cp != '=')
 				break;
-			cp++;
-			if (!isintd(cp, " \t\n"))
+			if (thisillum.sd != NULL) {
+				free_BSDF(thisillum.sd);
+				thisillum.sd = NULL;
+			}
+			if (!*++cp || isspace(*cp))
+				continue;
+			if (isintd(cp, " \t\n\r")) {
+				thisillum.sampdens = atoi(cp);
+			} else {
+				atos(buf, sizeof(buf), cp);
+				thisillum.sd = load_BSDF(buf);
+				if (thisillum.sd == NULL)
+					break;
+			}
+			cp = sskip(cp);
+			continue;
+		case 's':			/* surface super-samples */
+			if (*++cp != '=')
 				break;
-			sampdens = atoi(cp);
+			if (!isintd(++cp, " \t\n\r"))
+				break;
+			thisillum.nsamps = atoi(cp);
 			cp = sskip(cp);
 			continue;
-		case 's':			/* point super-samples */
+		case 'l':			/* light sources */
 			cp++;
-			if (*cp != '=')
+			if (*cp == '+')
+				thisillum.flags |= IL_LIGHT;
+			else if (*cp == '-')
+				thisillum.flags &= ~IL_LIGHT;
+			else
 				break;
 			cp++;
-			if (!isintd(cp, " \t\n"))
+			continue;
+		case 'b':			/* brightness */
+			if (*++cp != '=')
 				break;
-			thisillum.nsamps = atoi(cp);
+			if (!isfltd(++cp, " \t\n\r"))
+				break;
+			thisillum.minbrt = atof(cp);
+			if (thisillum.minbrt < 0.)
+				thisillum.minbrt = 0.;
 			cp = sskip(cp);
 			continue;
 		case 'o':			/* output file */
-			cp++;
-			if (*cp != '=')
+			if (*++cp != '=')
 				break;
-			cp++;
+			if (!*++cp || isspace(*cp))
+				break;
 			atos(buf, sizeof(buf), cp);
 			cp = sskip(cp);
 			if (freopen(buf, "w", stdout) == NULL) {
@@ -314,15 +368,211 @@ char	*nm;
 			}
 			doneheader = 0;
 			continue;
+		case 'u':			/* up direction */
+			if (*++cp != '=')
+				break;
+			if (!*++cp || isspace(*cp)) {
+				thisillum.udir = UDunknown;
+				continue;
+			}
+			negax = 0;
+			if (*cp == '+')
+				cp++;
+			else if (*cp == '-') {
+				negax++;
+				cp++;
+			}
+			switch (*cp++) {
+			case 'x':
+			case 'X':
+				thisillum.udir = negax ? UDxneg : UDxpos;
+				break;
+			case 'y':
+			case 'Y':
+				thisillum.udir = negax ? UDyneg : UDypos;
+				break;
+			case 'z':
+			case 'Z':
+				thisillum.udir = negax ? UDzneg : UDzpos;
+				break;
+			default:
+				thisillum.udir = UDunknown;
+				break;
+			}
+			if (thisillum.udir == UDunknown || !isspace(*cp))
+				break;
+			continue;
+		case 't':			/* object thickness */
+			if (*++cp != '=')
+				break;
+			if (!isfltd(++cp, " \t\n\r"))
+				break;
+			thisillum.thick = atof(cp);
+			if (thisillum.thick < .0)
+				thisillum.thick = .0;
+			cp = sskip(cp);
+			continue;
+		case '!':			/* processed file! */
+			sprintf(errmsg, "(%s): already processed!", nm);
+			error(WARNING, errmsg);
+			matselect = S_NONE;
+			return;
 		}
 	opterr:					/* skip faulty option */
-		cp = sskip(cp);
+		while (*cp && !isspace(*cp))
+			cp++;
 		nerrs++;
 	}
+						/* print header? */
+	checkhead();
+						/* issue warnings? */
 	if (nerrs) {
 		sprintf(errmsg, "(%s): %d error(s) in option line:",
 				nm, nerrs);
 		error(WARNING, errmsg);
-		eputs(s);
+		wputs(s);
+		printf("# %s: the following option line has %d error(s):\n",
+				progname, nerrs);
 	}
+						/* print pure comment */
+	printf("# %s", s+2);
+}
+
+void
+printopts(void)			/* print out option default values */
+{
+	printf("m=%-15s\t\t# material name\n", thisillum.matname);
+	printf("f=%-15s\t\t# data file name\n", thisillum.datafile);
+	if (thisillum.flags & IL_COLAVG)
+		if (thisillum.flags & IL_COLDST)
+			printf("c=d\t\t\t\t# color distribution\n");
+		else
+			printf("c=a\t\t\t\t# color average\n");
+	else
+		printf("c=n\t\t\t\t# color none\n");
+	if (thisillum.flags & IL_LIGHT)
+		printf("l+\t\t\t\t# light type on\n");
+	else
+		printf("l-\t\t\t\t# light type off\n");
+	printf("d=%d\t\t\t\t# density of directions\n", thisillum.sampdens);
+	printf("s=%d\t\t\t\t# samples per direction\n", thisillum.nsamps);
+	printf("b=%f\t\t\t# minimum average brightness\n", thisillum.minbrt);
+	switch (thisillum.udir) {
+	case UDzneg:
+		fputs("u=-Z\t\t\t\t# up is negative Z\n", stdout);
+		break;
+	case UDyneg:
+		fputs("u=-Y\t\t\t\t# up is negative Y\n", stdout);
+		break;
+	case UDxneg:
+		fputs("u=-X\t\t\t\t# up is negative X\n", stdout);
+		break;
+	case UDxpos:
+		fputs("u=+X\t\t\t\t# up is positive X\n", stdout);
+		break;
+	case UDypos:
+		fputs("u=+Y\t\t\t\t# up is positive Y\n", stdout);
+		break;
+	case UDzpos:
+		fputs("u=+Z\t\t\t\t# up is positive Z\n", stdout);
+		break;
+	case UDunknown:
+		break;
+	}
+	printf("t=%f\t\t\t# object thickness\n", thisillum.thick);
+}
+
+
+void
+printhead(			/* print out header */
+	register int  ac,
+	register char  **av
+)
+{
+	putchar('#');
+	while (ac-- > 0) {
+		putchar(' ');
+		fputs(*av++, stdout);
+	}
+	fputs("\n#@mkillum !\n", stdout);
+}
+
+
+void
+xobject(				/* translate an object from fp */
+	FILE  *fp,
+	char  *nm
+)
+{
+	OBJREC  thisobj;
+	char  str[MAXSTR];
+	int  doit;
+					/* read the object */
+	if (fgetword(thisillum.altmat, MAXSTR, fp) == NULL)
+		goto readerr;
+	if (fgetword(str, MAXSTR, fp) == NULL)
+		goto readerr;
+					/* is it an alias? */
+	if (!strcmp(str, ALIASKEY)) {
+		if (fgetword(str, MAXSTR, fp) == NULL)
+			goto readerr;
+		printf("\n%s %s %s", thisillum.altmat, ALIASKEY, str);
+		if (fgetword(str, MAXSTR, fp) == NULL)
+			goto readerr;
+		printf("\t%s\n", str);
+		return;
+	}
+	thisobj.omod = OVOID;		/* unused field */
+	if ((thisobj.otype = otype(str)) < 0) {
+		sprintf(errmsg, "(%s): unknown type \"%s\"", nm, str);
+		error(USER, errmsg);
+	}
+	if (fgetword(str, MAXSTR, fp) == NULL)
+		goto readerr;
+	thisobj.oname = str;
+	if (readfargs(&thisobj.oargs, fp) != 1)
+		goto readerr;
+	thisobj.os = NULL;
+					/* check for translation */
+	switch (matselect) {
+	case S_NONE:
+		doit = 0;
+		break;
+	case S_ALL:
+		doit = 1;
+		break;
+	case S_ELEM:
+		doit = !strcmp(thisillum.altmat, matcheck);
+		break;
+	case S_COMPL:
+		doit = strcmp(thisillum.altmat, matcheck);
+		break;
+	}
+	doit = doit && issurface(thisobj.otype);
+						/* print header? */
+	checkhead();
+						/* process object */
+	if (doit)
+		switch (thisobj.otype) {
+		case OBJ_FACE:
+			my_face(&thisobj, &thisillum, nm);
+			break;
+		case OBJ_SPHERE:
+			my_sphere(&thisobj, &thisillum, nm);
+			break;
+		case OBJ_RING:
+			my_ring(&thisobj, &thisillum, nm);
+			break;
+		default:
+			my_default(&thisobj, &thisillum, nm);
+			break;
+		}
+	else
+		printobj(thisillum.altmat, &thisobj);
+						/* free arguments */
+	freefargs(&thisobj.oargs);
+	return;
+readerr:
+	sprintf(errmsg, "(%s): error reading input", nm);
+	error(USER, errmsg);
 }