--- ray/src/gen/mkillum3.c	1991/08/26 10:16:59	1.6
+++ ray/src/gen/mkillum3.c	2003/03/10 17:26:26	2.8
@@ -1,16 +1,13 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id";
 #endif
-
 /*
  * Routines to print mkillum objects
  */
 
 #include  "mkillum.h"
 
-#define  brt(col)	(.295*(col)[0] + .635*(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 */
@@ -24,6 +21,8 @@ register OBJREC  *obj;
 {
 	register int  i;
 
+	if (issurface(obj->otype) && !strcmp(mod, VOIDID))
+		return;		/* don't print void surfaces */
 	printf("\n%s %s %s", mod, ofun[obj->otype].funame, obj->oname);
 	printf("\n%d", obj->oargs.nsargs);
 	for (i = 0; i < obj->oargs.nsargs; i++)
@@ -50,7 +49,6 @@ dfname(il, c)			/* return data file name */
 struct illum_args  *il;
 int  c;
 {
-	extern char  *getpath(), *strcpy();
 	char  fname[MAXSTR];
 	register char  *s;
 
@@ -93,9 +91,13 @@ float  *da;
 int  n, m;
 FVECT  u, v, w;
 {
+	float  *Ninv;
 	FILE  *dfp;
 	int  i;
 
+	if ((Ninv = (float *)malloc(3*m*sizeof(float))) == NULL)
+		error(SYSTEM, "out of memory in flatout");
+	compinv(Ninv, da, m);
 	if (il->flags & IL_COLDST) {
 		printf("\n%s %s %s%s", VOIDID, ofun[PAT_CDATA].funame,
 				il->matname, DSTSUF);
@@ -103,20 +105,25 @@ FVECT  u, v, w;
 		for (i = 0; i < 3; i++) {
 			dfp = dfopen(il, DATORD[i]);
 			fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
-					1.-.5/n, .5/n, n,
+					1.+.5/n, .5/n, n+1,
 					0., 2.*PI, m+1);
+			colorout(i, Ninv, 1, m, 1./il->nsamps/il->col[i], dfp);
 			colorout(i, da, n, m, 1./il->nsamps/il->col[i], dfp);
+			fputeol(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\n%f %f %d\n%f %f %d\n", 1.-.5/n, .5/n, n,
+		fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
+				1.+.5/n, .5/n, n+1,
 				0., 2.*PI, m+1);
+		brightout(Ninv, 1, m, 1./il->nsamps/brt(il->col), dfp);
 		brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp);
+		fputeol(dfp);
 		fclose(dfp);
 		printf(" %s", dfname(il, 0));
 	}
@@ -126,6 +133,7 @@ FVECT  u, v, w;
 	printf("\t%f\t%f\t%f\n", v[0], v[1], v[2]);
 	printf("\t%f\t%f\t%f\n", w[0], w[1], w[2]);
 	il->dfnum++;
+	free((void *)Ninv);
 }
 
 
@@ -134,9 +142,15 @@ struct illum_args  *il;
 float  *da;
 int  n, m;
 {
+	float  *Ninv, *Sinv;
 	FILE  *dfp;
 	int  i;
 
+	if ((Ninv = (float *)malloc(3*m*sizeof(float))) == NULL ||
+			(Sinv = (float *)malloc(3*m*sizeof(float))) == NULL)
+		error(SYSTEM, "out of memory in roundout");
+	compinv(Ninv, da, m);
+	compinv(Sinv, da+3*m*(n-1), m);
 	if (il->flags & IL_COLDST) {
 		printf("\n%s %s %s%s", VOIDID, ofun[PAT_CDATA].funame,
 				il->matname, DSTSUF);
@@ -144,26 +158,35 @@ int  n, m;
 		for (i = 0; i < 3; i++) {
 			dfp = dfopen(il, DATORD[i]);
 			fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
-					1.-1./n, -1.+1./n, n,
+					1.+1./n, -1.-1./n, n+2,
 					0., 2.*PI, m+1);
+			colorout(i, Ninv, 1, m, 1./il->nsamps/il->col[i], dfp);
 			colorout(i, da, n, m, 1./il->nsamps/il->col[i], dfp);
+			colorout(i, Sinv, 1, m, 1./il->nsamps/il->col[i], dfp);
+			fputeol(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\n%f %f %d\n%f %f %d\n", 1.-1./n, -1.+1./n, n,
+		fprintf(dfp, "2\n%f %f %d\n%f %f %d\n",
+				1.+1./n, -1.-1./n, n+2,
 				0., 2.*PI, m+1);
+		brightout(Ninv, 1, m, 1./il->nsamps/brt(il->col), dfp);
 		brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp);
+		brightout(Sinv, 1, m, 1./il->nsamps/brt(il->col), dfp);
+		fputeol(dfp);
 		fclose(dfp);
 		printf(" %s", dfname(il, 0));
 	}
 	printf("\n\t%s il_alt il_azi", FNCFNM);
 	printf("\n0\n0\n");
 	il->dfnum++;
+	free((void *)Ninv);
+	free((void *)Sinv);
 }
 
 
@@ -196,23 +219,52 @@ OBJREC  *ob;
 }
 
 
-average(il, da, n)		/* compute average value for distribution */
-register struct illum_args  *il;
+compavg(col, da, n)		/* compute average for set of data values */
+float  col[3];
 register float  *da;
 int  n;
 {
 	register int  i;
 
-	il->col[0] = il->col[1] = il->col[2] = 0.;
+	col[0] = col[1] = col[2] = 0.;
 	i = n;
 	while (i-- > 0) {
-		il->col[0] += *da++;
-		il->col[1] += *da++;
-		il->col[2] += *da++;
+		col[0] += *da++;
+		col[1] += *da++;
+		col[2] += *da++;
 	}
 	for (i = 0; i < 3; i++)
-		il->col[i] /= (double)n*il->nsamps;
+		col[i] /= (double)n;
+}
 
+
+compinv(rinv, rp, m)		/* compute other side of row average */
+register float  *rinv, *rp;
+int  m;
+{
+	float  avg[3];
+
+	compavg(avg, rp, m);		/* row average */
+	while (m-- > 0) {
+		*rinv++ = 2.*avg[0] - *rp++;
+		*rinv++ = 2.*avg[1] - *rp++;
+		*rinv++ = 2.*avg[2] - *rp++;
+	}
+}
+
+
+average(il, da, n)		/* evaluate average value for distribution */
+register struct illum_args  *il;
+float  *da;
+int  n;
+{
+	compavg(il->col, da, n);	/* average */
+	if (il->nsamps > 1) {
+		il->col[0] /= (double)il->nsamps;
+		il->col[1] /= (double)il->nsamps;
+		il->col[2] /= (double)il->nsamps;
+	}
+					/* brighter than minimum? */
 	return(brt(il->col) > il->minbrt+FTINY);
 }
 
@@ -223,7 +275,7 @@ fputnum(d, fp)			/* put out a number to fp */
 double  d;
 FILE  *fp;
 {
-	if (colmcnt++ % 6 == 0)
+	if (colmcnt++ % 5 == 0)
 		putc('\n', fp);
 	fprintf(fp, " %11e", d);
 }
@@ -253,7 +305,6 @@ FILE  *fp;
 		}
 		fputnum(mult*da[p-3*m], fp);	/* wrap phi */
 	}
-	fputeol(fp);
 }
 
 
@@ -272,5 +323,4 @@ FILE  *fp;
 		}
 		fputnum(mult*brt(da-3*m), fp);	/* wrap phi */
 	}
-	fputeol(fp);
 }