--- ray/src/gen/mkillum.c	2009/06/06 05:03:47	2.35
+++ ray/src/gen/mkillum.c	2013/08/11 02:57:49	2.40
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: mkillum.c,v 2.35 2009/06/06 05:03:47 greg Exp $";
+static const char RCSid[] = "$Id: mkillum.c,v 2.40 2013/08/11 02:57:49 greg Exp $";
 #endif
 /*
  * Make illum sources for optimizing rendering process
@@ -8,6 +8,7 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.35 200
 #include  <signal.h>
 #include  <ctype.h>
 
+#include  "rtprocess.h"	/* win_popen() */
 #include  "mkillum.h"
 
 				/* default parameters */
@@ -23,15 +24,12 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.35 200
 
 struct illum_args  thisillum = {	/* our illum and default values */
 		0,
-		UDzpos,
-		0.,
 		DFLMAT,
 		DFLDAT,
 		0,
 		VOIDID,
 		SAMPDENS,
 		NSAMPS,
-		NULL,
 		0.,
 	};
 
@@ -70,7 +68,6 @@ main(		/* compute illum distributions using rtrace */
 				/* set up rendering defaults */
 	dstrsrc = 0.5;
 	directrelay = 3;
-	directvis = 0;
 	ambounce = 2;
 				/* get options from command line */
 	for (i = 1; i < argc; i++) {
@@ -176,6 +173,16 @@ char  *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
@@ -297,22 +304,16 @@ xoptions(			/* process options in string s */
 			}
 			cp = sskip(cp);
 			continue;
-		case 'd':			/* sample density / BSDF data */
+		case 'd':			/* sample density */
 			if (*++cp != '=')
 				break;
-			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;
+				error(WARNING, "direct BSDF input unsupported");
+				goto opterr;
 			}
 			cp = sskip(cp);
 			continue;
@@ -358,50 +359,6 @@ xoptions(			/* process options in string s */
 			}
 			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);
@@ -447,29 +404,6 @@ printopts(void)			/* print out option default values *
 	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);
 }