--- ray/src/gen/mkillum.c	1991/07/24 16:48:22	1.5
+++ ray/src/gen/mkillum.c	1991/08/13 14:43:49	1.11
@@ -15,9 +15,10 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  <ctype.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 */
@@ -36,7 +37,7 @@ struct rtproc	rt;		/* our rtrace process */
 struct illum_args  thisillum = {	/* our illum and default values */
 		0,
 		DFLMAT,
-		DFLMAT,
+		DFLDAT,
 		0,
 		VOIDID,
 		SAMPDENS,
@@ -58,7 +59,7 @@ int	doneheader = 0;		/* printed header yet? */
 int	warnings = 1;		/* print warnings? */
 
 extern char	*fgetline(), *fgetword(), *sskip(), 
-		*atos(), *iskip(), *fskip();
+		*atos(), *iskip(), *fskip(), *strcpy();
 extern FILE	*popen();
 
 
@@ -89,6 +90,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]);
@@ -158,6 +160,8 @@ init()				/* start rtrace and set up buffers */
 	if (rt.buf == NULL || rt.dest == NULL)
 		error(SYSTEM, "out of memory in init");
 	rt.nrays = 0;
+					/* set up urand */
+	initurand(2048);
 }
 
 
@@ -253,6 +257,8 @@ char	*nm;
 			if (*++cp != '=')
 				break;
 			if (!*++cp) {
+				strcpy(thisillum.datafile,thisillum.matname);
+				thisillum.dfnum = 0;
 				thisillum.flags &= ~IL_DATCLB;
 				continue;
 			}
@@ -263,10 +269,11 @@ char	*nm;
 			continue;
 		case 'i':			/* include material */
 		case 'e':			/* exclude material */
-			matselect = (*cp == 'i') ? S_ELEM : S_COMPL;
-			if (*++cp != '=')
+			if (cp[1] != '=')
 				break;
-			atos(matcheck, MAXSTR, ++cp);
+			matselect = (*cp == 'i') ? S_ELEM : S_COMPL;
+			cp += 2;
+			atos(matcheck, MAXSTR, cp);
 			cp = sskip(cp);
 			continue;
 		case 'a':			/* use everything */
@@ -282,8 +289,8 @@ char	*nm;
 				break;
 			switch (*++cp) {
 			case 'a':			/* average */
-				thisillum.flags |= IL_COLAVG;
-				thisillum.flags &= ~IL_COLDST;
+				thisillum.flags = (thisillum.flags|IL_COLAVG)
+							& ~IL_COLDST;
 				break;
 			case 'd':			/* distribution */
 				thisillum.flags |= (IL_COLDST|IL_COLAVG);
@@ -336,6 +343,11 @@ char	*nm;
 			}
 			doneheader = 0;
 			continue;
+		case '!':			/* processed file! */
+			sprintf(errmsg, "(%s): already processed!", nm);
+			error(WARNING, errmsg);
+			matselect = S_NONE;
+			return;
 		}
 	opterr:					/* skip faulty option */
 		cp = sskip(cp);
@@ -357,6 +369,16 @@ char	*nm;
 }
 
 
+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");
+	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);
+}
+
+
 printhead(ac, av)			/* print out header */
 register int  ac;
 register char  **av;
@@ -366,7 +388,7 @@ register char  **av;
 		putchar(' ');
 		fputs(*av++, stdout);
 	}
-	putchar('\n');
+	fputs("\n#@mkillum !\n", stdout);
 }