ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/bsdf.h

Comparing ray/src/common/bsdf.h (file contents):
Revision 2.17 by greg, Sun Mar 4 20:11:10 2012 UTC vs.
Revision 2.21 by greg, Sat Jan 26 04:00:25 2013 UTC

#	Line 78 | Line 78 | typedef struct SDCDst_s {
78		/* ...encoded distribution extends struct */
79		} SDCDst;
80
81	+	extern const SDCDst     SDemptyCD;      /* empty distribution */
82	+
83		/* Forward declaration of BSDF component */
84		typedef struct SDComp_s SDComponent;
85
#	Line 118 | Line 120 | typedef struct {
120		/* Loaded BSDF data */
121		typedef struct {
122		char            name[SDnameLn]; /* BSDF name (usu. derived from file) */
123	+	char            matn[SDnameLn]; /* material name */
124	+	char            makr[SDnameLn]; /* manufacturer */
125		char            *mgf;           /* geometric description (if any) */
126		float           dim[3];         /* width, height, thickness (meters) */
127		SDValue         rLambFront;     /* diffuse front reflectance */
128		SDValue         rLambBack;      /* diffuse rear reflectance */
129		SDValue         tLamb;          /* diffuse transmission */
130	<	SDSpectralDF    *rf, *rb, *tf;  /* non-diffuse BSDF components */
130	>	SDSpectralDF    *rf, *rb;       /* non-diffuse BRDF components */
131	>	SDSpectralDF    *tf, *tb;       /* non-diffuse BTDF components */
132		} SDData;
133
134		/* List of loaded BSDFs */
#	Line 185 | Line 190 | extern SDError         SDsampComponent(SDValue *sv, FVECT ioV
190		extern void             SDmultiSamp(double t[], int n, double randX);
191
192		/* Map a [0,1]^2 square to a unit radius disk */
193	<	void                    SDsquare2disk(double ds[2], double seedx, double seedy);
193	>	extern void             SDsquare2disk(double ds[2], double seedx, double seedy);
194
195		/* Map point on unit disk to a unit square in [0,1]^2 range */
196	<	void                    SDdisk2square(double sq[2], double diskx, double disky);
196	>	extern void             SDdisk2square(double sq[2], double diskx, double disky);
197
198		/*****************************************************************
199		* The calls below are the ones most applications require.
#	Line 240 | Line 245 | extern SDData          *loadBSDF(char *name);
245
246		/* Application-specific BSDF error translator (not part of our library) */
247		extern char             *transSDError(SDError ec);
243	–
244	–	/*################################################################*/
245	–	/*######### DEPRECATED DEFINITIONS AWAITING PERMANENT REMOVAL #######*/
246	–	/*
247	–	* Header for BSDF i/o and access routines
248	–	*/
249	–
250	–	#include "mat4.h"
251	–	/* up directions */
252	–	typedef enum {
253	–	UDzneg=-3,
254	–	UDyneg=-2,
255	–	UDxneg=-1,
256	–	UDunknown=0,
257	–	UDxpos=1,
258	–	UDypos=2,
259	–	UDzpos=3
260	–	} UpDir;
261	–	/* BSDF coordinate calculation routines */
262	–	/* vectors always point away from surface */
263	–
264	–	typedef int     b_vecf2(FVECT v, int n, void *cd);
265	–	typedef int     b_ndxf2(FVECT v, void *cd);
266	–	typedef double  b_radf2(int n, void *cd);
267	–
268	–	/* Bidirectional Scattering Distribution Function */
269	–	struct BSDF_data {
270	–	int     ninc;                   /* number of incoming directions */
271	–	int     nout;                   /* number of outgoing directions */
272	–	float   dim[3];                 /* width, height, thickness (meters) */
273	–	char    *mgf;                   /* geometric description (if any) */
274	–	void    *ib_priv;               /* input basis private data */
275	–	b_vecf2 *ib_vec;                /* get input vector from index */
276	–	b_ndxf2 *ib_ndx;                /* get input index from vector */
277	–	b_radf2 *ib_ohm;                /* get input radius for index */
278	–	void    *ob_priv;               /* output basis private data */
279	–	b_vecf2 *ob_vec;                /* get output vector from index */
280	–	b_ndxf2 *ob_ndx;                /* get output index from vector */
281	–	b_radf2 *ob_ohm;                /* get output radius for index */
282	–	float   *bsdf;                  /* scattering distribution data */
283	–	};                              /* bidirectional scattering distrib. func. */
284	–
285	–	#define getBSDF_incvec(v,b,i)   (*(b)->ib_vec)(v,i,(b)->ib_priv)
286	–	#define getBSDF_incndx(b,v)     (*(b)->ib_ndx)(v,(b)->ib_priv)
287	–	#define getBSDF_incohm(b,i)     (*(b)->ib_ohm)(i,(b)->ib_priv)
288	–	#define getBSDF_outvec(v,b,o)   (*(b)->ob_vec)(v,o,(b)->ob_priv)
289	–	#define getBSDF_outndx(b,v)     (*(b)->ob_ndx)(v,(b)->ob_priv)
290	–	#define getBSDF_outohm(b,o)     (*(b)->ob_ohm)(o,(b)->ob_priv)
291	–	#define BSDF_value(b,i,o)       (b)->bsdf[(o)*(b)->ninc + (i)]
292	–
293	–	extern struct BSDF_data *load_BSDF(char *fname);
294	–	extern void free_BSDF(struct BSDF_data *b);
295	–	extern int r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
296	–	double rv, MAT4 xm);
297	–	extern int r_BSDF_outvec(FVECT v, struct BSDF_data *b, int o,
298	–	double rv, MAT4 xm);
299	–	extern int getBSDF_xfm(MAT4 xm, FVECT nrm, UpDir ud, char *xfbuf);
300	–
301	–	/*######### END DEPRECATED DEFINITIONS #######*/
302	–	/*################################################################*/
248
249		#ifdef __cplusplus
250		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)