--- ray/src/common/color.h 2003/07/30 10:11:06 2.26 +++ ray/src/common/color.h 2004/03/28 20:33:12 2.28 @@ -1,4 +1,4 @@ -/* RCSid $Id: color.h,v 2.26 2003/07/30 10:11:06 schorsch Exp $ */ +/* RCSid $Id: color.h,v 2.28 2004/03/28 20:33:12 schorsch Exp $ */ /* * color.h - header for routines using pixel color values. * @@ -33,7 +33,8 @@ extern "C" { typedef BYTE COLR[4]; /* red, green, blue (or X,Y,Z), exponent */ -typedef float COLOR[3]; /* red, green, blue (or X,Y,Z) */ +typedef float COLORV; +typedef COLORV COLOR[3]; /* red, green, blue (or X,Y,Z) */ typedef float RGBPRIMS[4][2]; /* (x,y) chromaticities for RGBW */ typedef float (*RGBPRIMP)[2]; /* pointer to RGBPRIMS array */ @@ -113,7 +114,7 @@ typedef float COLORMAT[3][3]; /* color coordinate con #define D65EFFICACY 203. /* standard illuminant D65 */ #define INCEFFICACY 160. /* illuminant A (incand.) */ #define SUNEFFICACY 208. /* illuminant B (solar dir.) */ -#define SKYEFFICACY D65EFFICACY /* skylight */ +#define SKYEFFICACY D65EFFICACY /* skylight (should be 110) */ #define DAYEFFICACY D65EFFICACY /* combined sky and solar */ #define luminance(col) (WHTEFFICACY * bright(col))