--- ray/src/common/bsdf.h 2011/02/18 02:41:55 2.5 +++ ray/src/common/bsdf.h 2011/02/21 22:50:37 2.8 @@ -1,4 +1,4 @@ -/* RCSid $Id: bsdf.h,v 2.5 2011/02/18 02:41:55 greg Exp $ */ +/* RCSid $Id: bsdf.h,v 2.8 2011/02/21 22:50:37 greg Exp $ */ /* * bsdf.h * @@ -9,6 +9,11 @@ * in the surface plane pointed to the right as seen from the front. * This means the Y-axis is "up" and the Z-axis is the surface normal. * + * Note that we reverse the identification of "front" and "back" from + * the conventions used in WINDOW 6. "Front" in our library points + * in the +Z direction, towards the interior of the space rather + * than the exterior. + * * BSDF vectors always oriented away from surface, even when "incident." * * Created by Greg Ward on 1/10/11. @@ -40,10 +45,9 @@ extern "C" { #define SDsampAll 0xF /* include everything */ /* Projected solid angle query flags fos SDsizeBSDF() */ -#define SDqueryInc 0x1 /* query incoming vector */ -#define SDqueryOut 0x2 /* query outgoing vector */ -#define SDqueryMin 0x4 /* query minimum proj. solid angle */ -#define SDqueryMax 0x8 /* query maximum proj. solid angle */ +#define SDqueryVal 0x0 /* query single value */ +#define SDqueryMin 0x1 /* query minimum proj. solid angle */ +#define SDqueryMax 0x2 /* query maximum proj. solid angle */ /* Error codes: normal return, out of memory, file i/o, file format, bad argument, bad data, unsupported feature, internal error, unknown error */ @@ -136,7 +140,7 @@ extern int SDretainSet; /* set to SDretainNone by def * The following routines are less commonly used by applications. */ -#define SDisLoaded(sd) ((sd)->rLambFront.spec.clock != 0) +#define SDisLoaded(sd) ((sd)->rLambFront.spec.flags != 0) /* Report an error to the indicated stream (in English) */ extern SDError SDreportEnglish(SDError ec, FILE *fp);