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.25 by greg, Thu May 11 21:48:42 1995 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1994 Regents of the University of California */
1 > /* Copyright (c) 1995 Regents of the University of California */
2  
3   /* SCCSid "$SunId$ LBL" */
4  
# Line 8 | Line 8
8  
9   /* must include stdio.h before us */
10  
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_CXY        4
17 < #define MG_E_CSPEC      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
11 > #define MG_VMAJOR       1               /* major version number */
12 > #define MG_VMINOR       0               /* minor version number */
13  
14 < #define MG_NENTITIES    25
14 >                        /* Entities (list is only appended, never modified) */
15 > #define MG_E_COMMENT    0               /* #            */
16 > #define MG_E_COLOR      1               /* c            */
17 > #define MG_E_CCT        2               /* cct          */
18 > #define MG_E_CONE       3               /* cone         */
19 > #define MG_E_CMIX       4               /* cmix         */
20 > #define MG_E_CSPEC      5               /* cspec        */
21 > #define MG_E_CXY        6               /* cxy          */
22 > #define MG_E_CYL        7               /* cyl          */
23 > #define MG_E_ED         8               /* ed           */
24 > #define MG_E_FACE       9               /* f            */
25 > #define MG_E_INCLUDE    10              /* i            */
26 > #define MG_E_IES        11              /* ies          */
27 > #define MG_E_IR         12              /* ir           */
28 > #define MG_E_MATERIAL   13              /* m            */
29 > #define MG_E_NORMAL     14              /* n            */
30 > #define MG_E_OBJECT     15              /* o            */
31 > #define MG_E_POINT      16              /* p            */
32 > #define MG_E_PRISM      17              /* prism        */
33 > #define MG_E_RD         18              /* rd           */
34 > #define MG_E_RING       19              /* ring         */
35 > #define MG_E_RS         20              /* rs           */
36 > #define MG_E_SIDES      21              /* sides        */
37 > #define MG_E_SPH        22              /* sph          */
38 > #define MG_E_TD         23              /* td           */
39 > #define MG_E_TORUS      24              /* torus        */
40 > #define MG_E_TS         25              /* ts           */
41 > #define MG_E_VERTEX     26              /* v            */
42 > #define MG_E_XF         27              /* xf           */
43 >                        /* end of Version 1 entities */
44  
45 < #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
41 <                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
42 <                        "sph","td","torus","ts","v","xf"}
45 > #define MG_NENTITIES    28              /* total # entities */
46  
47 + #define MG_NELIST       {28}            /* entity count for version 1 and up */
48 +
49 + #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
50 +                        "f","i","ies","ir","m","n","o","p","prism","rd",\
51 +                        "ring","rs","sides","sph","td","torus","ts","v","xf"}
52 +
53   #define MG_MAXELEN      6
54  
55   extern char     mg_ename[MG_NENTITIES][MG_MAXELEN];
56  
57 <                        /* Handler routines for each entity */
49 <
57 >                        /* Handler routines for each entity and unknown ones */
58   #ifdef NOPROTO
59   extern int      (*mg_ehand[MG_NENTITIES])();
60 + extern int      (*mg_uhand)();
61 + extern int      mg_defuhand();
62   #else
63   extern int      (*mg_ehand[MG_NENTITIES])(int argc, char **argv);
64 + extern int      (*mg_uhand)(int argc, char **argv);
65 + extern int      mg_defuhand(int, char **);
66   #endif
67  
68 + extern unsigned mg_nunknown;            /* count of unknown entities */
69 +
70                          /* Error codes */
71   #define MG_OK           0               /* normal return value */
72   #define MG_EUNK         1               /* unknown entity */
# Line 68 | Line 82 | extern int     (*mg_ehand[MG_NENTITIES])(int argc, char **
82  
83   #define MG_NERRS        11
84  
85 < extern char     *mg_err[MG_NERRS];
85 > extern char     *mg_err[MG_NERRS];      /* list of error messages */
86  
87   /*
88   * The general process for running the parser is to fill in the mg_ehand
# Line 79 | Line 93 | extern char    *mg_err[MG_NERRS];
93   * To read from standard input, use NULL as the file name.
94   * For additional control over error reporting and file management,
95   * use mg_open, mg_read, mg_parse and mg_close instead of mg_load.
96 + * To pass an entity of your own construction to the parser, use
97 + * the mg_handle function rather than the mg_ehand routines directly.
98 + * (The first argument to mg_handle is the entity #, or -1.)
99   * To free any data structures and clear the parser, use mg_clear.
100 < * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
101 < * will return an error from the list above.  In addition, mg_load
102 < * will report the error to stderr.  The mg_read routine returns 0
103 < * when the end of file has been reached.
100 > * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
101 > * mg_fgoto will return an error from the list above.  In addition,
102 > * mg_load will report the error to stderr.  The mg_read routine
103 > * returns 0 when the end of file has been reached.
104   */
105  
106 < #define MG_MAXLINE      512             /* maximum input line length */
106 > #define MG_MAXLINE      4096            /* maximum input line length */
107   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
108  
109   typedef struct mg_fctxt {
110 <        char    *fname;                         /* file name */
110 >        char    fname[96];                      /* file name */
111          FILE    *fp;                            /* stream pointer */
112 +        int     fid;                            /* unique file context id */
113          char    inpline[MG_MAXLINE];            /* input line */
114          int     lineno;                         /* line number */
115          struct mg_fctxt *prev;                  /* previous context */
116   } MG_FCTXT;
117  
118 + typedef struct {
119 +        int     fid;                            /* file this position is for */
120 +        int     lineno;                         /* line number in file */
121 +        long    offset;                         /* offset from beginning */
122 + } MG_FPOS;
123 +
124   extern MG_FCTXT *mg_file;               /* current file context */
125  
126   #ifdef NOPROTO
# Line 105 | Line 129 | extern int     mg_load();              /* parse a file */
129   extern int      mg_open();              /* open new input file */
130   extern int      mg_read();              /* read next line */
131   extern int      mg_parse();             /* parse current line */
132 < extern int      mg_rewind();            /* rewind input file */
132 > extern void     mg_fgetpos();           /* get position on input file */
133 > extern int      mg_fgoto();             /* go to position on input file */
134   extern void     mg_close();             /* close input file */
135   extern void     mg_clear();             /* clear parser */
136 < extern int      mg_iterate();
136 > extern int      mg_handle();            /* handle an entity */
137   #else
138   extern void     mg_init(void);          /* fill in mg_ehand array */
139   extern int      mg_load(char *);        /* parse a file */
140   extern int      mg_open(MG_FCTXT *, char *);    /* open new input file */
141   extern int      mg_read(void);          /* read next line */
142   extern int      mg_parse(void);         /* parse current line */
143 < extern int      mg_rewind(void);        /* rewind input file */
143 > extern void     mg_fgetpos(MG_FPOS *);  /* get position on input file */
144 > extern int      mg_fgoto(MG_FPOS *);    /* go to position on input file */
145   extern void     mg_close(void);         /* close input file */
146   extern void     mg_clear(void);         /* clear parser */
147 < extern int      mg_iterate(int, char **, int (*)(void));
147 > extern int      mg_handle(int, int, char **);   /* handle an entity */
148   #endif
149  
150   #ifndef MG_NQCD
# Line 135 | Line 161 | extern int     mg_nqcdivs;             /* divisions per quarter circl
161   extern int mg_entity();                 /* get entity number from its name */
162   extern int isint();                     /* non-zero if integer format */
163   extern int isflt();                     /* non-zero if floating point format */
164 + extern int isname();                    /* non-zero if legal identifier name */
165   #else
166   extern int mg_entity(char *);           /* get entity number from its name */
167   extern int isint(char *);               /* non-zero if integer format */
168   extern int isflt(char *);               /* non-zero if floating point format */
169 + extern int isname(char *);              /* non-zero if legal identifier name */
170   #endif
171  
172   /************************************************************************
# Line 162 | Line 190 | typedef FLOAT  FVECT[3];
190                                  (vr)[1]=(v1)[1]+(f)*(v2)[1], \
191                                  (vr)[2]=(v1)[2]+(f)*(v2)[2])
192  
193 < #define is0vect(v)      (DOT(v,v) < FTINY*FTINY)
193 > #define is0vect(v)      (DOT(v,v) <= FTINY*FTINY)
194  
195   #define round0(x)       if (x <= FTINY && x >= -FTINY) x = 0
196  
# Line 177 | Line 205 | extern double  normalize(FVECT);       /* normalize a vector
205   *      (materials, colors, vectors)
206   */
207  
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 */
208   #define C_CMINWL        380             /* minimum wavelength */
209 + #define C_CMAXWL        780             /* maximum wavelength */
210   #define C_CNSS          41              /* number of spectral samples */
211 < #define C_WLINC         ((C_MAXWL-C_MINWL)/(C_NSS-1))   /* 10 nm increment */
211 > #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
212   #define C_CMAXV         10000           /* nominal maximum sample value */
213 + #define C_CLPWM         (683./C_CMAXV)  /* peak lumens/watt multiplier */
214  
215 < #define C_CXY           1               /* flag if has xy chromaticity */
216 < #define C_CSPEC         2               /* flag if has spectrum */
215 > #define C_CSSPEC        01              /* flag if spectrum is set */
216 > #define C_CDSPEC        02              /* flag if defined w/ spectrum */
217 > #define C_CSXY          04              /* flag if xy is set */
218 > #define C_CDXY          010             /* flag if defined w/ xy */
219 > #define C_CSEFF         020             /* flag if efficacy set */
220  
221   typedef struct {
222 +        int     clock;                  /* incremented each change */
223          short   flags;                  /* what's been set */
198 –        float   cx, cy;                 /* xy chromaticity value */
224          short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
225          long    ssum;                   /* straight sum of spectral values */
226 +        float   cx, cy;                 /* xy chromaticity value */
227 +        float   eff;                    /* efficacy (lumens/watt) */
228   } C_COLOR;
229  
230 < #define C_DEFCOLOR      { C_CXY|C_CSPEC, 1./3., 1./3.,
230 > #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
231                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
232                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
233                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 208 | Line 235 | typedef struct {
235                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
236                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
237                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
238 <                        (long)C_CNSS*C_MAXV }
238 >                        (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
239  
240 < #define C_CIEX          { C_CXY|C_CSPEC, ???, ???,
214 <                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
215 <                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
216 <                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
217 <                        114,58,29,14,7,3,2,1,0}, 106836L }
240 > #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
241  
242 < #define C_CIEY          { C_CXY|C_CSPEC, ???, ???,
220 <                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
221 <                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
222 <                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
223 <                        5,2,1,1,0,0}, 106856L }
242 > #define C_1SIDEDTHICK   0.005           /* assumed thickness of 1-sided mat. */
243  
225 – #define C_CIEZ          { C_CXY|C_CSPEC, ???, ???,
226 –                        {65,201,679,2074,6456,13856,17471,17721,16692,\
227 –                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
228 –                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 106770L }
229 –
230 – #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_WLINC] / (c)->sum)
231 –
232 – #endif
233 –
244   typedef struct {
235 –        char    *name;          /* material name */
245          int     clock;          /* incremented each change -- resettable */
246 +        int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
247 +        float   nr, ni;         /* index of refraction, real and imaginary */
248          float   rd;             /* diffuse reflectance */
249          C_COLOR rd_c;           /* diffuse reflectance color */
250          float   td;             /* diffuse transmittance */
# Line 249 | Line 260 | typedef struct {
260   } C_MATERIAL;           /* material context */
261  
262   typedef struct {
263 +        int     clock;          /* incremented each change -- resettable */
264          FVECT   p, n;           /* point and normal */
265   } C_VERTEX;             /* vertex context */
266  
267 < #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,\
267 > #define C_DEFMATERIAL   {1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
268                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
269 < #define C_DEFVERTEX     {{0.,0.,0.},{0.,0.,0.}}
269 > #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
270  
271   extern C_COLOR          *c_ccolor;      /* the current color */
272 + extern char             *c_ccname;      /* current color name */
273   extern C_MATERIAL       *c_cmaterial;   /* the current material */
274 + extern char             *c_cmname;      /* current material name */
275   extern C_VERTEX         *c_cvertex;     /* the current vertex */
276 + extern char             *c_cvname;      /* current vertex name */
277  
278   #ifdef NOPROTO
279   extern int      c_hcolor();                     /* handle color entity */
280   extern int      c_hmaterial();                  /* handle material entity */
281   extern int      c_hvertex();                    /* handle vertex entity */
282   extern void     c_clearall();                   /* clear context tables */
283 + extern C_MATERIAL       *c_getmaterial();       /* get a named material */
284   extern C_VERTEX *c_getvert();                   /* get a named vertex */
285 + extern C_COLOR  *c_getcolor();                  /* get a named color */
286 + extern void     c_ccvt();                       /* fix color representation */
287 + extern int      c_isgrey();                     /* check if color is grey */
288   #else
289   extern int      c_hcolor(int, char **);         /* handle color entity */
290   extern int      c_hmaterial(int, char **);      /* handle material entity */
291   extern int      c_hvertex(int, char **);        /* handle vertex entity */
292   extern void     c_clearall(void);               /* clear context tables */
293 + extern C_MATERIAL       *c_getmaterial(char *); /* get a named material */
294   extern C_VERTEX *c_getvert(char *);             /* get a named vertex */
295 + extern C_COLOR  *c_getcolor(char *);            /* get a named color */
296 + extern void     c_ccvt(C_COLOR *, int);         /* fix color representation */
297 + extern int      c_isgrey(C_COLOR *);            /* check if color is grey */
298   #endif
299  
300   /*************************************************************************
# Line 303 | Line 322 | typedef FLOAT  MAT4[4][4];
322   #define  copymat4(m4a,m4b)      bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
323   #else
324   #define  copymat4(m4a,m4b)      (void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4))
306 – extern char  *memcpy();
325   #endif
326  
327   #define  MAT4IDENT              { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \
# Line 315 | Line 333 | extern MAT4  m4ident;
333  
334                                  /* regular transformation */
335   typedef struct {
336 <        MAT4  xfm;                              /* transform matrix */
337 <        FLOAT  sca;                             /* scalefactor */
336 >        MAT4    xfm;                            /* transform matrix */
337 >        FLOAT   sca;                            /* scalefactor */
338   }  XF;
339  
340   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
341  
342 + #define XF_MAXDIM       8               /* maximum array dimensions */
343 +
344 + struct xf_array {
345 +        MG_FPOS spos;                   /* starting position on input */
346 +        int     ndim;                   /* number of array dimensions */
347 +        struct {
348 +                short   i, n;           /* current count and maximum */
349 +                char    arg[8];         /* string argument value */
350 +        } aarg[XF_MAXDIM];
351 + };
352 +
353   typedef struct xf_spec {
354 <        short   xac;            /* transform argument count */
355 <        short   xav0;           /* zeroeth argument in xf_argv array */
356 <        XF      xf;             /* cumulative transformation */
357 <        struct xf_spec  *prev;  /* previous transformation context */
358 < } XF_SPEC;
354 >        long    xid;                    /* unique transform id */
355 >        short   xac;                    /* context argument count */
356 >        short   rev;                    /* boolean true if vertices reversed */
357 >        XF      xf;                     /* cumulative transformation */
358 >        struct xf_array *xarr;          /* transformation array pointer */
359 >        struct xf_spec  *prev;          /* previous transformation context */
360 > } XF_SPEC;                      /* followed by argument buffer */
361  
362 < extern int      xf_argc;                        /* total # transform args. */
363 < extern char     **xf_argv;                      /* transform arguments */
333 < extern XF_SPEC  *xf_context;                    /* current context */
362 > extern XF_SPEC  *xf_context;                    /* current transform context */
363 > extern char     **xf_argend;                    /* last transform argument */
364  
365 + #define xf_ac(xf)       ((xf)->xac)
366 + #define xf_av(xf)       (xf_argend - (xf)->xac)
367 +
368 + #define xf_argc         (xf_context==NULL ? 0 : xf_ac(xf_context))
369 + #define xf_argv         xf_av(xf_context)
370 +
371   /*
372   * The transformation handler should do most of the work that needs
373   * doing.  Just pass it any xf entities, then use the associated
# Line 374 | Line 410 | extern void    xf_clear(void);                 /* clear xf stack */
410   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
411   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
412   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
413 < extern int      xf(XF, int, char **);           /* interpret transform spec. */
413 > extern int      xf(XF *, int, char **);         /* interpret transform spec. */
414  
415   #endif
416  

Diff Legend

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