--- ray/src/common/bsdf_t.h	2011/06/03 18:12:58	3.8
+++ ray/src/common/bsdf_t.h	2013/11/10 17:32:09	3.11
@@ -1,4 +1,4 @@
-/* RCSid $Id: bsdf_t.h,v 3.8 2011/06/03 18:12:58 greg Exp $ */
+/* RCSid $Id: bsdf_t.h,v 3.11 2013/11/10 17:32:09 greg Exp $ */
 /*
  *  bsdf_t.h
  *  
@@ -29,9 +29,10 @@ typedef struct SDNode_s {
 	} u;			/* subtrees or values (extends struct) */
 } SDNode;
 
-#define SD_UFRONT	0x1	/* flag for BSDF uses front side */
-#define SD_UBACK	0x2	/* flag for BSDF uses back side */
-#define SD_XMIT		0x3	/* combine the two for transmission */
+#define SD_FREFL	1	/* component reflects off front side */
+#define SD_BREFL	2	/* component reflects off back side */
+#define SD_FXMIT	3	/* component transmits through front side */
+#define SD_BXMIT	4	/* component transmits through back side */
 
 /* Variable-resolution BSDF holder */
 typedef struct {
@@ -40,17 +41,18 @@ typedef struct {
 } SDTre;
 
 /* Holder for cumulative distribution (sum of BSDF * projSA) */
-typedef struct {
-	SD_CDIST_BASE;		/* base fields; must come first */
+typedef struct SDTreCDst_s {
+				/* base fields; must come first */
+	SD_CDIST_BASE(SDTreCDst_s);
 	double	clim[2][2];	/* input coordinate limits */
 	double	max_psa;	/* maximum projected solid angle */
-	short	sidef;		/* which side(s) to use */
+	short	sidef;		/* which mode is in play */
 	short	isodist;	/* isotropic distribution? */
 	int	calen;		/* cumulative array length */
 	struct {
 		unsigned	hndx;	/* hilbert index */
 		unsigned	cuml;	/* cumulative value */
-	}		carr[1];	/* cumulative array (extends struct) */
+	}	carr[1];	/* cumulative array (extends struct) */
 } SDTreCDst;	
 
 #ifdef _EZXML_H