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

Comparing ray/src/common/bsdf.h (file contents):
Revision 2.13 by greg, Sun Jun 5 20:27:14 2011 UTC vs.
Revision 2.17 by greg, Sun Mar 4 20:11:10 2012 UTC

# Line 30 | 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  
# Line 67 | 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 130 | Line 134 | extern struct SDCache_s {
134                          *next;
135   } *SDcacheList;         /* Global BSDF cache */
136  
137 < /* BSDF cache retention preference */
138 < #define SDretainNone    0               /* free unreferenced data*/
139 < #define SDretainBSDFs   1               /* keep loaded BSDFs in cache */
137 > /* BSDF cache retention policies */
138 > #define SDretainNone    0               /* free unreferenced BSDF data */
139 > #define SDretainBSDFs   1               /* keep loaded BSDFs in memory */
140   #define SDretainAll     2               /* also keep cumulative cache data */
141  
142   extern int              SDretainSet;    /* =SDretainNone by default */
# Line 151 | Line 155 | extern void            SDclipName(char res[SDnameLn], const char
155  
156   /* Allocate new spectral distribution function */
157   extern SDSpectralDF     *SDnewSpectralDF(int nc);
158 +
159 + /* Add component(s) to spectral distribution function */
160 + extern SDSpectralDF     *SDaddComponent(SDSpectralDF *odf, int nadd);
161  
162   /* Free a spectral distribution function */
163   extern void             SDfreeSpectralDF(SDSpectralDF *df);

Diff Legend

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