--- ray/src/gen/mkillum3.c	1991/07/24 16:48:45	1.1
+++ ray/src/gen/mkillum3.c	1991/11/12 10:52:37	1.8
@@ -10,7 +10,7 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "mkillum.h"
 
-#define  brt(col)	(.295*(col)[0] + .636*(col)[1] + .070*(col)[2])
+#define  brt(col)	(.263*(col)[0]+.655*(col)[1]+.082*(col)[2])
 
 char	DATORD[] = "RGB";		/* data ordering */
 char	DATSUF[] = ".dat";		/* data file suffix */
@@ -87,35 +87,6 @@ int  c;
 }
 
 
-illumout(il, ob)		/* print illum object */
-register struct illum_args  *il;
-OBJREC  *ob;
-{
-	double  cout[3];
-
-	printf("\n%s%s %s %s", il->matname, DSTSUF,
-			ofun[il->flags&IL_LIGHT?MAT_LIGHT:MAT_ILLUM].funame,
-			il->matname);
-	if (il->flags & IL_LIGHT || !strcmp(il->altmat,VOIDID))
-		printf("\n0");
-	else
-		printf("\n1 %s", il->altmat);
-	if (il->flags & IL_COLAVG) {
-		cout[0] = il->col[0];
-		cout[1] = il->col[1];
-		cout[2] = il->col[2];
-	} else {
-		cout[0] = cout[1] = cout[2] = brt(il->col);
-	}
-	if (il->flags & IL_LIGHT)
-		printf("\n3 %f %f %f\n", cout[0], cout[1], cout[2]);
-	else
-		printf("\n4 %f %f %f 0\n", cout[0], cout[1], cout[2]);
-
-	printobj(il->matname, ob);
-}
-
-
 flatout(il, da, n, m, u, v, w)		/* write hemispherical distribution */
 struct illum_args  *il;
 float  *da;
@@ -125,25 +96,27 @@ FVECT  u, v, w;
 	FILE  *dfp;
 	int  i;
 
-	average(il, da, n*m);
 	if (il->flags & IL_COLDST) {
 		printf("\n%s %s %s%s", VOIDID, ofun[PAT_CDATA].funame,
 				il->matname, DSTSUF);
 		printf("\n9 red green blue");
 		for (i = 0; i < 3; i++) {
 			dfp = dfopen(il, DATORD[i]);
-			fprintf(dfp, "2\n1 0 %d\n0 %f %d\n", n, 2.*PI, m);
-			colorout(i, da, n*m, 1./il->nsamps/il->col[i], dfp);
+			fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
+					1.-.5/n, .5/n, n,
+					0., 2.*PI, m+1);
+			colorout(i, da, n, m, 1./il->nsamps/il->col[i], dfp);
 			fclose(dfp);
 			printf(" %s", dfname(il, DATORD[i]));
 		}
 	} else {
 		printf("\n%s %s %s%s", VOIDID, ofun[PAT_BDATA].funame,
 				il->matname, DSTSUF);
-		printf("\n5 noop");
+		printf("\n5 noneg");
 		dfp = dfopen(il, 0);
-		fprintf(dfp, "2\n1 0 %d\n0 %f %d\n", n, 2.*PI, m);
-		brightout(da, n*m, 1./il->nsamps/brt(il->col), dfp);
+		fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-.5/n, .5/n, n,
+				0., 2.*PI, m+1);
+		brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp);
 		fclose(dfp);
 		printf(" %s", dfname(il, 0));
 	}
@@ -164,25 +137,27 @@ int  n, m;
 	FILE  *dfp;
 	int  i;
 
-	average(il, da, n*m);
 	if (il->flags & IL_COLDST) {
 		printf("\n%s %s %s%s", VOIDID, ofun[PAT_CDATA].funame,
 				il->matname, DSTSUF);
 		printf("\n9 red green blue");
 		for (i = 0; i < 3; i++) {
 			dfp = dfopen(il, DATORD[i]);
-			fprintf(dfp, "2\n1 -1 %d\n0 %f %d\n", n, 2.*PI, m);
-			colorout(i, da, n*m, 1./il->nsamps/il->col[i], dfp);
+			fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
+					1.-1./n, -1.+1./n, n,
+					0., 2.*PI, m+1);
+			colorout(i, da, n, m, 1./il->nsamps/il->col[i], dfp);
 			fclose(dfp);
 			printf(" %s", dfname(il, DATORD[i]));
 		}
 	} else {
 		printf("\n%s %s %s%s", VOIDID, ofun[PAT_BDATA].funame,
 				il->matname, DSTSUF);
-		printf("\n5 noop");
+		printf("\n5 noneg");
 		dfp = dfopen(il, 0);
-		fprintf(dfp, "2\n1 -1 %d\n0 %f %d\n", n, 2.*PI, m);
-		brightout(da, n*m, 1./il->nsamps/brt(il->col), dfp);
+		fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-1./n, -1.+1./n, n,
+				0., 2.*PI, m+1);
+		brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp);
 		fclose(dfp);
 		printf(" %s", dfname(il, 0));
 	}
@@ -192,6 +167,35 @@ int  n, m;
 }
 
 
+illumout(il, ob)		/* print illum object */
+register struct illum_args  *il;
+OBJREC  *ob;
+{
+	double  cout[3];
+
+	if (il->sampdens <= 0)
+		printf("\n%s ", VOIDID);
+	else
+		printf("\n%s%s ", il->matname, DSTSUF);
+	printf("%s %s", ofun[il->flags&IL_LIGHT?MAT_LIGHT:MAT_ILLUM].funame,
+			il->matname);
+	if (il->flags & IL_LIGHT || !strcmp(il->altmat,VOIDID))
+		printf("\n0");
+	else
+		printf("\n1 %s", il->altmat);
+	if (il->flags & IL_COLAVG) {
+		cout[0] = il->col[0];
+		cout[1] = il->col[1];
+		cout[2] = il->col[2];
+	} else {
+		cout[0] = cout[1] = cout[2] = brt(il->col);
+	}
+	printf("\n0\n3 %f %f %f\n", cout[0], cout[1], cout[2]);
+
+	printobj(il->matname, ob);
+}
+
+
 average(il, da, n)		/* compute average value for distribution */
 register struct illum_args  *il;
 register float  *da;
@@ -208,41 +212,65 @@ int  n;
 	}
 	for (i = 0; i < 3; i++)
 		il->col[i] /= (double)n*il->nsamps;
+
+	return(brt(il->col) > il->minbrt+FTINY);
 }
 
 
-colorout(p, da, n, mult, fp)	/* put out color distribution data */
+static int	colmcnt = 0;	/* count of columns written */
+
+fputnum(d, fp)			/* put out a number to fp */
+double  d;
+FILE  *fp;
+{
+	if (colmcnt++ % 6 == 0)
+		putc('\n', fp);
+	fprintf(fp, " %11e", d);
+}
+
+
+fputeol(fp)			/* write end of line to fp */
+register FILE  *fp;
+{
+	putc('\n', fp);
+	colmcnt = 0;
+}
+
+
+colorout(p, da, n, m, mult, fp)	/* put out color distribution data */
 int  p;
 register float  *da;
-int  n;
+int  n, m;
 double  mult;
 FILE  *fp;
 {
-	register int  i;
+	register int  i, j;
 
 	for (i = 0; i < n; i++) {
-		if (i%6 == 0)
-			putc('\n', fp);
-		fprintf(fp, " %11e", mult*da[p]);
-		da += 3;
+		for (j = 0; j < m; j++) {
+			fputnum(mult*da[p], fp);
+			da += 3;
+		}
+		fputnum(mult*da[p-3*m], fp);	/* wrap phi */
 	}
-	putc('\n', fp);
+	fputeol(fp);
 }
 
 
-brightout(da, n, mult, fp)	/* put out brightness distribution data */
+brightout(da, n, m, mult, fp)	/* put out brightness distribution data */
 register float  *da;
-int  n;
+int  n, m;
 double  mult;
 FILE  *fp;
 {
-	register int  i;
+	register int  i, j;
 
 	for (i = 0; i < n; i++) {
-		if (i%6 == 0)
-			putc('\n', fp);
-		fprintf(fp, " %11e", mult*brt(da));
-		da += 3;
+		for (j = 0; j < m; j++) {
+			fputnum(mult*brt(da), fp);
+			da += 3;
+		}
+		fputnum(mult*brt(da-3*m), fp);	/* wrap phi */
 	}
-	putc('\n', fp);
+	fputeol(fp);
 }