--- ray/src/gen/mkillum.h	2007/12/12 05:09:58	2.15
+++ ray/src/gen/mkillum.h	2009/06/12 17:37:37	2.17
@@ -1,4 +1,4 @@
-/* RCSid: $Id: mkillum.h,v 2.15 2007/12/12 05:09:58 greg Exp $ */
+/* RCSid: $Id: mkillum.h,v 2.17 2009/06/12 17:37:37 greg Exp $ */
 /*
  * Common definitions for mkillum
  */
@@ -7,6 +7,7 @@
 
 #include  "ray.h"
 #include  "otypes.h"
+#include  "bsdf.h"
 #include  "random.h"
 
 #ifdef __cplusplus
@@ -18,37 +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;
-				/* BSDF coordinate calculation routines */
-				/* vectors always point away from surface */
-typedef int	b_vecf(FVECT, int, void *);
-typedef int	b_ndxf(FVECT, void *);
-typedef double	b_radf(int, void *);
-
-/* Bidirectional Scattering Distribution Function */
-struct BSDF_data {
-	int	ninc;			/* number of incoming directions */
-	int	nout;			/* number of outgoing directions */
-	void	*ib_priv;		/* input basis private data */
-	b_vecf	*ib_vec;		/* get input vector from index */
-	b_ndxf	*ib_ndx;		/* get input index from vector */
-	b_radf	*ib_ohm;		/* get input radius for index */
-	void	*ob_priv;		/* output basis private data */
-	b_vecf	*ob_vec;		/* get output vector from index */
-	b_ndxf	*ob_ndx;		/* get output index from vector */
-	b_radf	*ob_ohm;		/* get output radius for index */
-	float	*bsdf;			/* scattering distribution data */
-};				/* bidirectional scattering distrib. func. */
-
 struct illum_args {
 	int	flags;			/* flags from list above */
 	UpDir	udir;			/* up direction */
@@ -65,21 +35,6 @@ struct illum_args {
 	COLOR	col;			/* computed average color */
 };				/* illum options */
 
-#define getBSDF_incvec(v,b,i)	(*(b)->ib_vec)(v,i,(b)->ib_priv)
-#define getBSDF_incndx(b,v)	(*(b)->ib_ndx)(v,(b)->ib_priv)
-#define getBSDF_incohm(b,i)	(*(b)->ib_ohm)(i,(b)->ib_priv)
-#define getBSDF_outvec(v,b,o)	(*(b)->ob_vec)(v,o,(b)->ob_priv)
-#define getBSDF_outndx(b,v)	(*(b)->ob_ndx)(v,(b)->ob_priv)
-#define getBSDF_outohm(b,o)	(*(b)->ob_ohm)(o,(b)->ob_priv)
-#define BSDF_value(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 int r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
-				double rv, MAT4 xm);
-extern int 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);
 
@@ -96,6 +51,7 @@ 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 *);
@@ -104,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;