--- ray/src/cv/mgflib/parser.h 1994/06/25 16:33:17 1.9 +++ ray/src/cv/mgflib/parser.h 1995/05/11 09:12:12 1.23 @@ -1,4 +1,4 @@ -/* Copyright (c) 1994 Regents of the University of California */ +/* Copyright (c) 1995 Regents of the University of California */ /* SCCSid "$SunId$ LBL" */ @@ -9,37 +9,40 @@ /* must include stdio.h before us */ /* Entities (order doesn't really matter) */ -#define MG_E_COMMENT 0 -#define MG_E_COLOR 1 -#define MG_E_CONE 2 -#define MG_E_CMIX 3 -#define MG_E_CSPEC 4 -#define MG_E_CXY 5 -#define MG_E_CYL 6 -#define MG_E_ED 7 -#define MG_E_FACE 8 -#define MG_E_INCLUDE 9 -#define MG_E_IES 10 -#define MG_E_MATERIAL 11 -#define MG_E_NORMAL 12 -#define MG_E_OBJECT 13 -#define MG_E_POINT 14 -#define MG_E_PRISM 15 -#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_COMMENT 0 /* # */ +#define MG_E_COLOR 1 /* c */ +#define MG_E_CCT 2 /* cct */ +#define MG_E_CONE 3 /* cone */ +#define MG_E_CMIX 4 /* cmix */ +#define MG_E_CSPEC 5 /* cspec */ +#define MG_E_CXY 6 /* cxy */ +#define MG_E_CYL 7 /* cyl */ +#define MG_E_ED 8 /* ed */ +#define MG_E_FACE 9 /* f */ +#define MG_E_INCLUDE 10 /* i */ +#define MG_E_IES 11 /* ies */ +#define MG_E_IR 12 /* ir */ +#define MG_E_MATERIAL 13 /* m */ +#define MG_E_NORMAL 14 /* n */ +#define MG_E_OBJECT 15 /* o */ +#define MG_E_POINT 16 /* p */ +#define MG_E_PRISM 17 /* prism */ +#define MG_E_RD 18 /* rd */ +#define MG_E_RING 19 /* ring */ +#define MG_E_RS 20 /* rs */ +#define MG_E_SIDES 21 /* sides */ +#define MG_E_SPH 22 /* sph */ +#define MG_E_TD 23 /* td */ +#define MG_E_TORUS 24 /* torus */ +#define MG_E_TS 25 /* ts */ +#define MG_E_VERTEX 26 /* v */ +#define MG_E_XF 27 /* xf */ -#define MG_NENTITIES 25 +#define MG_NENTITIES 28 /* total # entities */ -#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"} +#define MG_NAMELIST {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\ + "f","i","ies","ir","m","n","o","p","prism","rd",\ + "ring","rs","sides","sph","td","torus","ts","v","xf"} #define MG_MAXELEN 6 @@ -79,24 +82,34 @@ extern char *mg_err[MG_NERRS]; * To read from standard input, use NULL as the file name. * For additional control over error reporting and file management, * use mg_open, mg_read, mg_parse and mg_close instead of mg_load. + * To pass an entity of your own construction to the parser, use + * 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_fgoto 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 */ +#define MG_MAXLINE 4096 /* maximum input line length */ #define MG_MAXARGC (MG_MAXLINE/4) /* maximum argument count */ typedef struct mg_fctxt { char fname[96]; /* file name */ FILE *fp; /* stream pointer */ + int fid; /* unique file context id */ char inpline[MG_MAXLINE]; /* input line */ int lineno; /* line number */ struct mg_fctxt *prev; /* previous context */ } MG_FCTXT; +typedef struct { + int fid; /* file this position is for */ + int lineno; /* line number in file */ + long offset; /* offset from beginning */ +} MG_FPOS; + extern MG_FCTXT *mg_file; /* current file context */ #ifdef NOPROTO @@ -105,20 +118,22 @@ extern int mg_load(); /* parse a file */ extern int mg_open(); /* open new input file */ extern int mg_read(); /* read next line */ extern int mg_parse(); /* parse current line */ -extern int mg_rewind(); /* rewind input file */ +extern void mg_fgetpos(); /* get position on input file */ +extern int mg_fgoto(); /* go to position on input file */ extern void mg_close(); /* close input file */ extern void mg_clear(); /* clear parser */ -extern int mg_iterate(); +extern int mg_handle(); /* handle an entity */ #else extern void mg_init(void); /* fill in mg_ehand array */ extern int mg_load(char *); /* parse a file */ extern int mg_open(MG_FCTXT *, char *); /* open new input file */ extern int mg_read(void); /* read next line */ extern int mg_parse(void); /* parse current line */ -extern int mg_rewind(void); /* rewind input file */ +extern void mg_fgetpos(MG_FPOS *); /* get position on input file */ +extern int mg_fgoto(MG_FPOS *); /* go to position on input file */ extern void mg_close(void); /* close input file */ extern void mg_clear(void); /* clear parser */ -extern int mg_iterate(int, char **, int (*)(void)); +extern int mg_handle(int, int, char **); /* handle an entity */ #endif #ifndef MG_NQCD @@ -135,10 +150,12 @@ extern int mg_nqcdivs; /* divisions per quarter circl extern int mg_entity(); /* get entity number from its name */ extern int isint(); /* non-zero if integer format */ extern int isflt(); /* non-zero if floating point format */ +extern int isname(); /* non-zero if legal identifier name */ #else extern int mg_entity(char *); /* get entity number from its name */ extern int isint(char *); /* non-zero if integer format */ extern int isflt(char *); /* non-zero if floating point format */ +extern int isname(char *); /* non-zero if legal identifier name */ #endif /************************************************************************ @@ -182,22 +199,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,\ @@ -205,31 +224,16 @@ 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,\ - {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 } +#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum) -#define C_CIEY { "_cie_y", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\ - {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 } +#define C_1SIDEDTHICK 0.005 /* assumed thickness of 1-sided mat. */ -#define C_CIEZ { "_cie_z", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\ - {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 } - -#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum) - 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 nr, ni; /* index of refraction, real and imaginary */ float rd; /* diffuse reflectance */ C_COLOR rd_c; /* diffuse reflectance color */ float td; /* diffuse transmittance */ @@ -245,24 +249,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,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 */ @@ -272,6 +279,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 */ @@ -314,23 +322,40 @@ 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) +#define XF_MAXDIM 8 /* maximum array dimensions */ + +struct xf_array { + MG_FPOS spos; /* starting position on input */ + int ndim; /* number of array dimensions */ + struct { + short i, n; /* current count and maximum */ + char arg[8]; /* string argument value */ + } aarg[XF_MAXDIM]; +}; + typedef struct xf_spec { - long xid; /* unique transform id */ - short xac; /* transform argument count */ - short xav0; /* zeroeth argument in xf_argv array */ - XF xf; /* cumulative transformation */ - struct xf_spec *prev; /* previous transformation context */ -} XF_SPEC; + long xid; /* unique transform id */ + short xac; /* context 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 */ +} XF_SPEC; /* followed by argument buffer */ -extern int xf_argc; /* total # transform args. */ -extern char **xf_argv; /* transform arguments */ -extern XF_SPEC *xf_context; /* current context */ +extern XF_SPEC *xf_context; /* current transform context */ +extern char **xf_argend; /* last transform argument */ + +#define xf_ac(xf) ((xf)->xac) +#define xf_av(xf) (xf_argend - (xf)->xac) + +#define xf_argc (xf_context==NULL ? 0 : xf_ac(xf_context)) +#define xf_argv xf_av(xf_context) /* * The transformation handler should do most of the work that needs