ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/mgflib/parser.h
(Generate patch)

Comparing ray/src/cv/mgflib/parser.h (file contents):
Revision 1.5 by greg, Fri Jun 24 09:32:55 1994 UTC vs.
Revision 1.11 by greg, Thu Jun 30 11:07:38 1994 UTC

# Line 13 | Line 13
13   #define MG_E_COLOR      1
14   #define MG_E_CONE       2
15   #define MG_E_CMIX       3
16 < #define MG_E_CXY        4
17 < #define MG_E_CSPEC      5
16 > #define MG_E_CSPEC      4
17 > #define MG_E_CXY        5
18   #define MG_E_CYL        6
19   #define MG_E_ED         7
20   #define MG_E_FACE       8
# Line 79 | Line 79 | extern char    *mg_err[MG_NERRS];
79   * To read from standard input, use NULL as the file name.
80   * For additional control over error reporting and file management,
81   * use mg_open, mg_read, mg_parse and mg_close instead of mg_load.
82 + * To pass an entity of your own construction to the parser, use
83 + * the mg_handle function rather than the mg_ehand routines directly.
84 + * (The first argument to mg_handle is the entity #, or -1.)
85   * To free any data structures and clear the parser, use mg_clear.
86   * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
87   * will return an error from the list above.  In addition, mg_load
# Line 90 | Line 93 | extern char    *mg_err[MG_NERRS];
93   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
94  
95   typedef struct mg_fctxt {
96 <        char    *fname;                         /* file name */
96 >        char    fname[96];                      /* file name */
97          FILE    *fp;                            /* stream pointer */
98 +        int     fid;                            /* unique file context id */
99          char    inpline[MG_MAXLINE];            /* input line */
100          int     lineno;                         /* line number */
101          struct mg_fctxt *prev;                  /* previous context */
102   } MG_FCTXT;
103  
104 + typedef struct {
105 +        int     fid;                            /* file this position is for */
106 +        int     lineno;                         /* line number in file */
107 +        long    offset;                         /* offset from beginning */
108 + } MG_FPOS;
109 +
110   extern MG_FCTXT *mg_file;               /* current file context */
111  
112   #ifdef NOPROTO
# Line 105 | Line 115 | extern int     mg_load();              /* parse a file */
115   extern int      mg_open();              /* open new input file */
116   extern int      mg_read();              /* read next line */
117   extern int      mg_parse();             /* parse current line */
118 < extern int      mg_rewind();            /* rewind input file */
118 > extern void     mg_fgetpos();           /* get position on input file */
119 > extern int      mg_fgoto();             /* go to position on input file */
120   extern void     mg_close();             /* close input file */
121   extern void     mg_clear();             /* clear parser */
122 < extern int      mg_iterate();
122 > extern int      mg_handle();            /* handle an entity */
123   #else
124   extern void     mg_init(void);          /* fill in mg_ehand array */
125   extern int      mg_load(char *);        /* parse a file */
126   extern int      mg_open(MG_FCTXT *, char *);    /* open new input file */
127   extern int      mg_read(void);          /* read next line */
128   extern int      mg_parse(void);         /* parse current line */
129 < extern int      mg_rewind(void);        /* rewind input file */
129 > extern void     mg_fgetpos(MG_FPOS *);  /* get position on input file */
130 > extern int      mg_fgoto(MG_FPOS *);    /* go to position on input file */
131   extern void     mg_close(void);         /* close input file */
132   extern void     mg_clear(void);         /* clear parser */
133 < extern int      mg_iterate(int, char **, int (*)(void));
133 > extern int      mg_handle(int, int, char **);   /* handle an entity */
134   #endif
135  
136   #ifndef MG_NQCD
# Line 162 | Line 174 | typedef FLOAT  FVECT[3];
174                                  (vr)[1]=(v1)[1]+(f)*(v2)[1], \
175                                  (vr)[2]=(v1)[2]+(f)*(v2)[2])
176  
177 < #define is0vect(v)      (DOT(v,v) < FTINY*FTINY)
177 > #define is0vect(v)      (DOT(v,v) <= FTINY*FTINY)
178  
179   #define round0(x)       if (x <= FTINY && x >= -FTINY) x = 0
180  
# Line 177 | Line 189 | extern double  normalize(FVECT);       /* normalize a vector
189   *      (materials, colors, vectors)
190   */
191  
180 – /* The following structure will change when we add spectral data support */
181 – typedef struct {
182 –        float   cx, cy;         /* XY chromaticity coordinates */
183 – } C_COLOR;              /* color context */
184 –
185 – #ifdef later
186 –
187 – #define C_CMAXWL        780             /* maximum wavelength */
192   #define C_CMINWL        380             /* minimum wavelength */
193 + #define C_CMAXWL        780             /* maximum wavelength */
194   #define C_CNSS          41              /* number of spectral samples */
195 < #define C_WLINC         ((C_MAXWL-C_MINWL)/(C_NSS-1))   /* 10 nm increment */
195 > #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
196   #define C_CMAXV         10000           /* nominal maximum sample value */
197  
198 < #define C_CXY           1               /* flag if has xy chromaticity */
199 < #define C_CSPEC         2               /* flag if has spectrum */
198 > #define C_CSSPEC        01              /* flag if spectrum is set */
199 > #define C_CDSPEC        02              /* flag if defined w/ spectrum */
200 > #define C_CSXY          04              /* flag if xy is set */
201 > #define C_CDXY          010             /* flag if defined w/ xy */
202  
203   typedef struct {
204 +        char    *name;                  /* material name */
205 +        int     clock;                  /* incremented each change */
206          short   flags;                  /* what's been set */
198 –        float   cx, cy;                 /* xy chromaticity value */
207          short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
208          long    ssum;                   /* straight sum of spectral values */
209 +        float   cx, cy;                 /* xy chromaticity value */
210   } C_COLOR;
211  
212 < #define C_DEFCOLOR      { C_CXY|C_CSPEC, 1./3., 1./3.,
212 > #define C_DEFCOLOR      { NULL, 0, C_CDXY|C_CSXY|C_CSSPEC,\
213                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
214                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
215                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 208 | Line 217 | typedef struct {
217                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
218                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
219                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
220 <                        (long)C_CNSS*C_MAXV }
220 >                        (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
221  
222 < #define C_CIEX          { C_CXY|C_CSPEC, ???, ???,
222 > #define C_CIEX          { "_cie_x", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
223                          {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
224                          320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
225                          10622,10026,8544,6424,4479,2835,1649,874,468,227,\
226 <                        114,58,29,14,7,3,2,1,0}, 106836L }
226 >                        114,58,29,14,7,3,2,1,0}, 106836L, .735, .265 }
227  
228 < #define C_CIEY          { C_CXY|C_CSPEC, ???, ???,
228 > #define C_CIEY          { "_cie_y", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
229                          {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
230                          5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
231                          5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
232 <                        5,2,1,1,0,0}, 106856L }
232 >                        5,2,1,1,0,0}, 106856L, .274, .717 }
233  
234 < #define C_CIEZ          { C_CXY|C_CSPEC, ???, ???,
234 > #define C_CIEZ          { "_cie_z", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
235                          {65,201,679,2074,6456,13856,17471,17721,16692,\
236                          12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
237 <                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 106770L }
237 >                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
238 >                        106770L, .167, .009 }
239  
240 < #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_WLINC] / (c)->sum)
240 > #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum)
241  
232 – #endif
233 –
242   typedef struct {
243          char    *name;          /* material name */
244          int     clock;          /* incremented each change -- resettable */
# Line 249 | Line 257 | typedef struct {
257   } C_MATERIAL;           /* material context */
258  
259   typedef struct {
260 +        char    *name;          /* vector name */
261 +        int     clock;          /* incremented each change -- resettable */
262          FVECT   p, n;           /* point and normal */
263   } C_VERTEX;             /* vertex context */
264  
265 < #define isgrey(cxy)     ((cxy)->cx > .32 && (cxy)->cx < .34 && \
256 <                        (cxy)->cy > .32 && (cxy)->cy < .34)
257 <
258 < #define C_DEFCOLOR      {.333,.333}
259 < #define C_DEFMATERIAL   {NULL,1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
265 > #define C_DEFMATERIAL   {NULL,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
266                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
267 < #define C_DEFVERTEX     {{0.,0.,0.},{0.,0.,0.}}
267 > #define C_DEFVERTEX     {NULL,0,{0.,0.,0.},{0.,0.,0.}}
268  
269   extern C_COLOR          *c_ccolor;      /* the current color */
270   extern C_MATERIAL       *c_cmaterial;   /* the current material */
# Line 269 | Line 275 | extern int     c_hcolor();                     /* handle color entity */
275   extern int      c_hmaterial();                  /* handle material entity */
276   extern int      c_hvertex();                    /* handle vertex entity */
277   extern void     c_clearall();                   /* clear context tables */
278 + extern C_MATERIAL       *c_getmaterial();       /* get a named material */
279   extern C_VERTEX *c_getvert();                   /* get a named vertex */
280 + extern C_COLOR  *c_getcolor();                  /* get a named color */
281 + extern void     c_ccvt();                       /* fix color representation */
282 + extern int      c_isgrey();                     /* check if color is grey */
283   #else
284   extern int      c_hcolor(int, char **);         /* handle color entity */
285   extern int      c_hmaterial(int, char **);      /* handle material entity */
286   extern int      c_hvertex(int, char **);        /* handle vertex entity */
287   extern void     c_clearall(void);               /* clear context tables */
288 + extern C_MATERIAL       *c_getmaterial(char *); /* get a named material */
289   extern C_VERTEX *c_getvert(char *);             /* get a named vertex */
290 + extern C_COLOR  *c_getcolor(char *);            /* get a named color */
291 + extern void     c_ccvt(C_COLOR *, int);         /* fix color representation */
292 + extern int      c_isgrey(C_COLOR *);            /* check if color is grey */
293   #endif
294  
295   /*************************************************************************
# Line 303 | Line 317 | typedef FLOAT  MAT4[4][4];
317   #define  copymat4(m4a,m4b)      bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
318   #else
319   #define  copymat4(m4a,m4b)      (void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4))
306 – extern char  *memcpy();
320   #endif
321  
322   #define  MAT4IDENT              { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \
# Line 321 | Line 334 | typedef struct {
334  
335   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
336  
337 + #define XF_MAXDIM       8               /* maximum array dimensions */
338 +
339 + struct xf_array {
340 +        MG_FPOS spos;                   /* starting position on input */
341 +        int     ndim;                   /* number of array dimensions */
342 +        struct {
343 +                short   i, n;           /* current count and maximum */
344 +                char    arg[8];         /* string argument value */
345 +        } aarg[XF_MAXDIM];
346 + };
347 +
348   typedef struct xf_spec {
349 <        short   xac;            /* transform argument count */
350 <        short   xav0;           /* zeroeth argument in xf_argv array */
351 <        XF      xf;             /* cumulative transformation */
352 <        struct xf_spec  *prev;  /* previous transformation context */
353 < } XF_SPEC;
349 >        long    xid;                    /* unique transform id */
350 >        short   xav0;                   /* zeroeth argument in xf_argv array */
351 >        short   xac;                    /* transform argument count */
352 >        XF      xf;                     /* cumulative transformation */
353 >        struct xf_array *xarr;          /* transformation array pointer */
354 >        struct xf_spec  *prev;          /* previous transformation context */
355 > } XF_SPEC;                      /* followed by argument buffer */
356  
357   extern int      xf_argc;                        /* total # transform args. */
358   extern char     **xf_argv;                      /* transform arguments */
# Line 374 | Line 400 | extern void    xf_clear(void);                 /* clear xf stack */
400   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
401   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
402   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
403 < extern int      xf(XF, int, char **);           /* interpret transform spec. */
403 > extern int      xf(XF *, int, char **);         /* interpret transform spec. */
404  
405   #endif
406  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines