--- ray/src/gen/mkillum.h	2003/11/21 07:15:30	2.6
+++ ray/src/gen/mkillum.h	2009/06/12 17:37:37	2.17
@@ -1,13 +1,14 @@
-/* RCSid: $Id: mkillum.h,v 2.6 2003/11/21 07:15:30 greg Exp $ */
+/* RCSid: $Id: mkillum.h,v 2.17 2009/06/12 17:37:37 greg Exp $ */
 /*
  * Common definitions for mkillum
  */
 #ifndef _RAD_MKILLUM_H_
 #define _RAD_MKILLUM_H_
 
-#include  "standard.h"
-#include  "object.h"
-#include  "rtprocess.h"
+#include  "ray.h"
+#include  "otypes.h"
+#include  "bsdf.h"
+#include  "random.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,37 +21,52 @@ extern "C" {
 
 struct illum_args {
 	int	flags;			/* flags from list above */
+	UpDir	udir;			/* up direction */
+	double	thick;			/* object thickness */
 	char	matname[MAXSTR];	/* illum material name */
 	char	datafile[MAXSTR];	/* distribution data file name */
 	int	dfnum;			/* data file number */
 	char	altmat[MAXSTR];		/* alternate material name */
 	int	sampdens;		/* point sample density */
 	int	nsamps;			/* # of samples in each direction */
+	struct BSDF_data
+		*sd;			/* scattering data (if set) */
 	float	minbrt;			/* minimum average brightness */
-	float	col[3];			/* computed average color */
+	COLOR	col;			/* computed average color */
 };				/* illum options */
 
-struct rtproc {
-	SUBPROC pd;			/* 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 */
+extern void redistribute(struct BSDF_data *b, int nalt, int nazi,
+				FVECT u, FVECT v, FVECT w, MAT4 xm);
 
-extern void printobj(char  *mod, register OBJREC  *obj);
-extern int average(register struct illum_args  *il, float  *da, int  n);
-extern void flatout(struct illum_args  *il, float  *da, int  n, int  m,
-	FVECT  u, FVECT  v, FVECT  w);
-extern void illumout(register struct illum_args  *il, OBJREC  *ob);
-extern void roundout(struct illum_args  *il, float  *da, int  n, int  m);
+extern void printobj(char *mod, OBJREC *obj);
+extern int average(struct illum_args *il, COLORV *da, int n);
+extern void flatout(struct illum_args *il, COLORV *da, int n, int m,
+	FVECT u, FVECT v, FVECT w);
+extern void illumout(struct illum_args *il, OBJREC *ob);
+extern void roundout(struct illum_args *il, COLORV *da, int n, int m);
 
+extern void newdist(int siz);
+extern int process_ray(RAY *r, int rv);
+extern void raysamp(int ndx, FVECT org, FVECT dir);
+extern void rayclean(void);
+
+extern void flatdir(FVECT  dv, double  alt, double  azi);
+extern int flatindex(FVECT dv, int nalt, int nazi);
+
+extern int my_default(OBJREC *, struct illum_args *, char *);
+extern int my_face(OBJREC *, struct illum_args *, char *);
+extern int my_sphere(OBJREC *, struct illum_args *, char *);
+extern int my_ring(OBJREC *, struct illum_args *, char *);
+
+extern COLORV *	distarr;		/* distribution array */
+extern int	distsiz;
+extern COLORV *	direct_discount;	/* amount to take off direct */
+
+extern char	*progname;
+
 #ifdef __cplusplus
 }
 #endif
-
-#define FUN_ARGLIST	OBJREC *, struct illum_args *, struct rtproc *, char *
-#include  "otypes.h"
 
 #endif /* _RAD_MKILLUM_H_ */