--- ray/src/cv/mgflib/parser.h 1994/06/29 16:15:17 1.10 +++ ray/src/cv/mgflib/parser.h 1994/09/02 16:04:16 1.16 @@ -28,18 +28,19 @@ #define MG_E_RD 16 #define MG_E_RING 17 #define MG_E_RS 18 -#define MG_E_SPH 19 -#define MG_E_TD 20 -#define MG_E_TORUS 21 -#define MG_E_TS 22 -#define MG_E_VERTEX 23 -#define MG_E_XF 24 +#define MG_E_SIDES 19 +#define MG_E_SPH 20 +#define MG_E_TD 21 +#define MG_E_TORUS 22 +#define MG_E_TS 23 +#define MG_E_VERTEX 24 +#define MG_E_XF 25 -#define MG_NENTITIES 25 +#define MG_NENTITIES 26 #define MG_NAMELIST {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\ "i","ies","m","n","o","p","prism","rd","ring","rs",\ - "sph","td","torus","ts","v","xf"} + "sides","sph","td","torus","ts","v","xf"} #define MG_MAXELEN 6 @@ -83,10 +84,10 @@ extern char *mg_err[MG_NERRS]; * the mg_handle function rather than the mg_ehand routines directly. * (The first argument to mg_handle is the entity #, or -1.) * To free any data structures and clear the parser, use mg_clear. - * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind - * will return an error from the list above. In addition, mg_load - * will report the error to stderr. The mg_read routine returns 0 - * when the end of file has been reached. + * If there is an error, mg_load, mg_open, mg_parse, mg_handle and + * mg_rewind will return an error from the list above. In addition, + * mg_load will report the error to stderr. The mg_read routine + * returns 0 when the end of file has been reached. */ #define MG_MAXLINE 512 /* maximum input line length */ @@ -194,22 +195,24 @@ extern double normalize(FVECT); /* normalize a vector #define C_CNSS 41 /* number of spectral samples */ #define C_CWLI ((C_CMAXWL-C_CMINWL)/(C_CNSS-1)) #define C_CMAXV 10000 /* nominal maximum sample value */ +#define C_CLPWM (683./C_CMAXV) /* peak lumens/watt multiplier */ #define C_CSSPEC 01 /* flag if spectrum is set */ #define C_CDSPEC 02 /* flag if defined w/ spectrum */ #define C_CSXY 04 /* flag if xy is set */ #define C_CDXY 010 /* flag if defined w/ xy */ +#define C_CSEFF 020 /* flag if efficacy set */ typedef struct { - char *name; /* material name */ int clock; /* incremented each change */ short flags; /* what's been set */ short ssamp[C_CNSS]; /* spectral samples, min wl to max */ long ssum; /* straight sum of spectral values */ float cx, cy; /* xy chromaticity value */ + float eff; /* efficacy (lumens/watt) */ } C_COLOR; -#define C_DEFCOLOR { NULL, 0, C_CDXY|C_CSXY|C_CSSPEC,\ +#define C_DEFCOLOR { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\ {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ @@ -217,31 +220,31 @@ typedef struct { C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\ - (long)C_CNSS*C_CMAXV, 1./3., 1./3. } + (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 } -#define C_CIEX { "_cie_x", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\ +#define C_CIEX { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\ {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\ 320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\ 10622,10026,8544,6424,4479,2835,1649,874,468,227,\ - 114,58,29,14,7,3,2,1,0}, 106836L, .735, .265 } + 114,58,29,14,7,3,2,1,0}, 106836L, .735, .265, 362.230 } -#define C_CIEY { "_cie_y", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\ +#define C_CIEY { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\ {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\ 5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\ 5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\ - 5,2,1,1,0,0}, 106856L, .274, .717 } + 5,2,1,1,0,0}, 106856L, .274, .717, 493.525 } -#define C_CIEZ { "_cie_z", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\ +#define C_CIEZ { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\ {65,201,679,2074,6456,13856,17471,17721,16692,\ 12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\ 11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\ - 106770L, .167, .009 } + 106770L, .167, .009, 54.363 } -#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum) +#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum) typedef struct { - char *name; /* material name */ int clock; /* incremented each change -- resettable */ + int sided; /* 1 if surface is 1-sided, 0 for 2-sided */ float rd; /* diffuse reflectance */ C_COLOR rd_c; /* diffuse reflectance color */ float td; /* diffuse transmittance */ @@ -257,24 +260,27 @@ typedef struct { } C_MATERIAL; /* material context */ typedef struct { - char *name; /* vector name */ int clock; /* incremented each change -- resettable */ FVECT p, n; /* point and normal */ } C_VERTEX; /* vertex context */ -#define C_DEFMATERIAL {NULL,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\ +#define C_DEFMATERIAL {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\ 0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.} -#define C_DEFVERTEX {NULL,0,{0.,0.,0.},{0.,0.,0.}} +#define C_DEFVERTEX {1,{0.,0.,0.},{0.,0.,0.}} extern C_COLOR *c_ccolor; /* the current color */ +extern char *c_ccname; /* current color name */ extern C_MATERIAL *c_cmaterial; /* the current material */ +extern char *c_cmname; /* current material name */ extern C_VERTEX *c_cvertex; /* the current vertex */ +extern char *c_cvname; /* current vertex name */ #ifdef NOPROTO extern int c_hcolor(); /* handle color entity */ extern int c_hmaterial(); /* handle material entity */ extern int c_hvertex(); /* handle vertex entity */ extern void c_clearall(); /* clear context tables */ +extern C_MATERIAL *c_getmaterial(); /* get a named material */ extern C_VERTEX *c_getvert(); /* get a named vertex */ extern C_COLOR *c_getcolor(); /* get a named color */ extern void c_ccvt(); /* fix color representation */ @@ -284,6 +290,7 @@ extern int c_hcolor(int, char **); /* handle color en extern int c_hmaterial(int, char **); /* handle material entity */ extern int c_hvertex(int, char **); /* handle vertex entity */ extern void c_clearall(void); /* clear context tables */ +extern C_MATERIAL *c_getmaterial(char *); /* get a named material */ extern C_VERTEX *c_getvert(char *); /* get a named vertex */ extern C_COLOR *c_getcolor(char *); /* get a named color */ extern void c_ccvt(C_COLOR *, int); /* fix color representation */ @@ -326,8 +333,8 @@ extern MAT4 m4ident; /* regular transformation */ typedef struct { - MAT4 xfm; /* transform matrix */ - FLOAT sca; /* scalefactor */ + MAT4 xfm; /* transform matrix */ + FLOAT sca; /* scalefactor */ } XF; #define identxf(xp) (void)(setident4((xp)->xfm),(xp)->sca=1.0) @@ -347,6 +354,7 @@ typedef struct xf_spec { long xid; /* unique transform id */ short xav0; /* zeroeth argument in xf_argv array */ short xac; /* transform argument count */ + short rev; /* boolean true if vertices reversed */ XF xf; /* cumulative transformation */ struct xf_array *xarr; /* transformation array pointer */ struct xf_spec *prev; /* previous transformation context */