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.12 by greg, Sun Apr 24 19:39:21 2011 UTC vs.
Revision 2.13 by greg, Sun Jun 5 20:27:14 2011 UTC

# Line 14 | Line 14
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."
17 > *  BSDF incident & exiting vectors are always oriented away from surface.
18   *
19   *  Created by Greg Ward on 1/10/11.
20   *
# Line 113 | Line 113 | typedef struct {
113  
114   /* Loaded BSDF data */
115   typedef struct {
116 <        char            name[SDnameLn]; /* BSDF name (derived from file) */
116 >        char            name[SDnameLn]; /* BSDF name (usu. derived from file) */
117          char            *mgf;           /* geometric description (if any) */
118          float           dim[3];         /* width, height, thickness (meters) */
119          SDValue         rLambFront;     /* diffuse front reflectance */
# Line 131 | Line 131 | extern struct SDCache_s {
131   } *SDcacheList;         /* Global BSDF cache */
132  
133   /* BSDF cache retention preference */
134 < #define SDretainNone    0               /* free unreferenced data (default) */
134 > #define SDretainNone    0               /* free unreferenced data*/
135   #define SDretainBSDFs   1               /* keep loaded BSDFs in cache */
136   #define SDretainAll     2               /* also keep cumulative cache data */
137  
138 < extern int              SDretainSet;    /* set to SDretainNone by default */
138 > extern int              SDretainSet;    /* =SDretainNone by default */
139  
140   /*****************************************************************
141   * The following routines are less commonly used by applications.
# Line 189 | Line 189 | void                   SDdisk2square(double sq[2], double diskx, doubl
189   */
190  
191   /* Get BSDF from cache (or load and cache it on first call) */
192 < /* Report any problems to stderr and return NULL on failure */
192 > /* Report any problems to stderr (in English), return NULL on failure */
193   extern const SDData     *SDcacheFile(const char *fname);
194  
195 < /* Free a BSDF from our cache (clear all if NULL) */
195 > /* Free a BSDF from our cache (clear all if sd==NULL) */
196   extern void             SDfreeCache(const SDData *sd);
197  
198   /* Query projected solid angle resolution for non-diffuse BSDF direction(s) */
# Line 217 | Line 217 | extern SDError         SDsampBSDF(SDValue *sv, FVECT ioVec, d
217   * Directions may be passed unnormalized to these routines.
218   */
219  
220 < /* Compute World->BSDF transform from surface normal and up (Y) vector */
220 > /* Compute World->BSDF transform from surface normal and BSDF up vector */
221   extern SDError          SDcompXform(RREAL vMtx[3][3], const FVECT sNrm,
222                                          const FVECT uVec);
223  
# Line 228 | Line 228 | extern SDError         SDinvXform(RREAL iMtx[3][3], RREAL vMt
228   extern SDError          SDmapDir(FVECT resVec, RREAL vMtx[3][3],
229                                          const FVECT inpVec);
230  
231 < /* System-specific BSDF loading routine (not part of our library) */
231 > /* Application-specific BSDF loading routine (not part of our library) */
232   extern SDData           *loadBSDF(char *name);
233  
234 < /* System-specific BSDF error translator (not part of our library) */
234 > /* Application-specific BSDF error translator (not part of our library) */
235   extern char             *transSDError(SDError ec);
236  
237   /*################################################################*/

Diff Legend

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