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.27 by greg, Thu May 14 19:20:13 2020 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 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  
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 < typedef const struct {
87 > typedef struct {
88                                          /* return non-diffuse BSDF */
89          int             (*getBSDFs)(float coef[SDmaxCh], const FVECT outVec,
90                                      const FVECT inVec, SDComponent *sdc);
# Line 102 | Line 104 | typedef const struct {
104   /* Structure to hold a spectral BSDF component (typedef SDComponent above) */
105   struct SDComp_s {
106          C_COLOR         cspec[SDmaxCh]; /* component spectral bases */
107 <        SDFunc          *func;          /* methods for this component */
107 >        const SDFunc    *func;          /* methods for this component */
108          void            *dist;          /* loaded distribution data */
109          SDCDst          *cdList;        /* cumulative distribution cache */
110   };
# Line 118 | 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) */
126 >        double          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 140 | Line 145 | extern struct SDCache_s {
145   #define SDretainAll     2               /* also keep cumulative cache data */
146  
147   extern int              SDretainSet;    /* =SDretainNone by default */
148 + extern unsigned long    SDmaxCache;     /* =0 (unlimited) by default */
149  
150   /*****************************************************************
151   * The following routines are less commonly used by applications.
# Line 147 | Line 153 | extern int             SDretainSet;    /* =SDretainNone by default *
153  
154   #define SDisLoaded(sd)  ((sd)->rLambFront.spec.flags != 0)
155  
156 < /* Report an error to the indicated stream (in English) */
157 < extern SDError          SDreportEnglish(SDError ec, FILE *fp);
156 > /* Report an error to the indicated stream */
157 > extern SDError          SDreportError(SDError ec, FILE *fp);
158  
159   /* Shorten file path to useable BSDF name, removing suffix */
160   extern void             SDclipName(char res[SDnameLn], const char *fname);
# Line 156 | Line 162 | extern void            SDclipName(char res[SDnameLn], const char
162   /* Allocate new spectral distribution function */
163   extern SDSpectralDF     *SDnewSpectralDF(int nc);
164  
165 + /* Add component(s) to spectral distribution function */
166 + extern SDSpectralDF     *SDaddComponent(SDSpectralDF *odf, int nadd);
167 +
168   /* Free a spectral distribution function */
169   extern void             SDfreeSpectralDF(SDSpectralDF *df);
170  
# Line 182 | Line 191 | extern SDError         SDsampComponent(SDValue *sv, FVECT ioV
191   extern void             SDmultiSamp(double t[], int n, double randX);
192  
193   /* Map a [0,1]^2 square to a unit radius disk */
194 < void                    SDsquare2disk(double ds[2], double seedx, double seedy);
194 > extern void             SDsquare2disk(double ds[2], double seedx, double seedy);
195  
196   /* Map point on unit disk to a unit square in [0,1]^2 range */
197 < void                    SDdisk2square(double sq[2], double diskx, double disky);
197 > extern void             SDdisk2square(double sq[2], double diskx, double disky);
198  
199   /*****************************************************************
200   * The calls below are the ones most applications require.
# Line 193 | Line 202 | void                   SDdisk2square(double sq[2], double diskx, doubl
202   */
203  
204   /* Get BSDF from cache (or load and cache it on first call) */
205 < /* Report any problems to stderr (in English), return NULL on failure */
205 > /* Report any problems to stderr, return NULL on failure */
206   extern const SDData     *SDcacheFile(const char *fname);
207  
208   /* Free a BSDF from our cache (clear all if sd==NULL) */
# Line 237 | Line 246 | extern SDData          *loadBSDF(char *name);
246  
247   /* Application-specific BSDF error translator (not part of our library) */
248   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 – /*################################################################*/
249  
250   #ifdef __cplusplus
251   }

Diff Legend

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