--- ray/src/gen/mkillum.h	2007/09/21 05:53:21	2.11
+++ ray/src/gen/mkillum.h	2007/12/12 05:09:58	2.15
@@ -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.15 2007/12/12 05:09:58 greg Exp $ */
 /*
  * Common definitions for mkillum
  */
@@ -7,6 +7,7 @@
 
 #include  "ray.h"
 #include  "otypes.h"
+#include  "random.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,15 +28,24 @@ typedef enum {
 	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 {
-	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 */
+	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. */
 
@@ -55,17 +65,19 @@ 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)]
+#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 void r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
+extern int 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,
+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,
@@ -82,6 +94,8 @@ 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 my_default(OBJREC *, struct illum_args *, char *);
 extern int my_face(OBJREC *, struct illum_args *, char *);