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.14 by greg, Wed Jun 8 15:37:46 2011 UTC vs.
Revision 2.19 by greg, Sun Sep 2 15:33:15 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  
81 + extern const SDCDst     SDemptyCD;      /* empty distribution */
82 +
83   /* Forward declaration of BSDF component */
84   typedef struct SDComp_s SDComponent;
85  
# Line 114 | Line 120 | typedef struct {
120   /* Loaded BSDF data */
121   typedef struct {
122          char            name[SDnameLn]; /* BSDF name (usu. derived from file) */
123 +        char            matn[SDnameLn]; /* material name */
124 +        char            makr[SDnameLn]; /* manufacturer */
125          char            *mgf;           /* geometric description (if any) */
126          float           dim[3];         /* width, height, thickness (meters) */
127          SDValue         rLambFront;     /* diffuse front reflectance */
128          SDValue         rLambBack;      /* diffuse rear reflectance */
129          SDValue         tLamb;          /* diffuse transmission */
130 <        SDSpectralDF    *rf, *rb, *tf;  /* non-diffuse BSDF components */
130 >        SDSpectralDF    *rf, *rb;       /* non-diffuse BRDF components */
131 >        SDSpectralDF    *tf, *tb;       /* non-diffuse BTDF components */
132   } SDData;
133  
134   /* List of loaded BSDFs */
# Line 151 | Line 160 | extern void            SDclipName(char res[SDnameLn], const char
160  
161   /* Allocate new spectral distribution function */
162   extern SDSpectralDF     *SDnewSpectralDF(int nc);
163 +
164 + /* Add component(s) to spectral distribution function */
165 + extern SDSpectralDF     *SDaddComponent(SDSpectralDF *odf, int nadd);
166  
167   /* Free a spectral distribution function */
168   extern void             SDfreeSpectralDF(SDSpectralDF *df);

Diff Legend

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