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.21 by greg, Sat Jan 26 04:00:25 2013 UTC vs.
Revision 2.28 by greg, Sat Mar 27 17:50:18 2021 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 84 | Line 84 | extern const SDCDst    SDemptyCD;      /* empty distribution *
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 104 | 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 123 | Line 123 | typedef struct {
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 */
129 >        SDValue         tLambFront;     /* diffuse front transmittance */
130 >        SDValue         tLambBack;      /* diffuse back transmittance */
131          SDSpectralDF    *rf, *rb;       /* non-diffuse BRDF components */
132          SDSpectralDF    *tf, *tb;       /* non-diffuse BTDF components */
133   } SDData;
# Line 145 | Line 146 | extern struct SDCache_s {
146   #define SDretainAll     2               /* also keep cumulative cache data */
147  
148   extern int              SDretainSet;    /* =SDretainNone by default */
149 + extern unsigned long    SDmaxCache;     /* =0 (unlimited) by default */
150  
151   /*****************************************************************
152   * The following routines are less commonly used by applications.
# Line 152 | Line 154 | extern int             SDretainSet;    /* =SDretainNone by default *
154  
155   #define SDisLoaded(sd)  ((sd)->rLambFront.spec.flags != 0)
156  
157 < /* Report an error to the indicated stream (in English) */
158 < extern SDError          SDreportEnglish(SDError ec, FILE *fp);
157 > /* Report an error to the indicated stream */
158 > extern SDError          SDreportError(SDError ec, FILE *fp);
159  
160   /* Shorten file path to useable BSDF name, removing suffix */
161   extern void             SDclipName(char res[SDnameLn], const char *fname);
# Line 201 | Line 203 | extern void            SDdisk2square(double sq[2], double diskx,
203   */
204  
205   /* Get BSDF from cache (or load and cache it on first call) */
206 < /* Report any problems to stderr (in English), return NULL on failure */
206 > /* Report any problems to stderr, return NULL on failure */
207   extern const SDData     *SDcacheFile(const char *fname);
208  
209   /* Free a BSDF from our cache (clear all if sd==NULL) */

Diff Legend

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