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.20 by greg, Sat Oct 13 20:15:43 2012 UTC vs.
Revision 2.22 by greg, Sun Apr 21 21:36:23 2013 UTC

# Line 58 | Line 58 | extern "C" {
58   typedef enum {SDEnone=0, SDEmemory, SDEfile, SDEformat, SDEargument,
59                  SDEdata, SDEsupport, SDEinternal, SDEunknown} SDError;
60  
61 < /* English ASCII strings corresponding to ennumerated errors */
61 > /* English strings corresponding to ennumerated errors */
62   extern const char       *SDerrorEnglish[];
63  
64 < /* Additional information on last error (ASCII English) */
64 > /* Pointer to error list in preferred language */
65 > extern const char       **SDerrorList;
66 >
67 > /* Additional information on last error (generally in English) */
68   extern char             SDerrorDetail[];
69  
70   /* Holder for BSDF value and spectral color */
# Line 152 | Line 155 | extern int             SDretainSet;    /* =SDretainNone by default *
155  
156   #define SDisLoaded(sd)  ((sd)->rLambFront.spec.flags != 0)
157  
158 < /* Report an error to the indicated stream (in English) */
159 < extern SDError          SDreportEnglish(SDError ec, FILE *fp);
158 > /* Report an error to the indicated stream */
159 > extern SDError          SDreportError(SDError ec, FILE *fp);
160  
161   /* Shorten file path to useable BSDF name, removing suffix */
162   extern void             SDclipName(char res[SDnameLn], const char *fname);
# Line 190 | Line 193 | extern SDError         SDsampComponent(SDValue *sv, FVECT ioV
193   extern void             SDmultiSamp(double t[], int n, double randX);
194  
195   /* Map a [0,1]^2 square to a unit radius disk */
196 < void                    SDsquare2disk(double ds[2], double seedx, double seedy);
196 > extern void             SDsquare2disk(double ds[2], double seedx, double seedy);
197  
198   /* Map point on unit disk to a unit square in [0,1]^2 range */
199 < void                    SDdisk2square(double sq[2], double diskx, double disky);
199 > extern void             SDdisk2square(double sq[2], double diskx, double disky);
200  
201   /*****************************************************************
202   * The calls below are the ones most applications require.
# Line 201 | Line 204 | void                   SDdisk2square(double sq[2], double diskx, doubl
204   */
205  
206   /* Get BSDF from cache (or load and cache it on first call) */
207 < /* Report any problems to stderr (in English), return NULL on failure */
207 > /* Report any problems to stderr, return NULL on failure */
208   extern const SDData     *SDcacheFile(const char *fname);
209  
210   /* Free a BSDF from our cache (clear all if sd==NULL) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines