--- ray/src/gen/mkillum.c	1991/07/25 12:52:16	1.7
+++ ray/src/gen/mkillum.c	2009/06/06 05:03:47	2.35
@@ -1,107 +1,119 @@
-/* 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.35 2009/06/06 05:03:47 greg Exp $";
 #endif
-
 /*
  * Make illum sources for optimizing rendering process
  */
 
-#include  "mkillum.h"
-
 #include  <signal.h>
-
 #include  <ctype.h>
 
+#include  "mkillum.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", "-di+",
-		"-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", };
-int  rtargc = 14;
-				/* overriding rtrace options */
-char  *myrtopts[] = { "-I-", "-i-", "-ov", "-h-", "-fff", NULL };
-
-struct rtproc	rt;		/* our rtrace process */
-
 struct illum_args  thisillum = {	/* our illum and default values */
 		0,
+		UDzpos,
+		0.,
 		DFLMAT,
-		DFLMAT,
+		DFLDAT,
 		0,
 		VOIDID,
 		SAMPDENS,
 		NSAMPS,
+		NULL,
+		0.,
 	};
 
 char	matcheck[MAXSTR];	/* current material to include or exclude */
 int	matselect = S_ALL;	/* selection criterion */
 
-FUN	ofun[NUMOTYPE] = INIT_OTYPE;	/* object types */
-
 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)
 
 int	warnings = 1;		/* print warnings? */
 
-extern char	*fgetline(), *fgetword(), *sskip(), 
-		*atos(), *iskip(), *fskip(), *strcpy();
-extern FILE	*popen();
+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 */
 	gargv = argv;
-				/* set up rtrace command */
+	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++) {
-		if (argv[i][0] == '<' && !argv[i][1])
+		while ((rval = expandarg(&argc, &argv, i)) > 0)
+			;
+		if (rval < 0) {
+			sprintf(errmsg, "cannot expand '%s'", argv[i]);
+			error(SYSTEM, errmsg);
+		}
+		if (argv[i][0] != '-')
 			break;
-		rtargv[rtargc++] = argv[i];
-		if (argv[i][0] == '-' && argv[i][1] == 'w')
-			warnings = !warnings;
-	}
-	if ((gargc = i) < 2)
-		error(USER, "too few arguments");
-	rtargc--;
-	for (i = 0; myrtopts[i] != NULL; i++)
-		rtargv[rtargc++] = myrtopts[i];
-	rtargv[rtargc++] = argv[gargc-1];
-	rtargv[rtargc] = NULL;
-				/* just asking for defaults? */
-	if (!strcmp(argv[gargc-1], "-defaults")) {
-		rtpath = getpath(rtargv[0], getenv("PATH"), X_OK);
-		if (rtpath == NULL) {
-			eputs(rtargv[0]);
-			eputs(": command not found\n");
-			exit(1);
+		if (!strcmp(argv[i], "-w")) {
+			warnings = 0;
+			continue;
 		}
-		execv(rtpath, rtargv);
-		perror(rtpath);
-		exit(1);
+		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();
-	if (gargc+1 < argc)
+	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,
@@ -111,60 +123,36 @@ char	*argv[];
 			filter(fp, argv[i]);
 			fclose(fp);
 		}
-	else
+	} else
 		filter(stdin, "standard input");
 	quit(0);
+	return 0; /* pro forma return */
 }
 
 
-quit(status)			/* exit with status */
-int  status;
+void
+init(char *octnm, int np)		/* start rendering process(es) */
 {
-	int	rtstat;
-
-	rtstat = close_process(rt.pd);
-	if (status == 0)
-		if (rtstat < 0)
-			error(WARNING,
-			"unknown return status from rtrace process");
-		else
-			status = rtstat;
-	exit(status);
-}
-
-
-init()				/* start rtrace and set up buffers */
-{
-	extern int  o_face(), o_sphere(), o_ring();
-	int	maxbytes;
-					/* set up object functions */
-	ofun[OBJ_FACE].funp = o_face;
-	ofun[OBJ_SPHERE].funp = o_sphere;
-	ofun[OBJ_RING].funp = o_ring;
 					/* set up signal handling */
+	signal(SIGINT, quit);
+#ifdef SIGHUP
+	signal(SIGHUP, quit);
+#endif
+#ifdef SIGTERM
+	signal(SIGTERM, quit);
+#endif
+#ifdef SIGPIPE
 	signal(SIGPIPE, quit);
-					/* start rtrace process */
-	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(6*sizeof(float)*rt.bsiz--);
-	rt.dest = (float **)malloc(sizeof(float *)*rt.bsiz);
-	if (rt.buf == NULL || rt.dest == NULL)
-		error(SYSTEM, "out of memory in init");
-	rt.nrays = 0;
-					/* set up urand */
-	initurand(2048);
+#endif
+					/* start rendering process(es) */
+	ray_pinit(octnm, np);
 }
 
 
-eputs(s)				/* put string to stderr */
-register char  *s;
+void
+eputs(				/* put string to stderr */
+	register char  *s
+)
 {
 	static int  midline = 0;
 
@@ -178,6 +166,7 @@ register char  *s;
 }
 
 
+void
 wputs(s)			/* print warning if enabled */
 char  *s;
 {
@@ -186,9 +175,11 @@ char  *s;
 }
 
 
-filter(infp, name)		/* process stream */
-register FILE	*infp;
-char	*name;
+void
+filter(		/* process stream */
+	register FILE	*infp,
+	char	*name
+)
 {
 	char	buf[512];
 	FILE	*pfp;
@@ -218,12 +209,15 @@ char	*name;
 }
 
 
-xoptions(s, nm)			/* process options in 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;
 
@@ -237,12 +231,14 @@ char	*nm;
 		case ' ':
 		case '\t':
 		case '\n':
+		case '\r':
+		case '\f':
 			cp++;
 			continue;
 		case 'm':			/* material name */
 			if (*++cp != '=')
 				break;
-			if (!*++cp)
+			if (!*++cp || isspace(*cp))
 				break;
 			atos(thisillum.matname, MAXSTR, cp);
 			cp = sskip(cp);
@@ -254,8 +250,9 @@ char	*nm;
 		case 'f':			/* data file name */
 			if (*++cp != '=')
 				break;
-			if (!*++cp) {
+			if (!*++cp || isspace(*cp)) {
 				strcpy(thisillum.datafile,thisillum.matname);
+				thisillum.dfnum = 0;
 				thisillum.flags &= ~IL_DATCLB;
 				continue;
 			}
@@ -300,18 +297,29 @@ char	*nm;
 			}
 			cp = sskip(cp);
 			continue;
-		case 'd':			/* point sample density */
+		case 'd':			/* sample density / BSDF data */
 			if (*++cp != '=')
 				break;
-			if (!isintd(++cp, " \t\n"))
-				break;
-			thisillum.sampdens = atoi(cp);
+			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':			/* point super-samples */
+		case 's':			/* surface super-samples */
 			if (*++cp != '=')
 				break;
-			if (!isintd(++cp, " \t\n"))
+			if (!isintd(++cp, " \t\n\r"))
 				break;
 			thisillum.nsamps = atoi(cp);
 			cp = sskip(cp);
@@ -326,10 +334,20 @@ char	*nm;
 				break;
 			cp++;
 			continue;
+		case 'b':			/* brightness */
+			if (*++cp != '=')
+				break;
+			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 */
 			if (*++cp != '=')
 				break;
-			if (!*++cp)
+			if (!*++cp || isspace(*cp))
 				break;
 			atos(buf, sizeof(buf), cp);
 			cp = sskip(cp);
@@ -340,6 +358,50 @@ 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);
@@ -347,7 +409,8 @@ char	*nm;
 			return;
 		}
 	opterr:					/* skip faulty option */
-		cp = sskip(cp);
+		while (*cp && !isspace(*cp))
+			cp++;
 		nerrs++;
 	}
 						/* print header? */
@@ -365,10 +428,56 @@ char	*nm;
 	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);
+}
 
-printhead(ac, av)			/* print out header */
-register int  ac;
-register char  **av;
+
+void
+printhead(			/* print out header */
+	register int  ac,
+	register char  **av
+)
 {
 	putchar('#');
 	while (ac-- > 0) {
@@ -379,9 +488,11 @@ register char  **av;
 }
 
 
-xobject(fp, nm)				/* translate an object from fp */
-FILE  *fp;
-char  *nm;
+void
+xobject(				/* translate an object from fp */
+	FILE  *fp,
+	char  *nm
+)
 {
 	OBJREC  thisobj;
 	char  str[MAXSTR];
@@ -392,10 +503,10 @@ char  *nm;
 	if (fgetword(str, MAXSTR, fp) == NULL)
 		goto readerr;
 					/* is it an alias? */
-	if (!strcmp(str, ALIASID)) {
+	if (!strcmp(str, ALIASKEY)) {
 		if (fgetword(str, MAXSTR, fp) == NULL)
 			goto readerr;
-		printf("\n%s %s %s", thisillum.altmat, ALIASID, str);
+		printf("\n%s %s %s", thisillum.altmat, ALIASKEY, str);
 		if (fgetword(str, MAXSTR, fp) == NULL)
 			goto readerr;
 		printf("\t%s\n", str);
@@ -432,13 +543,26 @@ char  *nm;
 	checkhead();
 						/* process object */
 	if (doit)
-		(*ofun[thisobj.otype].funp)(&thisobj, &thisillum, &rt, nm);
+		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 scene", nm);
+	sprintf(errmsg, "(%s): error reading input", nm);
 	error(USER, errmsg);
 }