--- ray/src/gen/mkillum.h	2007/09/21 05:53:21	2.11
+++ ray/src/gen/mkillum.h	2009/06/12 17:37:37	2.17
@@ -1,4 +1,4 @@
-/* RCSid: $Id: mkillum.h,v 2.11 2007/09/21 05:53:21 greg Exp $ */
+/* RCSid: $Id: mkillum.h,v 2.17 2009/06/12 17:37:37 greg Exp $ */
 /*
  * Common definitions for mkillum
  */
@@ -7,6 +7,8 @@
 
 #include  "ray.h"
 #include  "otypes.h"
+#include  "bsdf.h"
+#include  "random.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,28 +19,6 @@ extern "C" {
 #define  IL_COLAVG	0x4		/* use average color */
 #define  IL_DATCLB	0x8		/* OK to clobber data file */
 
-				/* up directions */
-typedef enum {
-	UDzneg=-3,
-	UDyneg=-2,
-	UDxneg=-1,
-	UDunknown=0,
-	UDxpos=1,
-	UDypos=2,
-	UDzpos=3
-} UpDir;
-
-struct BSDF_data {
-	double	om_scale;		/* maximum solid angle (sr/256) */
-	int	ninc;			/* number of incoming directions */
-	int32	*inc_dir;		/* incoming direction codes */
-	BYTE	*inc_rad;		/* incoming radians to neighbor */
-	int	nout;			/* number of outgoing directions */
-	int32	*out_dir;		/* outgoing direction codes */
-	BYTE	*out_rad;		/* outgoing radians to neighbor */
-	float	*bsdf;			/* scattering distribution data */
-};				/* bidirectional scattering distrib. func. */
-
 struct illum_args {
 	int	flags;			/* flags from list above */
 	UpDir	udir;			/* up direction */
@@ -55,19 +35,6 @@ struct illum_args {
 	COLOR	col;			/* computed average color */
 };				/* illum options */
 
-#define getBSDF_incvec(v,b,i)	decodedir(v, (b)->inc_dir[i])
-#define getBSDF_outvec(v,b,o)	decodedir(v, (b)->out_dir[o])
-#define getBSDF_incrad(b,i)	((b)->om_scale*((b)->inc_rad[i] + .5));
-#define getBSDF_outrad(b,o)	((b)->om_scale*((b)->out_rad[o] + .5));
-#define BSDF_data(b,i,o)	(b)->bsdf[(o)*(b)->ninc + (i)]
-
-extern struct BSDF_data *load_BSDF(char *fname);
-extern void free_BSDF(struct BSDF_data *b);
-extern void r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
-				double rv, MAT4 xm);
-extern void r_BSDF_outvec(FVECT v, struct BSDF_data *b, int o,
-				double rv, MAT4 xm);
-extern int getBSDF_xfm(MAT4 xm, FVECT nrm, UpDir ud);
 extern void redistribute(struct BSDF_data *b, int nalt, int nazi,
 				FVECT u, FVECT v, FVECT w, MAT4 xm);
 
@@ -83,6 +50,9 @@ 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 *);
@@ -90,6 +60,7 @@ 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;