--- ray/src/gen/mkillum.c	2007/09/21 05:53:21	2.31
+++ ray/src/gen/mkillum.c	2012/10/13 20:15:43	2.39
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: mkillum.c,v 2.31 2007/09/21 05:53:21 greg Exp $";
+static const char RCSid[] = "$Id: mkillum.c,v 2.39 2012/10/13 20:15:43 greg Exp $";
 #endif
 /*
  * Make illum sources for optimizing rendering process
@@ -8,9 +8,8 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.31 200
 #include  <signal.h>
 #include  <ctype.h>
 
-#include  "platform.h"
+#include  "rtprocess.h"	/* win_popen() */
 #include  "mkillum.h"
-#include  "random.h"
 
 				/* default parameters */
 #define  SAMPDENS	48		/* points per projected steradian */
@@ -25,7 +24,6 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.31 200
 
 struct illum_args  thisillum = {	/* our illum and default values */
 		0,
-		UDzpos,
 		0.,
 		DFLMAT,
 		DFLDAT,
@@ -33,7 +31,6 @@ struct illum_args  thisillum = {	/* our illum and defa
 		VOIDID,
 		SAMPDENS,
 		NSAMPS,
-		NULL,
 		0.,
 	};
 
@@ -70,9 +67,8 @@ main(		/* compute illum distributions using rtrace */
 	gargv = argv;
 	progname = gargv[0];
 				/* set up rendering defaults */
-	dstrsrc = 0.25;
+	dstrsrc = 0.5;
 	directrelay = 3;
-	directvis = 0;
 	ambounce = 2;
 				/* get options from command line */
 	for (i = 1; i < argc; i++) {
@@ -178,6 +174,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
@@ -299,22 +305,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")) {
+			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;
@@ -360,40 +360,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 ? UDxneg : UDxpos;
-				break;
-			default:
-				thisillum.udir = UDunknown;
-				break;
-			}
-			if (thisillum.udir == UDunknown || !isspace(*cp))
-				break;
-			continue;
 		case 't':			/* object thickness */
 			if (*++cp != '=')
 				break;
@@ -446,31 +412,9 @@ printopts(void)			/* print out option default values *
 		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 points\n", thisillum.sampdens);
-	printf("s=%d\t\t\t\t# samples per point\n", thisillum.nsamps);
+	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);
 }