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.4 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.7 by greg, Sat Feb 19 23:42:09 2011 UTC

# Line 40 | Line 40 | extern "C" {
40   #define SDsampAll       0xF             /* include everything */
41  
42   /* Projected solid angle query flags fos SDsizeBSDF() */
43 < #define SDqueryInc      0x1             /* query incoming vector */
44 < #define SDqueryOut      0x2             /* query outgoing vector */
45 < #define SDqueryMin      0x4             /* query minimum proj. solid angle */
46 < #define SDqueryMax      0x8             /* query maximum proj. solid angle */
43 > #define SDqueryVal      0x0             /* query single value */
44 > #define SDqueryMin      0x1             /* query minimum proj. solid angle */
45 > #define SDqueryMax      0x2             /* query maximum proj. solid angle */
46  
47   /* Error codes: normal return, out of memory, file i/o, file format, bad argument,
48                   bad data, unsupported feature, internal error, unknown error */
# Line 136 | Line 135 | extern int             SDretainSet;    /* set to SDretainNone by def
135   * The following routines are less commonly used by applications.
136   */
137  
138 < #define SDisLoaded(sd)  ((sd)->rLambFront.spec.clock != 0)
138 > #define SDisLoaded(sd)  ((sd)->rLambFront.spec.flags != 0)
139  
140   /* Report an error to the indicated stream (in English) */
141   extern SDError          SDreportEnglish(SDError ec, FILE *fp);
# Line 223 | Line 222 | extern SDError         SDinvXform(RREAL iMtx[3][3], RREAL vMt
222   /* Transform and normalize direction (column) vector */
223   extern SDError          SDmapDir(FVECT resVec, RREAL vMtx[3][3],
224                                          const FVECT inpVec);
225 +
226 + /* System-specific BSDF loading routine (not part of our library) */
227 + extern SDData           *loadBSDF(char *name);
228 +
229 + /* System-specific BSDF error translator (not part of our library) */
230 + extern char             *transSDError(SDError ec);
231  
232   /*################################################################*/
233   /*######### DEPRECATED DEFINITIONS AWAITING PERMANENT REMOVAL #######*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines