--- ray/src/common/bsdf.h	2011/04/11 03:47:46	2.10
+++ ray/src/common/bsdf.h	2012/09/02 15:33:15	2.19
@@ -1,4 +1,4 @@
-/* RCSid $Id: bsdf.h,v 2.10 2011/04/11 03:47:46 greg Exp $ */
+/* RCSid $Id: bsdf.h,v 2.19 2012/09/02 15:33:15 greg Exp $ */
 /*
  *  bsdf.h
  *  
@@ -14,7 +14,7 @@
  *	in the +Z direction, towards the interior of the space rather
  *	than the exterior.
  *
- *  BSDF vectors always oriented away from surface, even when "incident."
+ *  BSDF incident & exiting vectors are always oriented away from surface.
  *
  *  Created by Greg Ward on 1/10/11.
  *
@@ -30,6 +30,10 @@
 extern "C" {
 #endif
 
+#ifdef _WIN32
+#define	strcasecmp	stricmp
+#endif
+
 #define	SDnameLn	128		/* maximum BSDF name length */
 #define	SDmaxCh		3		/* maximum # spectral channels */
 
@@ -67,13 +71,15 @@ typedef struct {
 } SDValue;
 
 /* Cached, encoded, cumulative distribution for one incident (solid) angle */
-#define SD_CDIST_BASE	double		cTotal;	\
-			struct SDCDst_s	*next
+#define SD_CDIST_BASE(styp)	double		cTotal;	\
+				struct styp	*next
 typedef struct SDCDst_s {
-	SD_CDIST_BASE;			/* base fields first */
+	SD_CDIST_BASE(SDCDst_s);	/* base fields first */
 	/* ...encoded distribution extends struct */
 } SDCDst;
 
+extern const SDCDst	SDemptyCD;	/* empty distribution */
+
 /* Forward declaration of BSDF component */
 typedef struct SDComp_s	SDComponent;
 
@@ -81,14 +87,15 @@ typedef struct SDComp_s	SDComponent;
 typedef const struct {
 					/* return non-diffuse BSDF */
 	int		(*getBSDFs)(float coef[SDmaxCh], const FVECT outVec,
-				    const FVECT inVec, const void *dist);
+				    const FVECT inVec, SDComponent *sdc);
 					/* query non-diffuse PSA for vector */
-	SDError		(*queryProjSA)(double *psa, const FVECT vec,
-						int qflags, const void *dist);
+	SDError		(*queryProjSA)(double *psa, const FVECT v1,
+						const RREAL *v2, int qflags,
+						SDComponent *sdc);
 					/* get cumulative distribution */
 	const SDCDst	*(*getCDist)(const FVECT inVec, SDComponent *sdc);
 					/* sample cumulative distribution */
-	SDError		(*sampCDist)(FVECT outVec, double randX,
+	SDError		(*sampCDist)(FVECT ioVec, double randX,
 						const SDCDst *cdp);
 					/* free a spectral BSDF component */
 	void		(*freeSC)(void *dist);
@@ -112,13 +119,16 @@ typedef struct {
 
 /* Loaded BSDF data */
 typedef struct {
-	char		name[SDnameLn];	/* BSDF name (derived from file) */
+	char		name[SDnameLn];	/* BSDF name (usu. derived from file) */
+	char		matn[SDnameLn];	/* material name */
+	char		makr[SDnameLn];	/* manufacturer */
 	char		*mgf;		/* geometric description (if any) */
 	float		dim[3];		/* width, height, thickness (meters) */
 	SDValue		rLambFront;	/* diffuse front reflectance */
 	SDValue		rLambBack;	/* diffuse rear reflectance */
 	SDValue		tLamb;		/* diffuse transmission */
-	SDSpectralDF	*rf, *rb, *tf;	/* non-diffuse BSDF components */
+	SDSpectralDF	*rf, *rb;	/* non-diffuse BRDF components */
+	SDSpectralDF	*tf, *tb;	/* non-diffuse BTDF components */
 } SDData;
 
 /* List of loaded BSDFs */
@@ -129,12 +139,12 @@ extern struct SDCache_s {
 			*next;
 } *SDcacheList;		/* Global BSDF cache */
 
-/* BSDF cache retention preference */
-#define SDretainNone	0		/* free unreferenced data (default) */
-#define	SDretainBSDFs	1		/* keep loaded BSDFs in cache */
+/* BSDF cache retention policies */
+#define SDretainNone	0		/* free unreferenced BSDF data */
+#define	SDretainBSDFs	1		/* keep loaded BSDFs in memory */
 #define SDretainAll	2		/* also keep cumulative cache data */
 
-extern int		SDretainSet;	/* set to SDretainNone by default */
+extern int		SDretainSet;	/* =SDretainNone by default */
 
 /*****************************************************************
  * The following routines are less commonly used by applications.
@@ -151,6 +161,9 @@ extern void		SDclipName(char res[SDnameLn], const char
 /* Allocate new spectral distribution function */
 extern SDSpectralDF	*SDnewSpectralDF(int nc);
 
+/* Add component(s) to spectral distribution function */
+extern SDSpectralDF	*SDaddComponent(SDSpectralDF *odf, int nadd);
+
 /* Free a spectral distribution function */
 extern void		SDfreeSpectralDF(SDSpectralDF *df);
 
@@ -170,9 +183,8 @@ extern SDData		*SDgetCache(const char *bname);
 extern void		SDfreeCumulativeCache(SDSpectralDF *df);
 
 /* Sample an individual BSDF component */
-extern SDError		SDsampComponent(SDValue *sv, FVECT outVec,
-					const FVECT inVec, double randX,
-					SDComponent *sdc);
+extern SDError		SDsampComponent(SDValue *sv, FVECT ioVec,
+					double randX, SDComponent *sdc);
 
 /* Convert 1-dimensional random variable to N-dimensional */
 extern void		SDmultiSamp(double t[], int n, double randX);
@@ -189,15 +201,16 @@ void			SDdisk2square(double sq[2], double diskx, doubl
  */
 
 /* Get BSDF from cache (or load and cache it on first call) */
-/* Report any problems to stderr and return NULL on failure */
+/* Report any problems to stderr (in English), return NULL on failure */
 extern const SDData	*SDcacheFile(const char *fname);
 
-/* Free a BSDF from our cache (clear all if NULL) */
+/* Free a BSDF from our cache (clear all if sd==NULL) */
 extern void		SDfreeCache(const SDData *sd);
 
-/* Query projected solid angle resolution for non-diffuse BSDF direction */
-extern SDError		SDsizeBSDF(double *projSA, const FVECT vec,
-					int qflags, const SDData *sd);
+/* Query projected solid angle resolution for non-diffuse BSDF direction(s) */
+extern SDError		SDsizeBSDF(double *projSA, const FVECT v1,
+					const RREAL *v2, int qflags,
+					const SDData *sd);
 
 /* Return BSDF for the given incident and scattered ray vectors */
 extern SDError		SDevalBSDF(SDValue *sv, const FVECT outVec,
@@ -208,8 +221,7 @@ extern double		SDdirectHemi(const FVECT inVec,
 					int sflags, const SDData *sd);
 
 /* Sample BSDF direction based on the given random variable */
-extern SDError		SDsampBSDF(SDValue *sv, FVECT outVec,
-					const FVECT inVec, double randX,
+extern SDError		SDsampBSDF(SDValue *sv, FVECT ioVec, double randX,
 					int sflags, const SDData *sd);
 
 /*****************************************************************
@@ -217,7 +229,7 @@ extern SDError		SDsampBSDF(SDValue *sv, FVECT outVec,
  * Directions may be passed unnormalized to these routines.
  */
 
-/* Compute World->BSDF transform from surface normal and up (Y) vector */
+/* Compute World->BSDF transform from surface normal and BSDF up vector */
 extern SDError		SDcompXform(RREAL vMtx[3][3], const FVECT sNrm,
 					const FVECT uVec);
 
@@ -228,10 +240,10 @@ extern SDError		SDinvXform(RREAL iMtx[3][3], RREAL vMt
 extern SDError		SDmapDir(FVECT resVec, RREAL vMtx[3][3],
 					const FVECT inpVec);
 
-/* System-specific BSDF loading routine (not part of our library) */
+/* Application-specific BSDF loading routine (not part of our library) */
 extern SDData		*loadBSDF(char *name);
 
-/* System-specific BSDF error translator (not part of our library) */
+/* Application-specific BSDF error translator (not part of our library) */
 extern char		*transSDError(SDError ec);
 
 /*################################################################*/