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.6 by greg, Fri Jun 24 16:28:12 1994 UTC vs.
Revision 1.19 by greg, Fri Mar 10 15:16:42 1995 UTC

# Line 11 | Line 11
11                          /* Entities (order doesn't really matter) */
12   #define MG_E_COMMENT    0
13   #define MG_E_COLOR      1
14 < #define MG_E_CONE       2
15 < #define MG_E_CMIX       3
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
21 < #define MG_E_INCLUDE    9
22 < #define MG_E_IES        10
23 < #define MG_E_MATERIAL   11
24 < #define MG_E_NORMAL     12
25 < #define MG_E_OBJECT     13
26 < #define MG_E_POINT      14
27 < #define MG_E_PRISM      15
28 < #define MG_E_RD         16
29 < #define MG_E_RING       17
30 < #define MG_E_RS         18
31 < #define MG_E_SPH        19
32 < #define MG_E_TD         20
33 < #define MG_E_TORUS      21
34 < #define MG_E_TS         22
35 < #define MG_E_VERTEX     23
36 < #define MG_E_XF         24
14 > #define MG_E_CCT        2
15 > #define MG_E_CONE       3
16 > #define MG_E_CMIX       4
17 > #define MG_E_CSPEC      5
18 > #define MG_E_CXY        6
19 > #define MG_E_CYL        7
20 > #define MG_E_ED         8
21 > #define MG_E_FACE       9
22 > #define MG_E_INCLUDE    10
23 > #define MG_E_IES        11
24 > #define MG_E_MATERIAL   12
25 > #define MG_E_NORMAL     13
26 > #define MG_E_OBJECT     14
27 > #define MG_E_POINT      15
28 > #define MG_E_PRISM      16
29 > #define MG_E_RD         17
30 > #define MG_E_RING       18
31 > #define MG_E_RS         19
32 > #define MG_E_SIDES      20
33 > #define MG_E_SPH        21
34 > #define MG_E_TD         22
35 > #define MG_E_TORUS      23
36 > #define MG_E_TS         24
37 > #define MG_E_VERTEX     25
38 > #define MG_E_XF         26
39  
40 < #define MG_NENTITIES    25
40 > #define MG_NENTITIES    27
41  
42 < #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
43 <                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
44 <                        "sph","td","torus","ts","v","xf"}
42 > #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
43 >                        "f","i","ies","m","n","o","p","prism","rd","ring",\
44 >                        "rs","sides","sph","td","torus","ts","v","xf"}
45  
46   #define MG_MAXELEN      6
47  
# Line 79 | Line 81 | extern char    *mg_err[MG_NERRS];
81   * To read from standard input, use NULL as the file name.
82   * For additional control over error reporting and file management,
83   * use mg_open, mg_read, mg_parse and mg_close instead of mg_load.
84 + * To pass an entity of your own construction to the parser, use
85 + * the mg_handle function rather than the mg_ehand routines directly.
86 + * (The first argument to mg_handle is the entity #, or -1.)
87   * To free any data structures and clear the parser, use mg_clear.
88 < * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
89 < * will return an error from the list above.  In addition, mg_load
90 < * will report the error to stderr.  The mg_read routine returns 0
91 < * when the end of file has been reached.
88 > * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
89 > * mg_rewind will return an error from the list above.  In addition,
90 > * mg_load will report the error to stderr.  The mg_read routine
91 > * returns 0 when the end of file has been reached.
92   */
93  
94 < #define MG_MAXLINE      512             /* maximum input line length */
94 > #define MG_MAXLINE      4096            /* maximum input line length */
95   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
96  
97   typedef struct mg_fctxt {
98 <        char    *fname;                         /* file name */
98 >        char    fname[96];                      /* file name */
99          FILE    *fp;                            /* stream pointer */
100 +        int     fid;                            /* unique file context id */
101          char    inpline[MG_MAXLINE];            /* input line */
102          int     lineno;                         /* line number */
103          struct mg_fctxt *prev;                  /* previous context */
104   } MG_FCTXT;
105  
106 + typedef struct {
107 +        int     fid;                            /* file this position is for */
108 +        int     lineno;                         /* line number in file */
109 +        long    offset;                         /* offset from beginning */
110 + } MG_FPOS;
111 +
112   extern MG_FCTXT *mg_file;               /* current file context */
113  
114   #ifdef NOPROTO
# Line 105 | Line 117 | extern int     mg_load();              /* parse a file */
117   extern int      mg_open();              /* open new input file */
118   extern int      mg_read();              /* read next line */
119   extern int      mg_parse();             /* parse current line */
120 < extern int      mg_rewind();            /* rewind input file */
120 > extern void     mg_fgetpos();           /* get position on input file */
121 > extern int      mg_fgoto();             /* go to position on input file */
122   extern void     mg_close();             /* close input file */
123   extern void     mg_clear();             /* clear parser */
124 < extern int      mg_iterate();
124 > extern int      mg_handle();            /* handle an entity */
125   #else
126   extern void     mg_init(void);          /* fill in mg_ehand array */
127   extern int      mg_load(char *);        /* parse a file */
128   extern int      mg_open(MG_FCTXT *, char *);    /* open new input file */
129   extern int      mg_read(void);          /* read next line */
130   extern int      mg_parse(void);         /* parse current line */
131 < extern int      mg_rewind(void);        /* rewind input file */
131 > extern void     mg_fgetpos(MG_FPOS *);  /* get position on input file */
132 > extern int      mg_fgoto(MG_FPOS *);    /* go to position on input file */
133   extern void     mg_close(void);         /* close input file */
134   extern void     mg_clear(void);         /* clear parser */
135 < extern int      mg_iterate(int, char **, int (*)(void));
135 > extern int      mg_handle(int, int, char **);   /* handle an entity */
136   #endif
137  
138   #ifndef MG_NQCD
# Line 182 | Line 196 | extern double  normalize(FVECT);       /* normalize a vector
196   #define C_CNSS          41              /* number of spectral samples */
197   #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
198   #define C_CMAXV         10000           /* nominal maximum sample value */
199 + #define C_CLPWM         (683./C_CMAXV)  /* peak lumens/watt multiplier */
200  
201   #define C_CSSPEC        01              /* flag if spectrum is set */
202   #define C_CDSPEC        02              /* flag if defined w/ spectrum */
203   #define C_CSXY          04              /* flag if xy is set */
204   #define C_CDXY          010             /* flag if defined w/ xy */
205 + #define C_CSEFF         020             /* flag if efficacy set */
206  
207   typedef struct {
208 +        int     clock;                  /* incremented each change */
209          short   flags;                  /* what's been set */
210          short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
211          long    ssum;                   /* straight sum of spectral values */
212          float   cx, cy;                 /* xy chromaticity value */
213 +        float   eff;                    /* efficacy (lumens/watt) */
214   } C_COLOR;
215  
216 < #define C_DEFCOLOR      { C_CDXY|C_CSXY|C_CSSPEC,\
216 > #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
217                          {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,\
# Line 203 | Line 221 | typedef struct {
221                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
222                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
223                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
224 <                        (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
224 >                        (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
225  
226 < #define C_CIEX          { C_CDSPEC|C_CSSPEC|C_CSXY,\
209 <                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
210 <                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
211 <                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
212 <                        114,58,29,14,7,3,2,1,0}, 106836L, .735, .265 }
226 > #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
227  
214 – #define C_CIEY          { C_CDSPEC|C_CSSPEC|C_CSXY,\
215 –                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
216 –                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
217 –                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
218 –                        5,2,1,1,0,0}, 106856L, .274, .717 }
219 –
220 – #define C_CIEZ          { C_CDSPEC|C_CSSPEC|C_CSXY,\
221 –                        {65,201,679,2074,6456,13856,17471,17721,16692,\
222 –                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
223 –                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
224 –                        106770L, .167, .009 }
225 –
226 – #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum)
227 –
228   typedef struct {
229 –        char    *name;          /* material name */
229          int     clock;          /* incremented each change -- resettable */
230 +        int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
231          float   rd;             /* diffuse reflectance */
232          C_COLOR rd_c;           /* diffuse reflectance color */
233          float   td;             /* diffuse transmittance */
# Line 243 | Line 243 | typedef struct {
243   } C_MATERIAL;           /* material context */
244  
245   typedef struct {
246 +        int     clock;          /* incremented each change -- resettable */
247          FVECT   p, n;           /* point and normal */
248   } C_VERTEX;             /* vertex context */
249  
250 < #define C_DEFMATERIAL   {NULL,1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
250 > #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
251                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
252 < #define C_DEFVERTEX     {{0.,0.,0.},{0.,0.,0.}}
252 > #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
253  
254   extern C_COLOR          *c_ccolor;      /* the current color */
255 + extern char             *c_ccname;      /* current color name */
256   extern C_MATERIAL       *c_cmaterial;   /* the current material */
257 + extern char             *c_cmname;      /* current material name */
258   extern C_VERTEX         *c_cvertex;     /* the current vertex */
259 + extern char             *c_cvname;      /* current vertex name */
260  
261   #ifdef NOPROTO
262   extern int      c_hcolor();                     /* handle color entity */
263   extern int      c_hmaterial();                  /* handle material entity */
264   extern int      c_hvertex();                    /* handle vertex entity */
265   extern void     c_clearall();                   /* clear context tables */
266 + extern C_MATERIAL       *c_getmaterial();       /* get a named material */
267   extern C_VERTEX *c_getvert();                   /* get a named vertex */
268 + extern C_COLOR  *c_getcolor();                  /* get a named color */
269   extern void     c_ccvt();                       /* fix color representation */
270   extern int      c_isgrey();                     /* check if color is grey */
271   #else
# Line 267 | Line 273 | extern int     c_hcolor(int, char **);         /* handle color en
273   extern int      c_hmaterial(int, char **);      /* handle material entity */
274   extern int      c_hvertex(int, char **);        /* handle vertex entity */
275   extern void     c_clearall(void);               /* clear context tables */
276 + extern C_MATERIAL       *c_getmaterial(char *); /* get a named material */
277   extern C_VERTEX *c_getvert(char *);             /* get a named vertex */
278 + extern C_COLOR  *c_getcolor(char *);            /* get a named color */
279   extern void     c_ccvt(C_COLOR *, int);         /* fix color representation */
280   extern int      c_isgrey(C_COLOR *);            /* check if color is grey */
281   #endif
# Line 308 | Line 316 | extern MAT4  m4ident;
316  
317                                  /* regular transformation */
318   typedef struct {
319 <        MAT4  xfm;                              /* transform matrix */
320 <        FLOAT  sca;                             /* scalefactor */
319 >        MAT4    xfm;                            /* transform matrix */
320 >        FLOAT   sca;                            /* scalefactor */
321   }  XF;
322  
323   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
324  
325 + #define XF_MAXDIM       8               /* maximum array dimensions */
326 +
327 + struct xf_array {
328 +        MG_FPOS spos;                   /* starting position on input */
329 +        int     ndim;                   /* number of array dimensions */
330 +        struct {
331 +                short   i, n;           /* current count and maximum */
332 +                char    arg[8];         /* string argument value */
333 +        } aarg[XF_MAXDIM];
334 + };
335 +
336   typedef struct xf_spec {
337 <        short   xac;            /* transform argument count */
338 <        short   xav0;           /* zeroeth argument in xf_argv array */
339 <        XF      xf;             /* cumulative transformation */
340 <        struct xf_spec  *prev;  /* previous transformation context */
341 < } XF_SPEC;
337 >        long    xid;                    /* unique transform id */
338 >        short   xav0;                   /* zeroeth argument in xf_argv array */
339 >        short   xac;                    /* transform argument count */
340 >        short   rev;                    /* boolean true if vertices reversed */
341 >        XF      xf;                     /* cumulative transformation */
342 >        struct xf_array *xarr;          /* transformation array pointer */
343 >        struct xf_spec  *prev;          /* previous transformation context */
344 > } XF_SPEC;                      /* followed by argument buffer */
345  
346   extern int      xf_argc;                        /* total # transform args. */
347   extern char     **xf_argv;                      /* transform arguments */

Diff Legend

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