--- ray/src/gen/mkillum.c	1991/07/25 14:50:03	1.8
+++ ray/src/gen/mkillum.c	1993/09/21 17:09:59	2.6
@@ -18,6 +18,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #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 */
@@ -25,22 +26,23 @@ 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-", "-ov", "-h-", "-fff", "-y", "0", NULL };
 
 struct rtproc	rt;		/* our rtrace process */
 
 struct illum_args  thisillum = {	/* our illum and default values */
 		0,
 		DFLMAT,
-		DFLMAT,
+		DFLDAT,
 		0,
 		VOIDID,
 		SAMPDENS,
 		NSAMPS,
+		0.,
 	};
 
 char	matcheck[MAXSTR];	/* current material to include or exclude */
@@ -74,14 +76,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];
@@ -89,6 +106,7 @@ char	*argv[];
 	rtargv[rtargc] = NULL;
 				/* just asking for defaults? */
 	if (!strcmp(argv[gargc-1], "-defaults")) {
+		printopts(); fflush(stdout);
 		rtpath = getpath(rtargv[0], getenv("PATH"), X_OK);
 		if (rtpath == NULL) {
 			eputs(rtargv[0]);
@@ -99,6 +117,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)
@@ -144,6 +164,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]);
@@ -256,6 +277,7 @@ char	*nm;
 				break;
 			if (!*++cp) {
 				strcpy(thisillum.datafile,thisillum.matname);
+				thisillum.dfnum = 0;
 				thisillum.flags &= ~IL_DATCLB;
 				continue;
 			}
@@ -326,6 +348,16 @@ char	*nm;
 				break;
 			cp++;
 			continue;
+		case 'b':			/* brightness */
+			if (*++cp != '=')
+				break;
+			if (!isfltd(++cp, " \t\n"))
+				break;
+			thisillum.minbrt = atof(cp);
+			if (thisillum.minbrt < 0.)
+				thisillum.minbrt = 0.;
+			cp = sskip(cp);
+			continue;
 		case 'o':			/* output file */
 			if (*++cp != '=')
 				break;
@@ -363,6 +395,27 @@ char	*nm;
 	}
 						/* print pure comment */
 	printf("# %s", s+2);
+}
+
+
+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);
+	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);
 }