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.7 by greg, Sat Feb 19 23:42:09 2011 UTC vs.
Revision 2.11 by greg, Tue Apr 19 21:31:22 2011 UTC

#	Line 9 | Line 9
9		*      in the surface plane pointed to the right as seen from the front.
10		*      This means the Y-axis is "up" and the Z-axis is the surface normal.
11		*
12	+	*  Note that we reverse the identification of "front" and "back" from
13	+	*      the conventions used in WINDOW 6.  "Front" in our library points
14	+	*      in the +Z direction, towards the interior of the space rather
15	+	*      than the exterior.
16	+	*
17		*  BSDF vectors always oriented away from surface, even when "incident."
18		*
19		*  Created by Greg Ward on 1/10/11.
#	Line 28 | Line 33 | extern "C" {
33		#define SDnameLn        128             /* maximum BSDF name length */
34		#define SDmaxCh         3               /* maximum # spectral channels */
35
36	<	/* Component flags for SDsampBSDF() and SDhemiScatter() */
36	>	/* Component flags for SDsampBSDF() and SDdirectHemi() */
37		#define SDsampR         0x1             /* include reflection */
38		#define SDsampT         0x2             /* include transmission */
39		#define SDsampS         0x3             /* include scattering (R+T) */
#	Line 39 | Line 44 | extern "C" {
44		#define SDsampSpS       0x7             /* include non-diffuse scattering */
45		#define SDsampAll       0xF             /* include everything */
46
47	<	/* Projected solid angle query flags fos SDsizeBSDF() */
47	>	/* Projected solid angle query flags for SDsizeBSDF() */
48		#define SDqueryVal      0x0             /* query single value */
49		#define SDqueryMin      0x1             /* query minimum proj. solid angle */
50		#define SDqueryMax      0x2             /* query maximum proj. solid angle */
#	Line 78 | Line 83 | typedef const struct {
83		int             (*getBSDFs)(float coef[SDmaxCh], const FVECT outVec,
84		const FVECT inVec, const void *dist);
85		/* query non-diffuse PSA for vector */
86	<	SDError         (*queryProjSA)(double *psa, const FVECT vec,
87	<	int qflags, const void *dist);
86	>	SDError         (*queryProjSA)(double *psa, const FVECT v1,
87	>	const RREAL *v2, int qflags,
88	>	const void *dist);
89		/* get cumulative distribution */
90		const SDCDst    *(*getCDist)(const FVECT inVec, SDComponent *sdc);
91		/* sample cumulative distribution */
#	Line 149 | Line 155 | extern SDSpectralDF    *SDnewSpectralDF(int nc);
155		/* Free a spectral distribution function */
156		extern void             SDfreeSpectralDF(SDSpectralDF *df);
157
158	<	/* Initialize an unused BSDF struct (clears to zeroes) */
159	<	extern void             SDclearBSDF(SDData *sd);
158	>	/* Initialize an unused BSDF struct and assign name (calls SDclipName) */
159	>	extern void             SDclearBSDF(SDData *sd, const char *fname);
160
161		/* Load a BSDF struct from the given file (keeps name unchanged) */
162		extern SDError          SDloadFile(SDData *sd, const char *fname);
#	Line 190 | Line 196 | extern const SDData    *SDcacheFile(const char *fname);
196		/* Free a BSDF from our cache (clear all if NULL) */
197		extern void             SDfreeCache(const SDData *sd);
198
199	<	/* Query projected solid angle resolution for non-diffuse BSDF direction */
200	<	extern SDError          SDsizeBSDF(double *projSA, const FVECT vec,
201	<	int qflags, const SDData *sd);
199	>	/* Query projected solid angle resolution for non-diffuse BSDF direction(s) */
200	>	extern SDError          SDsizeBSDF(double *projSA, const FVECT v1,
201	>	const RREAL *v2, int qflags,
202	>	const SDData *sd);
203
204		/* Return BSDF for the given incident and scattered ray vectors */
205		extern SDError          SDevalBSDF(SDValue *sv, const FVECT outVec,

Diff Legend

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