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.7 by greg, Sat Jun 25 09:47:58 1994 UTC vs.
Revision 1.10 by greg, Wed Jun 29 16:15:17 1994 UTC

# 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 92 | Line 95 | extern char    *mg_err[MG_NERRS];
95   typedef struct mg_fctxt {
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 189 | Line 201 | extern double  normalize(FVECT);       /* normalize a vector
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 */
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_CDXY|C_CSXY|C_CSSPEC,\
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 205 | Line 219 | typedef struct {
219                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
220                          (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
221  
222 < #define C_CIEX          { C_CDSPEC|C_CSSPEC|C_CSXY,\
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, .735, .265 }
227  
228 < #define C_CIEY          { C_CDSPEC|C_CSSPEC|C_CSXY,\
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, .274, .717 }
233  
234 < #define C_CIEZ          { C_CDSPEC|C_CSSPEC|C_CSXY,\
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},\
# Line 243 | 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 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 316 | Line 332 | typedef struct {
332  
333   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
334  
335 + #define XF_MAXDIM       8               /* maximum array dimensions */
336 +
337 + struct xf_array {
338 +        MG_FPOS spos;                   /* starting position on input */
339 +        int     ndim;                   /* number of array dimensions */
340 +        struct {
341 +                short   i, n;           /* current count and maximum */
342 +                char    arg[8];         /* string argument value */
343 +        } aarg[XF_MAXDIM];
344 + };
345 +
346   typedef struct xf_spec {
347 <        short   xac;            /* transform argument count */
348 <        short   xav0;           /* zeroeth argument in xf_argv array */
349 <        XF      xf;             /* cumulative transformation */
350 <        struct xf_spec  *prev;  /* previous transformation context */
351 < } XF_SPEC;
347 >        long    xid;                    /* unique transform id */
348 >        short   xav0;                   /* zeroeth argument in xf_argv array */
349 >        short   xac;                    /* transform argument count */
350 >        XF      xf;                     /* cumulative transformation */
351 >        struct xf_array *xarr;          /* transformation array pointer */
352 >        struct xf_spec  *prev;          /* previous transformation context */
353 > } XF_SPEC;                      /* followed by argument buffer */
354  
355   extern int      xf_argc;                        /* total # transform args. */
356   extern char     **xf_argv;                      /* transform arguments */

Diff Legend

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