--- ray/src/util/cmatrix.h 2020/03/25 01:51:09 2.12 +++ ray/src/util/cmatrix.h 2025/04/19 17:12:59 2.16 @@ -1,4 +1,4 @@ -/* RCSid $Id: cmatrix.h,v 2.12 2020/03/25 01:51:09 greg Exp $ */ +/* RCSid $Id: cmatrix.h,v 2.16 2025/04/19 17:12:59 greg Exp $ */ /* * Color matrix routine declarations. * @@ -15,9 +15,18 @@ extern "C" { #endif -/* Data types for file loading */ -enum {DTfromHeader=0, DTrgbe, DTxyze, DTfloat, DTascii, DTdouble, DTend}; +/* Data types for file loading (used to be an enum) */ +#define DTfromHeader 0 +#define DTrgbe 1 +#define DTxyze 2 +#define DTspec 3 +#define DTfloat 4 +#define DTascii 5 +#define DTdouble 6 +#define DTend 7 +/* Defined in cmconst.c */ +extern const char stdin_name[]; extern const char *cm_fmt_id[]; extern const int cm_elem_size[]; @@ -58,7 +67,10 @@ extern CMATRIX *cm_multiply(const CMATRIX *cm1, const extern int cm_write(const CMATRIX *cm, int dtype, FILE *fp); /* Load and convert a matrix BTDF from the given XML file */ -extern CMATRIX *cm_loadBTDF(char *fname); +extern CMATRIX *cm_loadBTDF(const char *fname); + +/* Load and convert a matrix BRDF from the given XML file */ +extern CMATRIX *cm_loadBRDF(const char *fname, int backside); #ifdef __cplusplus }