--- ray/src/gen/mkillum.h	1991/07/23 13:35:33	1.1
+++ ray/src/gen/mkillum.h	1991/07/24 16:48:25	1.3
@@ -5,27 +5,34 @@
 /*
  * Common definitions for mkillum
  */
+
+#include  "standard.h"
+
+#include  "object.h"
+
+#include  "otypes.h"
+
 				/* illum flags */
-#define  IL_FLAT	0x1		/* flat surface */
-#define  IL_LIGHT	0x2		/* light rather than illum */
-#define  IL_COLDST	0x4		/* colored distribution */
-#define  IL_COLAVG	0x8		/* compute average color */
-#define  IL_DATCLB	0x10		/* OK to clobber data file */
+#define  IL_LIGHT	0x1		/* light rather than illum */
+#define  IL_COLDST	0x2		/* use color distribution */
+#define  IL_COLAVG	0x4		/* use average color */
+#define  IL_DATCLB	0x8		/* OK to clobber data file */
 
 struct illum_args {
 	int	flags;			/* flags from list above */
 	char	matname[MAXSTR];	/* illum material name */
 	char	datafile[MAXSTR];	/* distribution data file name */
 	int	dfnum;			/* data file number */
-	char	altmatname[MAXSTR];	/* alternate material name */
+	char	altmat[MAXSTR];		/* alternate material name */
+	int	sampdens;		/* point sample density */
 	int	nsamps;			/* # of samples in each direction */
-	int	nalt, nazi;		/* # of altitude and azimuth angles */
-	FVECT	orient;			/* coordinate system orientation */
+	float	col[3];			/* average color */
 };				/* illum options */
 
 struct rtproc {
 	int	pd[3];			/* rtrace pipe descriptors */
 	float	*buf;			/* rtrace i/o buffer */
 	int	bsiz;			/* maximum rays for rtrace buffer */
+	float	**dest;			/* destination for each ray result */
 	int	nrays;			/* current length of rtrace buffer */
 };				/* rtrace process */