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.15 by greg, Thu Jun 9 17:09:39 2011 UTC vs.
Revision 2.18 by greg, Mon Mar 5 00:17:06 2012 UTC

# Line 71 | 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 118 | Line 118 | typedef struct {
118   /* Loaded BSDF data */
119   typedef struct {
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 155 | Line 157 | extern void            SDclipName(char res[SDnameLn], const char
157  
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);

Diff Legend

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