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.16 by greg, Sun Aug 21 22:38:12 2011 UTC vs.
Revision 2.25 by schorsch, Fri Jan 5 20:15:50 2018 UTC

# Line 25 | Line 25
25  
26   #include "fvect.h"
27   #include "ccolor.h"
28 + #include "platform.h"
29  
30   #ifdef __cplusplus
31   extern "C" {
32   #endif
33  
33 – #ifdef _WIN32
34 – #define strcasecmp      stricmp
35 – #endif
36 –
34   #define SDnameLn        128             /* maximum BSDF name length */
35   #define SDmaxCh         3               /* maximum # spectral channels */
36  
# Line 58 | Line 55 | extern "C" {
55   typedef enum {SDEnone=0, SDEmemory, SDEfile, SDEformat, SDEargument,
56                  SDEdata, SDEsupport, SDEinternal, SDEunknown} SDError;
57  
58 < /* English ASCII strings corresponding to ennumerated errors */
58 > /* English strings corresponding to ennumerated errors */
59   extern const char       *SDerrorEnglish[];
60  
61 < /* Additional information on last error (ASCII English) */
61 > /* Pointer to error list in preferred language */
62 > extern const char       **SDerrorList;
63 >
64 > /* Additional information on last error (generally in English) */
65   extern char             SDerrorDetail[];
66  
67   /* Holder for BSDF value and spectral color */
# Line 78 | Line 78 | typedef struct SDCDst_s {
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  
86   /* Methods needed to handle BSDF components (nothing is optional) */
87 + #ifdef __cplusplus
88 + /* in C++, the const puts the type into the local anonymous namespace,
89 +   making it a private (and different) type for each file using this header.
90 + */
91 + typedef struct {
92 + #else
93   typedef const struct {
94 + #endif
95                                          /* return non-diffuse BSDF */
96          int             (*getBSDFs)(float coef[SDmaxCh], const FVECT outVec,
97                                      const FVECT inVec, SDComponent *sdc);
# Line 118 | Line 127 | typedef struct {
127   /* Loaded BSDF data */
128   typedef struct {
129          char            name[SDnameLn]; /* BSDF name (usu. derived from file) */
130 +        char            matn[SDnameLn]; /* material name */
131 +        char            makr[SDnameLn]; /* manufacturer */
132          char            *mgf;           /* geometric description (if any) */
133 <        float           dim[3];         /* width, height, thickness (meters) */
133 >        double          dim[3];         /* width, height, thickness (meters) */
134          SDValue         rLambFront;     /* diffuse front reflectance */
135          SDValue         rLambBack;      /* diffuse rear reflectance */
136          SDValue         tLamb;          /* diffuse transmission */
137 <        SDSpectralDF    *rf, *rb, *tf;  /* non-diffuse BSDF components */
137 >        SDSpectralDF    *rf, *rb;       /* non-diffuse BRDF components */
138 >        SDSpectralDF    *tf, *tb;       /* non-diffuse BTDF components */
139   } SDData;
140  
141   /* List of loaded BSDFs */
# Line 147 | Line 159 | extern int             SDretainSet;    /* =SDretainNone by default *
159  
160   #define SDisLoaded(sd)  ((sd)->rLambFront.spec.flags != 0)
161  
162 < /* Report an error to the indicated stream (in English) */
163 < extern SDError          SDreportEnglish(SDError ec, FILE *fp);
162 > /* Report an error to the indicated stream */
163 > extern SDError          SDreportError(SDError ec, FILE *fp);
164  
165   /* Shorten file path to useable BSDF name, removing suffix */
166   extern void             SDclipName(char res[SDnameLn], const char *fname);
# Line 156 | Line 168 | extern void            SDclipName(char res[SDnameLn], const char
168   /* Allocate new spectral distribution function */
169   extern SDSpectralDF     *SDnewSpectralDF(int nc);
170  
171 + /* Add component(s) to spectral distribution function */
172 + extern SDSpectralDF     *SDaddComponent(SDSpectralDF *odf, int nadd);
173 +
174   /* Free a spectral distribution function */
175   extern void             SDfreeSpectralDF(SDSpectralDF *df);
176  
# Line 182 | Line 197 | extern SDError         SDsampComponent(SDValue *sv, FVECT ioV
197   extern void             SDmultiSamp(double t[], int n, double randX);
198  
199   /* Map a [0,1]^2 square to a unit radius disk */
200 < void                    SDsquare2disk(double ds[2], double seedx, double seedy);
200 > extern void             SDsquare2disk(double ds[2], double seedx, double seedy);
201  
202   /* Map point on unit disk to a unit square in [0,1]^2 range */
203 < void                    SDdisk2square(double sq[2], double diskx, double disky);
203 > extern void             SDdisk2square(double sq[2], double diskx, double disky);
204  
205   /*****************************************************************
206   * The calls below are the ones most applications require.
# Line 193 | Line 208 | void                   SDdisk2square(double sq[2], double diskx, doubl
208   */
209  
210   /* Get BSDF from cache (or load and cache it on first call) */
211 < /* Report any problems to stderr (in English), return NULL on failure */
211 > /* Report any problems to stderr, return NULL on failure */
212   extern const SDData     *SDcacheFile(const char *fname);
213  
214   /* Free a BSDF from our cache (clear all if sd==NULL) */
# Line 237 | Line 252 | extern SDData          *loadBSDF(char *name);
252  
253   /* Application-specific BSDF error translator (not part of our library) */
254   extern char             *transSDError(SDError ec);
240 –
241 – /*################################################################*/
242 – /*######### DEPRECATED DEFINITIONS AWAITING PERMANENT REMOVAL #######*/
243 – /*
244 – * Header for BSDF i/o and access routines
245 – */
246 –
247 – #include "mat4.h"
248 –                                /* up directions */
249 – typedef enum {
250 –        UDzneg=-3,
251 –        UDyneg=-2,
252 –        UDxneg=-1,
253 –        UDunknown=0,
254 –        UDxpos=1,
255 –        UDypos=2,
256 –        UDzpos=3
257 – } UpDir;
258 –                                /* BSDF coordinate calculation routines */
259 –                                /* vectors always point away from surface */
260 –
261 – typedef int     b_vecf2(FVECT v, int n, void *cd);
262 – typedef int     b_ndxf2(FVECT v, void *cd);
263 – typedef double  b_radf2(int n, void *cd);
264 –
265 – /* Bidirectional Scattering Distribution Function */
266 – struct BSDF_data {
267 –        int     ninc;                   /* number of incoming directions */
268 –        int     nout;                   /* number of outgoing directions */
269 –        float   dim[3];                 /* width, height, thickness (meters) */
270 –        char    *mgf;                   /* geometric description (if any) */
271 –        void    *ib_priv;               /* input basis private data */
272 –        b_vecf2 *ib_vec;                /* get input vector from index */
273 –        b_ndxf2 *ib_ndx;                /* get input index from vector */
274 –        b_radf2 *ib_ohm;                /* get input radius for index */
275 –        void    *ob_priv;               /* output basis private data */
276 –        b_vecf2 *ob_vec;                /* get output vector from index */
277 –        b_ndxf2 *ob_ndx;                /* get output index from vector */
278 –        b_radf2 *ob_ohm;                /* get output radius for index */
279 –        float   *bsdf;                  /* scattering distribution data */
280 – };                              /* bidirectional scattering distrib. func. */
281 –
282 – #define getBSDF_incvec(v,b,i)   (*(b)->ib_vec)(v,i,(b)->ib_priv)
283 – #define getBSDF_incndx(b,v)     (*(b)->ib_ndx)(v,(b)->ib_priv)
284 – #define getBSDF_incohm(b,i)     (*(b)->ib_ohm)(i,(b)->ib_priv)
285 – #define getBSDF_outvec(v,b,o)   (*(b)->ob_vec)(v,o,(b)->ob_priv)
286 – #define getBSDF_outndx(b,v)     (*(b)->ob_ndx)(v,(b)->ob_priv)
287 – #define getBSDF_outohm(b,o)     (*(b)->ob_ohm)(o,(b)->ob_priv)
288 – #define BSDF_value(b,i,o)       (b)->bsdf[(o)*(b)->ninc + (i)]
289 –
290 – extern struct BSDF_data *load_BSDF(char *fname);
291 – extern void free_BSDF(struct BSDF_data *b);
292 – extern int r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
293 –                                double rv, MAT4 xm);
294 – extern int r_BSDF_outvec(FVECT v, struct BSDF_data *b, int o,
295 –                                double rv, MAT4 xm);
296 – extern int getBSDF_xfm(MAT4 xm, FVECT nrm, UpDir ud, char *xfbuf);
297 –
298 – /*######### END DEPRECATED DEFINITIONS #######*/
299 – /*################################################################*/
255  
256   #ifdef __cplusplus
257   }

Diff Legend

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