--- ray/src/cv/mgflib/parser.h 1994/06/24 09:32:55 1.5 +++ ray/src/cv/mgflib/parser.h 1994/07/01 18:06:53 1.13 @@ -13,8 +13,8 @@ #define MG_E_COLOR 1 #define MG_E_CONE 2 #define MG_E_CMIX 3 -#define MG_E_CXY 4 -#define MG_E_CSPEC 5 +#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 @@ -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 @@ -79,6 +80,9 @@ 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 @@ -90,13 +94,20 @@ extern char *mg_err[MG_NERRS]; #define MG_MAXARGC (MG_MAXLINE/4) /* maximum argument count */ typedef struct mg_fctxt { - char *fname; /* file name */ + 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 +116,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 @@ -162,7 +175,7 @@ typedef FLOAT FVECT[3]; (vr)[1]=(v1)[1]+(f)*(v2)[1], \ (vr)[2]=(v1)[2]+(f)*(v2)[2]) -#define is0vect(v) (DOT(v,v) < FTINY*FTINY) +#define is0vect(v) (DOT(v,v) <= FTINY*FTINY) #define round0(x) if (x <= FTINY && x >= -FTINY) x = 0 @@ -177,30 +190,26 @@ extern double normalize(FVECT); /* normalize a vector * (materials, colors, vectors) */ -/* The following structure will change when we add spectral data support */ -typedef struct { - float cx, cy; /* XY chromaticity coordinates */ -} C_COLOR; /* color context */ - -#ifdef later - -#define C_CMAXWL 780 /* maximum wavelength */ #define C_CMINWL 380 /* minimum wavelength */ +#define C_CMAXWL 780 /* maximum wavelength */ #define C_CNSS 41 /* number of spectral samples */ -#define C_WLINC ((C_MAXWL-C_MINWL)/(C_NSS-1)) /* 10 nm increment */ +#define C_CWLI ((C_CMAXWL-C_CMINWL)/(C_CNSS-1)) #define C_CMAXV 10000 /* nominal maximum sample value */ -#define C_CXY 1 /* flag if has xy chromaticity */ -#define C_CSPEC 2 /* flag if has spectrum */ +#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 */ typedef struct { + int clock; /* incremented each change */ short flags; /* what's been set */ - float cx, cy; /* xy chromaticity value */ short ssamp[C_CNSS]; /* spectral samples, min wl to max */ long ssum; /* straight sum of spectral values */ + float cx, cy; /* xy chromaticity value */ } C_COLOR; -#define C_DEFCOLOR { C_CXY|C_CSPEC, 1./3., 1./3., +#define C_DEFCOLOR { 1, C_CDXY|C_CSXY|C_CSSPEC,\ {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,\ @@ -208,32 +217,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_MAXV } + (long)C_CNSS*C_CMAXV, 1./3., 1./3. } -#define C_CIEX { C_CXY|C_CSPEC, ???, ???, +#define C_CIEX { 1, 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 } + 114,58,29,14,7,3,2,1,0}, 106836L, .735, .265 } -#define C_CIEY { C_CXY|C_CSPEC, ???, ???, +#define C_CIEY { 1, 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 } + 5,2,1,1,0,0}, 106856L, .274, .717 } -#define C_CIEZ { C_CXY|C_CSPEC, ???, ???, +#define C_CIEZ { 1, 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 } + 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_WLINC] / (c)->sum) +#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum) -#endif - 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 */ @@ -249,33 +257,41 @@ typedef struct { } C_MATERIAL; /* material context */ typedef struct { + int clock; /* incremented each change -- resettable */ FVECT p, n; /* point and normal */ } C_VERTEX; /* vertex context */ -#define isgrey(cxy) ((cxy)->cx > .32 && (cxy)->cx < .34 && \ - (cxy)->cy > .32 && (cxy)->cy < .34) - -#define C_DEFCOLOR {.333,.333} -#define C_DEFMATERIAL {NULL,1,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 {{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 */ +extern int c_isgrey(); /* check if color is grey */ #else extern int c_hcolor(int, char **); /* handle color entity */ 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 */ +extern int c_isgrey(C_COLOR *); /* check if color is grey */ #endif /************************************************************************* @@ -303,7 +319,6 @@ typedef FLOAT MAT4[4][4]; #define copymat4(m4a,m4b) bcopy((char *)m4b,(char *)m4a,sizeof(MAT4)) #else #define copymat4(m4a,m4b) (void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4)) -extern char *memcpy(); #endif #define MAT4IDENT { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \ @@ -321,12 +336,25 @@ typedef struct { #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 { - 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 xav0; /* zeroeth argument in xf_argv array */ + short xac; /* transform argument count */ + 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 */ @@ -374,7 +402,7 @@ extern void xf_clear(void); /* clear xf stack */ extern void multmat4(MAT4, MAT4, MAT4); /* m4a = m4b X m4c */ extern void multv3(FVECT, FVECT, MAT4); /* v3a = v3b X m4 (vectors) */ extern void multp3(FVECT, FVECT, MAT4); /* p3a = p3b X m4 (points) */ -extern int xf(XF, int, char **); /* interpret transform spec. */ +extern int xf(XF *, int, char **); /* interpret transform spec. */ #endif