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.7 by greg, Sat Feb 19 23:42:09 2011 UTC vs.
Revision 2.22 by greg, Sun Apr 21 21:36:23 2013 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() */
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 */
# Line 49 | Line 58 | extern "C" {
58   typedef enum {SDEnone=0, SDEmemory, SDEfile, SDEformat, SDEargument,
59                  SDEdata, SDEsupport, SDEinternal, SDEunknown} SDError;
60  
61 < /* English ASCII strings corresponding to ennumerated errors */
61 > /* English strings corresponding to ennumerated errors */
62   extern const char       *SDerrorEnglish[];
63  
64 < /* Additional information on last error (ASCII English) */
64 > /* Pointer to error list in preferred language */
65 > extern const char       **SDerrorList;
66 >
67 > /* Additional information on last error (generally in English) */
68   extern char             SDerrorDetail[];
69  
70   /* Holder for BSDF value and spectral color */
# Line 62 | Line 74 | typedef struct {
74   } SDValue;
75  
76   /* Cached, encoded, cumulative distribution for one incident (solid) angle */
77 < #define SD_CDIST_BASE   double          cTotal; \
78 <                        struct SDCDst_s *next
77 > #define SD_CDIST_BASE(styp)     double          cTotal; \
78 >                                struct styp     *next
79   typedef struct SDCDst_s {
80 <        SD_CDIST_BASE;                  /* base fields first */
80 >        SD_CDIST_BASE(SDCDst_s);        /* base fields first */
81          /* ...encoded distribution extends struct */
82   } SDCDst;
83  
84 + extern const SDCDst     SDemptyCD;      /* empty distribution */
85 +
86   /* Forward declaration of BSDF component */
87   typedef struct SDComp_s SDComponent;
88  
# Line 76 | Line 90 | typedef struct SDComp_s        SDComponent;
90   typedef const struct {
91                                          /* return non-diffuse BSDF */
92          int             (*getBSDFs)(float coef[SDmaxCh], const FVECT outVec,
93 <                                    const FVECT inVec, const void *dist);
93 >                                    const FVECT inVec, SDComponent *sdc);
94                                          /* query non-diffuse PSA for vector */
95 <        SDError         (*queryProjSA)(double *psa, const FVECT vec,
96 <                                                int qflags, const void *dist);
95 >        SDError         (*queryProjSA)(double *psa, const FVECT v1,
96 >                                                const RREAL *v2, int qflags,
97 >                                                SDComponent *sdc);
98                                          /* get cumulative distribution */
99          const SDCDst    *(*getCDist)(const FVECT inVec, SDComponent *sdc);
100                                          /* sample cumulative distribution */
101 <        SDError         (*sampCDist)(FVECT outVec, double randX,
101 >        SDError         (*sampCDist)(FVECT ioVec, double randX,
102                                                  const SDCDst *cdp);
103                                          /* free a spectral BSDF component */
104          void            (*freeSC)(void *dist);
# Line 107 | Line 122 | typedef struct {
122  
123   /* Loaded BSDF data */
124   typedef struct {
125 <        char            name[SDnameLn]; /* BSDF name (derived from file) */
125 >        char            name[SDnameLn]; /* BSDF name (usu. derived from file) */
126 >        char            matn[SDnameLn]; /* material name */
127 >        char            makr[SDnameLn]; /* manufacturer */
128          char            *mgf;           /* geometric description (if any) */
129          float           dim[3];         /* width, height, thickness (meters) */
130          SDValue         rLambFront;     /* diffuse front reflectance */
131          SDValue         rLambBack;      /* diffuse rear reflectance */
132          SDValue         tLamb;          /* diffuse transmission */
133 <        SDSpectralDF    *rf, *rb, *tf;  /* non-diffuse BSDF components */
133 >        SDSpectralDF    *rf, *rb;       /* non-diffuse BRDF components */
134 >        SDSpectralDF    *tf, *tb;       /* non-diffuse BTDF components */
135   } SDData;
136  
137   /* List of loaded BSDFs */
# Line 124 | Line 142 | extern struct SDCache_s {
142                          *next;
143   } *SDcacheList;         /* Global BSDF cache */
144  
145 < /* BSDF cache retention preference */
146 < #define SDretainNone    0               /* free unreferenced data (default) */
147 < #define SDretainBSDFs   1               /* keep loaded BSDFs in cache */
145 > /* BSDF cache retention policies */
146 > #define SDretainNone    0               /* free unreferenced BSDF data */
147 > #define SDretainBSDFs   1               /* keep loaded BSDFs in memory */
148   #define SDretainAll     2               /* also keep cumulative cache data */
149  
150 < extern int              SDretainSet;    /* set to SDretainNone by default */
150 > extern int              SDretainSet;    /* =SDretainNone by default */
151  
152   /*****************************************************************
153   * The following routines are less commonly used by applications.
# Line 137 | Line 155 | extern int             SDretainSet;    /* set to SDretainNone by def
155  
156   #define SDisLoaded(sd)  ((sd)->rLambFront.spec.flags != 0)
157  
158 < /* Report an error to the indicated stream (in English) */
159 < extern SDError          SDreportEnglish(SDError ec, FILE *fp);
158 > /* Report an error to the indicated stream */
159 > extern SDError          SDreportError(SDError ec, FILE *fp);
160  
161   /* Shorten file path to useable BSDF name, removing suffix */
162   extern void             SDclipName(char res[SDnameLn], const char *fname);
# Line 146 | Line 164 | extern void            SDclipName(char res[SDnameLn], const char
164   /* Allocate new spectral distribution function */
165   extern SDSpectralDF     *SDnewSpectralDF(int nc);
166  
167 + /* Add component(s) to spectral distribution function */
168 + extern SDSpectralDF     *SDaddComponent(SDSpectralDF *odf, int nadd);
169 +
170   /* Free a spectral distribution function */
171   extern void             SDfreeSpectralDF(SDSpectralDF *df);
172  
173 < /* Initialize an unused BSDF struct (clears to zeroes) */
174 < extern void             SDclearBSDF(SDData *sd);
173 > /* Initialize an unused BSDF struct and assign name (calls SDclipName) */
174 > extern void             SDclearBSDF(SDData *sd, const char *fname);
175  
176   /* Load a BSDF struct from the given file (keeps name unchanged) */
177   extern SDError          SDloadFile(SDData *sd, const char *fname);
# Line 165 | Line 186 | extern SDData          *SDgetCache(const char *bname);
186   extern void             SDfreeCumulativeCache(SDSpectralDF *df);
187  
188   /* Sample an individual BSDF component */
189 < extern SDError          SDsampComponent(SDValue *sv, FVECT outVec,
190 <                                        const FVECT inVec, double randX,
170 <                                        SDComponent *sdc);
189 > extern SDError          SDsampComponent(SDValue *sv, FVECT ioVec,
190 >                                        double randX, SDComponent *sdc);
191  
192   /* Convert 1-dimensional random variable to N-dimensional */
193   extern void             SDmultiSamp(double t[], int n, double randX);
194  
195   /* Map a [0,1]^2 square to a unit radius disk */
196 < void                    SDsquare2disk(double ds[2], double seedx, double seedy);
196 > extern void             SDsquare2disk(double ds[2], double seedx, double seedy);
197  
198   /* Map point on unit disk to a unit square in [0,1]^2 range */
199 < void                    SDdisk2square(double sq[2], double diskx, double disky);
199 > extern void             SDdisk2square(double sq[2], double diskx, double disky);
200  
201   /*****************************************************************
202   * The calls below are the ones most applications require.
# Line 184 | Line 204 | void                   SDdisk2square(double sq[2], double diskx, doubl
204   */
205  
206   /* Get BSDF from cache (or load and cache it on first call) */
207 < /* Report any problems to stderr and return NULL on failure */
207 > /* Report any problems to stderr, return NULL on failure */
208   extern const SDData     *SDcacheFile(const char *fname);
209  
210 < /* Free a BSDF from our cache (clear all if NULL) */
210 > /* Free a BSDF from our cache (clear all if sd==NULL) */
211   extern void             SDfreeCache(const SDData *sd);
212  
213 < /* Query projected solid angle resolution for non-diffuse BSDF direction */
214 < extern SDError          SDsizeBSDF(double *projSA, const FVECT vec,
215 <                                        int qflags, const SDData *sd);
213 > /* Query projected solid angle resolution for non-diffuse BSDF direction(s) */
214 > extern SDError          SDsizeBSDF(double *projSA, const FVECT v1,
215 >                                        const RREAL *v2, int qflags,
216 >                                        const SDData *sd);
217  
218   /* Return BSDF for the given incident and scattered ray vectors */
219   extern SDError          SDevalBSDF(SDValue *sv, const FVECT outVec,
# Line 203 | Line 224 | extern double          SDdirectHemi(const FVECT inVec,
224                                          int sflags, const SDData *sd);
225  
226   /* Sample BSDF direction based on the given random variable */
227 < extern SDError          SDsampBSDF(SDValue *sv, FVECT outVec,
207 <                                        const FVECT inVec, double randX,
227 > extern SDError          SDsampBSDF(SDValue *sv, FVECT ioVec, double randX,
228                                          int sflags, const SDData *sd);
229  
230   /*****************************************************************
# Line 212 | Line 232 | extern SDError         SDsampBSDF(SDValue *sv, FVECT outVec,
232   * Directions may be passed unnormalized to these routines.
233   */
234  
235 < /* Compute World->BSDF transform from surface normal and up (Y) vector */
235 > /* Compute World->BSDF transform from surface normal and BSDF up vector */
236   extern SDError          SDcompXform(RREAL vMtx[3][3], const FVECT sNrm,
237                                          const FVECT uVec);
238  
# Line 223 | Line 243 | extern SDError         SDinvXform(RREAL iMtx[3][3], RREAL vMt
243   extern SDError          SDmapDir(FVECT resVec, RREAL vMtx[3][3],
244                                          const FVECT inpVec);
245  
246 < /* System-specific BSDF loading routine (not part of our library) */
246 > /* Application-specific BSDF loading routine (not part of our library) */
247   extern SDData           *loadBSDF(char *name);
248  
249 < /* System-specific BSDF error translator (not part of our library) */
249 > /* Application-specific BSDF error translator (not part of our library) */
250   extern char             *transSDError(SDError ec);
231 –
232 – /*################################################################*/
233 – /*######### DEPRECATED DEFINITIONS AWAITING PERMANENT REMOVAL #######*/
234 – /*
235 – * Header for BSDF i/o and access routines
236 – */
237 –
238 – #include "mat4.h"
239 –                                /* up directions */
240 – typedef enum {
241 –        UDzneg=-3,
242 –        UDyneg=-2,
243 –        UDxneg=-1,
244 –        UDunknown=0,
245 –        UDxpos=1,
246 –        UDypos=2,
247 –        UDzpos=3
248 – } UpDir;
249 –                                /* BSDF coordinate calculation routines */
250 –                                /* vectors always point away from surface */
251 –
252 – typedef int     b_vecf2(FVECT v, int n, void *cd);
253 – typedef int     b_ndxf2(FVECT v, void *cd);
254 – typedef double  b_radf2(int n, void *cd);
255 –
256 – /* Bidirectional Scattering Distribution Function */
257 – struct BSDF_data {
258 –        int     ninc;                   /* number of incoming directions */
259 –        int     nout;                   /* number of outgoing directions */
260 –        float   dim[3];                 /* width, height, thickness (meters) */
261 –        char    *mgf;                   /* geometric description (if any) */
262 –        void    *ib_priv;               /* input basis private data */
263 –        b_vecf2 *ib_vec;                /* get input vector from index */
264 –        b_ndxf2 *ib_ndx;                /* get input index from vector */
265 –        b_radf2 *ib_ohm;                /* get input radius for index */
266 –        void    *ob_priv;               /* output basis private data */
267 –        b_vecf2 *ob_vec;                /* get output vector from index */
268 –        b_ndxf2 *ob_ndx;                /* get output index from vector */
269 –        b_radf2 *ob_ohm;                /* get output radius for index */
270 –        float   *bsdf;                  /* scattering distribution data */
271 – };                              /* bidirectional scattering distrib. func. */
272 –
273 – #define getBSDF_incvec(v,b,i)   (*(b)->ib_vec)(v,i,(b)->ib_priv)
274 – #define getBSDF_incndx(b,v)     (*(b)->ib_ndx)(v,(b)->ib_priv)
275 – #define getBSDF_incohm(b,i)     (*(b)->ib_ohm)(i,(b)->ib_priv)
276 – #define getBSDF_outvec(v,b,o)   (*(b)->ob_vec)(v,o,(b)->ob_priv)
277 – #define getBSDF_outndx(b,v)     (*(b)->ob_ndx)(v,(b)->ob_priv)
278 – #define getBSDF_outohm(b,o)     (*(b)->ob_ohm)(o,(b)->ob_priv)
279 – #define BSDF_value(b,i,o)       (b)->bsdf[(o)*(b)->ninc + (i)]
280 –
281 – extern struct BSDF_data *load_BSDF(char *fname);
282 – extern void free_BSDF(struct BSDF_data *b);
283 – extern int r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
284 –                                double rv, MAT4 xm);
285 – extern int r_BSDF_outvec(FVECT v, struct BSDF_data *b, int o,
286 –                                double rv, MAT4 xm);
287 – extern int getBSDF_xfm(MAT4 xm, FVECT nrm, UpDir ud, char *xfbuf);
288 –
289 – /*######### END DEPRECATED DEFINITIONS #######*/
290 – /*################################################################*/
251  
252   #ifdef __cplusplus
253   }

Diff Legend

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