--- ray/src/cv/bsdfrep.h	2014/03/19 19:48:57	2.17
+++ ray/src/cv/bsdfrep.h	2016/01/30 01:31:57	2.24
@@ -1,13 +1,18 @@
-/* RCSid $Id: bsdfrep.h,v 2.17 2014/03/19 19:48:57 greg Exp $ */
+/* RCSid $Id: bsdfrep.h,v 2.24 2016/01/30 01:31:57 greg Exp $ */
 /*
  * Definitions for BSDF representation used to interpolate measured data.
  *
  *	G. Ward
  */
 
+#ifndef _BSDFREP_H_
+#define _BSDFREP_H_
+
 #include "bsdf.h"
 
-#define DEBUG 1
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #ifndef GRIDRES
 #define GRIDRES		(1<<8)		/* grid resolution per side */
@@ -16,6 +21,9 @@
 #define ANG2R(r)	(int)((r)*((1<<16)/M_PI))
 #define R2ANG(c)	(((c)+.5)*(M_PI/(1<<16)))
 
+					/* moderated cosine factor */
+#define COSF(z)		(fabs(z)*0.98 + 0.02)
+
 typedef union {
 	struct {
 		float		v;		/* DSF sum */
@@ -26,8 +34,9 @@ typedef union {
 
 typedef struct {
 	float		peak;		/* lobe value at peak */
+	C_CHROMA	chroma;		/* encoded chromaticity */
 	unsigned short	crad;		/* radius (coded angle) */
-	unsigned char	gx, gy;		/* grid position */
+	unsigned short	gx, gy;		/* grid position */
 } RBFVAL;			/* radial basis function value */
 
 struct s_rbfnode;		/* forward declaration of RBF struct */
@@ -74,6 +83,13 @@ extern int		single_plane_incident;
 extern int		input_orient;
 extern int		output_orient;
 
+				/* represented colorimetry */
+typedef enum {RBCphotopic, RBCtristimulus, RBCspectral, RBCunknown} RBColor;
+
+extern RBColor		rbf_colorimetry;
+
+extern const char	*RBCident[];
+
 				/* log BSDF histogram */
 #define	HISTLEN		256
 #define BSDF2BIG	(1./M_PI)
@@ -85,6 +101,8 @@ extern unsigned long	bsdf_hist[HISTLEN];
 
 				/* BSDF value for boundary regions */
 extern double		bsdf_min;
+extern double		bsdf_spec_val;
+extern double		bsdf_spec_rad;
 
 				/* processed incident DSF measurements */
 extern RBFNODE		*dsf_list;
@@ -104,6 +122,8 @@ extern MIGRATION	*mig_list;
 
 #define	BSDFREP_FMT	"BSDF_RBFmesh"
 
+#define BSDFREP_MAGIC	0x5a3c
+
 				/* global argv[0] */
 extern char		*progname;
 
@@ -115,6 +135,8 @@ extern char		*progname;
 				/* our loaded grid for this incident angle */
 extern double		theta_in_deg, phi_in_deg;
 extern GRIDVAL		dsf_grid[GRIDRES][GRIDRES];
+extern float		(*spec_grid)[GRIDRES][GRIDRES];
+extern int		nspec_grid;
 
 /* Register new input direction */
 extern int		new_input_direction(double new_theta, double new_phi);
@@ -143,9 +165,12 @@ extern void		ovec_from_pos(FVECT vec, int xpos, int yp
 /* Compute grid position from normalized input/output vector */
 extern void		pos_from_vec(int pos[2], const FVECT vec);
 
-/* Evaluate RBF for DSF at the given normalized outgoing direction */
+/* Evaluate BSDF at the given normalized outgoing direction */
 extern double		eval_rbfrep(const RBFNODE *rp, const FVECT outvec);
 
+extern SDError		eval_rbfcol(SDValue *sv,
+					const RBFNODE *rp, const FVECT outvec);
+
 /* Insert a new directional scattering function in our global list */
 extern int		insert_dsf(RBFNODE *newrbf);
 
@@ -172,12 +197,15 @@ extern void		save_bsdf_rep(FILE *ofp);
 /* Read a BSDF mesh interpolant from the given binary stream */
 extern int		load_bsdf_rep(FILE *ifp);
 
+/* Set up visible spectrum sampling */
+extern void		set_spectral_samples(int nspec);
+
 /* Start new DSF input grid */
 extern void		new_bsdf_data(double new_theta, double new_phi);
 
 /* Add BSDF data point */
 extern void		add_bsdf_data(double theta_out, double phi_out,
-					double val, int isDSF);
+					const double val[], int isDSF);
 
 /* Count up filled nodes and build RBF representation from current grid */ 
 extern RBFNODE *	make_rbfrep(void);
@@ -188,9 +216,23 @@ extern void		build_mesh(void);
 /* Find edge(s) for interpolating the given vector, applying symmetry */
 extern int		get_interp(MIGRATION *miga[3], FVECT invec);
 
+/* Return single-lobe specular RBF for the given incident direction */
+extern RBFNODE *	def_rbf_spec(const FVECT invec);
+
 /* Advect and allocate new RBF along edge (internal call) */
 extern RBFNODE *	e_advect_rbf(const MIGRATION *mig,
 					const FVECT invec, int lobe_lim);
 
+/* Compute distance between two RBF lobes (internal call) */
+extern double		lobe_distance(RBFVAL *rbf1, RBFVAL *rbf2);
+
+/* Compute mass transport plan (internal call) */
+extern void		plan_transport(MIGRATION *mig);
+
 /* Partially advect between recorded incident angles and allocate new RBF */
 extern RBFNODE *	advect_rbf(const FVECT invec, int lobe_lim);
+
+#ifdef __cplusplus
+}
+#endif
+#endif	/* _BSDFREP_H_ */
\ No newline at end of file