ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/bsdf.h
(Generate patch)

Comparing ray/src/common/bsdf.h (file contents):
Revision 2.4 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.18 by greg, Mon Mar 5 00:17:06 2012 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 < *  BSDF vectors always oriented away from surface, even when "incident."
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 incident & exiting vectors are always oriented away from surface.
18 + *
19   *  Created by Greg Ward on 1/10/11.
20   *
21   */
# Line 25 | Line 30
30   extern "C" {
31   #endif
32  
33 + #ifdef _WIN32
34 + #define strcasecmp      stricmp
35 + #endif
36 +
37   #define SDnameLn        128             /* maximum BSDF name length */
38   #define SDmaxCh         3               /* maximum # spectral channels */
39  
40 < /* Component flags for SDsampBSDF() and SDhemiScatter() */
40 > /* Component flags for SDsampBSDF() and SDdirectHemi() */
41   #define SDsampR         0x1             /* include reflection */
42   #define SDsampT         0x2             /* include transmission */
43   #define SDsampS         0x3             /* include scattering (R+T) */
# Line 39 | Line 48 | extern "C" {
48   #define SDsampSpS       0x7             /* include non-diffuse scattering */
49   #define SDsampAll       0xF             /* include everything */
50  
51 < /* Projected solid angle query flags fos SDsizeBSDF() */
52 < #define SDqueryInc      0x1             /* query incoming vector */
53 < #define SDqueryOut      0x2             /* query outgoing vector */
54 < #define SDqueryMin      0x4             /* query minimum proj. solid angle */
46 < #define SDqueryMax      0x8             /* query maximum proj. solid angle */
51 > /* Projected solid angle query flags for SDsizeBSDF() */
52 > #define SDqueryVal      0x0             /* query single value */
53 > #define SDqueryMin      0x1             /* query minimum proj. solid angle */
54 > #define SDqueryMax      0x2             /* query maximum proj. solid angle */
55  
56   /* Error codes: normal return, out of memory, file i/o, file format, bad argument,
57                   bad data, unsupported feature, internal error, unknown error */
# Line 63 | Line 71 | typedef struct {
71   } SDValue;
72  
73   /* Cached, encoded, cumulative distribution for one incident (solid) angle */
74 < #define SD_CDIST_BASE   double          cTotal; \
75 <                        struct SDCDst_s *next
74 > #define SD_CDIST_BASE(styp)     double          cTotal; \
75 >                                struct styp     *next
76   typedef struct SDCDst_s {
77 <        SD_CDIST_BASE;                  /* base fields first */
77 >        SD_CDIST_BASE(SDCDst_s);        /* base fields first */
78          /* ...encoded distribution extends struct */
79   } SDCDst;
80  
# Line 77 | Line 85 | typedef struct SDComp_s        SDComponent;
85   typedef const struct {
86                                          /* return non-diffuse BSDF */
87          int             (*getBSDFs)(float coef[SDmaxCh], const FVECT outVec,
88 <                                    const FVECT inVec, const void *dist);
88 >                                    const FVECT inVec, SDComponent *sdc);
89                                          /* query non-diffuse PSA for vector */
90 <        SDError         (*queryProjSA)(double *psa, const FVECT vec,
91 <                                                int qflags, const void *dist);
90 >        SDError         (*queryProjSA)(double *psa, const FVECT v1,
91 >                                                const RREAL *v2, int qflags,
92 >                                                SDComponent *sdc);
93                                          /* get cumulative distribution */
94          const SDCDst    *(*getCDist)(const FVECT inVec, SDComponent *sdc);
95                                          /* sample cumulative distribution */
96 <        SDError         (*sampCDist)(FVECT outVec, double randX,
96 >        SDError         (*sampCDist)(FVECT ioVec, double randX,
97                                                  const SDCDst *cdp);
98                                          /* free a spectral BSDF component */
99          void            (*freeSC)(void *dist);
# Line 108 | Line 117 | typedef struct {
117  
118   /* Loaded BSDF data */
119   typedef struct {
120 <        char            name[SDnameLn]; /* BSDF name (derived from file) */
120 >        char            name[SDnameLn]; /* BSDF name (usu. derived from file) */
121 >        char            matn[SDnameLn]; /* material name */
122 >        char            makr[SDnameLn]; /* manufacturer */
123          char            *mgf;           /* geometric description (if any) */
124          float           dim[3];         /* width, height, thickness (meters) */
125          SDValue         rLambFront;     /* diffuse front reflectance */
# Line 125 | Line 136 | extern struct SDCache_s {
136                          *next;
137   } *SDcacheList;         /* Global BSDF cache */
138  
139 < /* BSDF cache retention preference */
140 < #define SDretainNone    0               /* free unreferenced data (default) */
141 < #define SDretainBSDFs   1               /* keep loaded BSDFs in cache */
139 > /* BSDF cache retention policies */
140 > #define SDretainNone    0               /* free unreferenced BSDF data */
141 > #define SDretainBSDFs   1               /* keep loaded BSDFs in memory */
142   #define SDretainAll     2               /* also keep cumulative cache data */
143  
144 < extern int              SDretainSet;    /* set to SDretainNone by default */
144 > extern int              SDretainSet;    /* =SDretainNone by default */
145  
146   /*****************************************************************
147   * The following routines are less commonly used by applications.
148   */
149  
150 < #define SDisLoaded(sd)  ((sd)->rLambFront.spec.clock != 0)
150 > #define SDisLoaded(sd)  ((sd)->rLambFront.spec.flags != 0)
151  
152   /* Report an error to the indicated stream (in English) */
153   extern SDError          SDreportEnglish(SDError ec, FILE *fp);
# Line 147 | Line 158 | extern void            SDclipName(char res[SDnameLn], const char
158   /* Allocate new spectral distribution function */
159   extern SDSpectralDF     *SDnewSpectralDF(int nc);
160  
161 + /* Add component(s) to spectral distribution function */
162 + extern SDSpectralDF     *SDaddComponent(SDSpectralDF *odf, int nadd);
163 +
164   /* Free a spectral distribution function */
165   extern void             SDfreeSpectralDF(SDSpectralDF *df);
166  
167 < /* Initialize an unused BSDF struct (clears to zeroes) */
168 < extern void             SDclearBSDF(SDData *sd);
167 > /* Initialize an unused BSDF struct and assign name (calls SDclipName) */
168 > extern void             SDclearBSDF(SDData *sd, const char *fname);
169  
170   /* Load a BSDF struct from the given file (keeps name unchanged) */
171   extern SDError          SDloadFile(SDData *sd, const char *fname);
# Line 166 | Line 180 | extern SDData          *SDgetCache(const char *bname);
180   extern void             SDfreeCumulativeCache(SDSpectralDF *df);
181  
182   /* Sample an individual BSDF component */
183 < extern SDError          SDsampComponent(SDValue *sv, FVECT outVec,
184 <                                        const FVECT inVec, double randX,
171 <                                        SDComponent *sdc);
183 > extern SDError          SDsampComponent(SDValue *sv, FVECT ioVec,
184 >                                        double randX, SDComponent *sdc);
185  
186   /* Convert 1-dimensional random variable to N-dimensional */
187   extern void             SDmultiSamp(double t[], int n, double randX);
# Line 185 | Line 198 | void                   SDdisk2square(double sq[2], double diskx, doubl
198   */
199  
200   /* Get BSDF from cache (or load and cache it on first call) */
201 < /* Report any problems to stderr and return NULL on failure */
201 > /* Report any problems to stderr (in English), return NULL on failure */
202   extern const SDData     *SDcacheFile(const char *fname);
203  
204 < /* Free a BSDF from our cache (clear all if NULL) */
204 > /* Free a BSDF from our cache (clear all if sd==NULL) */
205   extern void             SDfreeCache(const SDData *sd);
206  
207 < /* Query projected solid angle resolution for non-diffuse BSDF direction */
208 < extern SDError          SDsizeBSDF(double *projSA, const FVECT vec,
209 <                                        int qflags, const SDData *sd);
207 > /* Query projected solid angle resolution for non-diffuse BSDF direction(s) */
208 > extern SDError          SDsizeBSDF(double *projSA, const FVECT v1,
209 >                                        const RREAL *v2, int qflags,
210 >                                        const SDData *sd);
211  
212   /* Return BSDF for the given incident and scattered ray vectors */
213   extern SDError          SDevalBSDF(SDValue *sv, const FVECT outVec,
# Line 204 | Line 218 | extern double          SDdirectHemi(const FVECT inVec,
218                                          int sflags, const SDData *sd);
219  
220   /* Sample BSDF direction based on the given random variable */
221 < extern SDError          SDsampBSDF(SDValue *sv, FVECT outVec,
208 <                                        const FVECT inVec, double randX,
221 > extern SDError          SDsampBSDF(SDValue *sv, FVECT ioVec, double randX,
222                                          int sflags, const SDData *sd);
223  
224   /*****************************************************************
# Line 213 | Line 226 | extern SDError         SDsampBSDF(SDValue *sv, FVECT outVec,
226   * Directions may be passed unnormalized to these routines.
227   */
228  
229 < /* Compute World->BSDF transform from surface normal and up (Y) vector */
229 > /* Compute World->BSDF transform from surface normal and BSDF up vector */
230   extern SDError          SDcompXform(RREAL vMtx[3][3], const FVECT sNrm,
231                                          const FVECT uVec);
232  
# Line 223 | Line 236 | extern SDError         SDinvXform(RREAL iMtx[3][3], RREAL vMt
236   /* Transform and normalize direction (column) vector */
237   extern SDError          SDmapDir(FVECT resVec, RREAL vMtx[3][3],
238                                          const FVECT inpVec);
239 +
240 + /* Application-specific BSDF loading routine (not part of our library) */
241 + extern SDData           *loadBSDF(char *name);
242 +
243 + /* Application-specific BSDF error translator (not part of our library) */
244 + extern char             *transSDError(SDError ec);
245  
246   /*################################################################*/
247   /*######### DEPRECATED DEFINITIONS AWAITING PERMANENT REMOVAL #######*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines