--- ray/src/gen/mkillum.c	1991/08/23 12:30:29	1.12
+++ ray/src/gen/mkillum.c	2003/02/22 02:07:24	2.11
@@ -1,9 +1,6 @@
-/* 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.11 2003/02/22 02:07:24 greg Exp $";
 #endif
-
 /*
  * Make illum sources for optimizing rendering process
  */
@@ -26,11 +23,12 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  S_ALL		3		/* select all */
 
 				/* rtrace command and defaults */
-char  *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-di+",
+char  *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-dv-",
 		"-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", };
 int  rtargc = 14;
 				/* overriding rtrace options */
-char  *myrtopts[] = { "-I-", "-i-", "-ov", "-h-", "-fff", NULL };
+char  *myrtopts[] = { "-I-", "-i-", "-ld-", "-ov", "-h-",
+			"-fff", "-y", "0", NULL };
 
 struct rtproc	rt;		/* our rtrace process */
 
@@ -59,16 +57,11 @@ int	doneheader = 0;		/* printed header yet? */
 
 int	warnings = 1;		/* print warnings? */
 
-extern char	*fgetline(), *fgetword(), *sskip(), 
-		*atos(), *iskip(), *fskip(), *strcpy();
-extern FILE	*popen();
 
-
 main(argc, argv)		/* compute illum distributions using rtrace */
 int	argc;
 char	*argv[];
 {
-	extern char	*getenv(), *getpath();
 	char	*rtpath;
 	FILE	*fp;
 	register int	i;
@@ -76,14 +69,29 @@ char	*argv[];
 	gargv = argv;
 				/* set up rtrace command */
 	for (i = 1; i < argc; i++) {
-		if (argv[i][0] == '<' && !argv[i][1])
+		if (argv[i][0] == '<' && argv[i][1] == '\0')
 			break;
 		rtargv[rtargc++] = argv[i];
 		if (argv[i][0] == '-' && argv[i][1] == 'w')
-			warnings = !warnings;
+			switch (argv[i][2]) {
+			case '\0':
+				warnings = !warnings;
+				break;
+			case '+':
+			case 'T': case 't':
+			case 'Y': case 'y':
+			case '1':
+				warnings = 1;
+				break;
+			case '-':
+			case 'F': case 'f':
+			case 'N': case 'n':
+			case '0':
+				warnings = 0;
+				break;
+			}
 	}
-	if ((gargc = i) < 2)
-		error(USER, "too few arguments");
+	gargc = i;
 	rtargc--;
 	for (i = 0; myrtopts[i] != NULL; i++)
 		rtargv[rtargc++] = myrtopts[i];
@@ -102,6 +110,8 @@ char	*argv[];
 		perror(rtpath);
 		exit(1);
 	}
+	if (gargc < 2 || argv[gargc-1][0] == '-')
+		error(USER, "missing octree argument");
 				/* else initialize and run our calculation */
 	init();
 	if (gargc+1 < argc)
@@ -120,6 +130,7 @@ char	*argv[];
 }
 
 
+void
 quit(status)			/* exit with status */
 int  status;
 {
@@ -147,6 +158,7 @@ init()				/* start rtrace and set up buffers */
 					/* set up signal handling */
 	signal(SIGPIPE, quit);
 					/* start rtrace process */
+	errno = 0;
 	maxbytes = open_process(rt.pd, rtargv);
 	if (maxbytes == 0) {
 		eputs(rtargv[0]);
@@ -162,10 +174,11 @@ init()				/* start rtrace and set up buffers */
 		error(SYSTEM, "out of memory in init");
 	rt.nrays = 0;
 					/* set up urand */
-	initurand(2048);
+	initurand(16384);
 }
 
 
+void
 eputs(s)				/* put string to stderr */
 register char  *s;
 {
@@ -181,6 +194,7 @@ register char  *s;
 }
 
 
+void
 wputs(s)			/* print warning if enabled */
 char  *s;
 {
@@ -240,12 +254,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);
@@ -257,7 +273,7 @@ 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;
@@ -307,7 +323,7 @@ char	*nm;
 		case 'd':			/* point sample density */
 			if (*++cp != '=')
 				break;
-			if (!isintd(++cp, " \t\n"))
+			if (!isintd(++cp, " \t\n\r"))
 				break;
 			thisillum.sampdens = atoi(cp);
 			cp = sskip(cp);
@@ -315,7 +331,7 @@ char	*nm;
 		case 's':			/* point super-samples */
 			if (*++cp != '=')
 				break;
-			if (!isintd(++cp, " \t\n"))
+			if (!isintd(++cp, " \t\n\r"))
 				break;
 			thisillum.nsamps = atoi(cp);
 			cp = sskip(cp);
@@ -333,15 +349,17 @@ char	*nm;
 		case 'b':			/* brightness */
 			if (*++cp != '=')
 				break;
-			if (!isfltd(++cp, " \t\n"))
+			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);
@@ -359,7 +377,8 @@ char	*nm;
 			return;
 		}
 	opterr:					/* skip faulty option */
-		cp = sskip(cp);
+		while (*cp && !isspace(*cp))
+			cp++;
 		nerrs++;
 	}
 						/* print header? */
@@ -382,7 +401,17 @@ printopts()			/* 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);
-	printf("c=n\t\t\t\t# color none\n");
+	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 points\n", thisillum.sampdens);
 	printf("s=%d\t\t\t\t# samples per point\n", thisillum.nsamps);
 	printf("b=%f\t\t\t# minimum average brightness\n", thisillum.minbrt);