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.3 by greg, Wed Jun 22 17:15:46 1994 UTC vs.
Revision 1.13 by greg, Fri Jul 1 18:06:53 1994 UTC

# Line 12 | Line 12
12   #define MG_E_COMMENT    0
13   #define MG_E_COLOR      1
14   #define MG_E_CONE       2
15 < #define MG_E_CXY        3
16 < #define MG_E_CYL        4
17 < #define MG_E_ED         5
18 < #define MG_E_FACE       6
19 < #define MG_E_INCLUDE    7
20 < #define MG_E_IES        8
21 < #define MG_E_MATERIAL   9
22 < #define MG_E_NORMAL     10
23 < #define MG_E_OBJECT     11
24 < #define MG_E_POINT      12
25 < #define MG_E_RD         13
26 < #define MG_E_RING       14
27 < #define MG_E_RS         15
28 < #define MG_E_SPH        16
29 < #define MG_E_TD         17
30 < #define MG_E_TORUS      18
31 < #define MG_E_TS         19
32 < #define MG_E_VERTEX     20
33 < #define MG_E_XF         21
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_SIDES      19
32 > #define MG_E_SPH        20
33 > #define MG_E_TD         21
34 > #define MG_E_TORUS      22
35 > #define MG_E_TS         23
36 > #define MG_E_VERTEX     24
37 > #define MG_E_XF         25
38  
39 < #define MG_NENTITIES    22
39 > #define MG_NENTITIES    26
40  
41 < #define MG_NAMELIST     {"#","c","cone","cxy","cyl","ed","f","i","ies",\
42 <        "m","n","o","p","rd","ring","rs","sph","td","torus","ts","v","xf"}
41 > #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
42 >                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
43 >                        "sides","sph","td","torus","ts","v","xf"}
44  
45   #define MG_MAXELEN      6
46  
# Line 75 | Line 80 | extern char    *mg_err[MG_NERRS];
80   * To read from standard input, use NULL as the file name.
81   * For additional control over error reporting and file management,
82   * use mg_open, mg_read, mg_parse and mg_close instead of mg_load.
83 + * To pass an entity of your own construction to the parser, use
84 + * the mg_handle function rather than the mg_ehand routines directly.
85 + * (The first argument to mg_handle is the entity #, or -1.)
86   * To free any data structures and clear the parser, use mg_clear.
87   * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
88   * will return an error from the list above.  In addition, mg_load
# Line 86 | Line 94 | extern char    *mg_err[MG_NERRS];
94   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
95  
96   typedef struct mg_fctxt {
97 <        char    *fname;                         /* file name */
97 >        char    fname[96];                      /* file name */
98          FILE    *fp;                            /* stream pointer */
99 +        int     fid;                            /* unique file context id */
100          char    inpline[MG_MAXLINE];            /* input line */
101          int     lineno;                         /* line number */
102          struct mg_fctxt *prev;                  /* previous context */
103   } MG_FCTXT;
104  
105 + typedef struct {
106 +        int     fid;                            /* file this position is for */
107 +        int     lineno;                         /* line number in file */
108 +        long    offset;                         /* offset from beginning */
109 + } MG_FPOS;
110 +
111   extern MG_FCTXT *mg_file;               /* current file context */
112  
113   #ifdef NOPROTO
# Line 101 | Line 116 | extern int     mg_load();              /* parse a file */
116   extern int      mg_open();              /* open new input file */
117   extern int      mg_read();              /* read next line */
118   extern int      mg_parse();             /* parse current line */
119 < extern int      mg_rewind();            /* rewind input file */
119 > extern void     mg_fgetpos();           /* get position on input file */
120 > extern int      mg_fgoto();             /* go to position on input file */
121   extern void     mg_close();             /* close input file */
122   extern void     mg_clear();             /* clear parser */
123 < extern int      mg_iterate();
123 > extern int      mg_handle();            /* handle an entity */
124   #else
125   extern void     mg_init(void);          /* fill in mg_ehand array */
126   extern int      mg_load(char *);        /* parse a file */
127   extern int      mg_open(MG_FCTXT *, char *);    /* open new input file */
128   extern int      mg_read(void);          /* read next line */
129   extern int      mg_parse(void);         /* parse current line */
130 < extern int      mg_rewind(void);        /* rewind input file */
130 > extern void     mg_fgetpos(MG_FPOS *);  /* get position on input file */
131 > extern int      mg_fgoto(MG_FPOS *);    /* go to position on input file */
132   extern void     mg_close(void);         /* close input file */
133   extern void     mg_clear(void);         /* clear parser */
134 < extern int      mg_iterate(int, char **, int (*)(void));
134 > extern int      mg_handle(int, int, char **);   /* handle an entity */
135   #endif
136  
137   #ifndef MG_NQCD
# Line 158 | Line 175 | typedef FLOAT  FVECT[3];
175                                  (vr)[1]=(v1)[1]+(f)*(v2)[1], \
176                                  (vr)[2]=(v1)[2]+(f)*(v2)[2])
177  
178 < #define is0vect(v)      (DOT(v,v) < FTINY*FTINY)
178 > #define is0vect(v)      (DOT(v,v) <= FTINY*FTINY)
179  
180   #define round0(x)       if (x <= FTINY && x >= -FTINY) x = 0
181  
# Line 173 | Line 190 | extern double  normalize(FVECT);       /* normalize a vector
190   *      (materials, colors, vectors)
191   */
192  
193 + #define C_CMINWL        380             /* minimum wavelength */
194 + #define C_CMAXWL        780             /* maximum wavelength */
195 + #define C_CNSS          41              /* number of spectral samples */
196 + #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
197 + #define C_CMAXV         10000           /* nominal maximum sample value */
198 +
199 + #define C_CSSPEC        01              /* flag if spectrum is set */
200 + #define C_CDSPEC        02              /* flag if defined w/ spectrum */
201 + #define C_CSXY          04              /* flag if xy is set */
202 + #define C_CDXY          010             /* flag if defined w/ xy */
203 +
204   typedef struct {
205 <        float   cx, cy;         /* XY chromaticity coordinates */
206 < } C_COLOR;              /* color context */
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      { 1, 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,\
216 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
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_CMAXV, 1./3., 1./3. }
221 +
222 + #define C_CIEX          { 1, 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          { 1, 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          { 1, 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},\
238 +                        106770L, .167, .009 }
239 +
240 + #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum)
241 +
242   typedef struct {
181 –        char    *name;          /* material name */
243          int     clock;          /* incremented each change -- resettable */
244 +        int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
245          float   rd;             /* diffuse reflectance */
246          C_COLOR rd_c;           /* diffuse reflectance color */
247          float   td;             /* diffuse transmittance */
# Line 195 | Line 257 | typedef struct {
257   } C_MATERIAL;           /* material context */
258  
259   typedef struct {
260 +        int     clock;          /* incremented each change -- resettable */
261          FVECT   p, n;           /* point and normal */
262   } C_VERTEX;             /* vertex context */
263  
264 < #define isgrey(cxy)     ((cxy)->cx > .31 && (cxy)->cx < .35 && \
202 <                        (cxy)->cy > .31 && (cxy)->cy < .35)
203 <
204 < #define C_DEFCOLOR      {.333,.333}
205 < #define C_DEFMATERIAL   {NULL,1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
264 > #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
265                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
266 < #define C_DEFVERTEX     {{0.,0.,0.},{0.,0.,0.}}
266 > #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
267  
268   extern C_COLOR          *c_ccolor;      /* the current color */
269 + extern char             *c_ccname;      /* current color name */
270   extern C_MATERIAL       *c_cmaterial;   /* the current material */
271 + extern char             *c_cmname;      /* current material name */
272   extern C_VERTEX         *c_cvertex;     /* the current vertex */
273 + extern char             *c_cvname;      /* current vertex name */
274  
275   #ifdef NOPROTO
276   extern int      c_hcolor();                     /* handle color entity */
277   extern int      c_hmaterial();                  /* handle material entity */
278   extern int      c_hvertex();                    /* handle vertex entity */
279   extern void     c_clearall();                   /* clear context tables */
280 + extern C_MATERIAL       *c_getmaterial();       /* get a named material */
281   extern C_VERTEX *c_getvert();                   /* get a named vertex */
282 + extern C_COLOR  *c_getcolor();                  /* get a named color */
283 + extern void     c_ccvt();                       /* fix color representation */
284 + extern int      c_isgrey();                     /* check if color is grey */
285   #else
286   extern int      c_hcolor(int, char **);         /* handle color entity */
287   extern int      c_hmaterial(int, char **);      /* handle material entity */
288   extern int      c_hvertex(int, char **);        /* handle vertex entity */
289   extern void     c_clearall(void);               /* clear context tables */
290 + extern C_MATERIAL       *c_getmaterial(char *); /* get a named material */
291   extern C_VERTEX *c_getvert(char *);             /* get a named vertex */
292 + extern C_COLOR  *c_getcolor(char *);            /* get a named color */
293 + extern void     c_ccvt(C_COLOR *, int);         /* fix color representation */
294 + extern int      c_isgrey(C_COLOR *);            /* check if color is grey */
295   #endif
296  
297   /*************************************************************************
# Line 249 | Line 319 | typedef FLOAT  MAT4[4][4];
319   #define  copymat4(m4a,m4b)      bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
320   #else
321   #define  copymat4(m4a,m4b)      (void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4))
252 – extern char  *memcpy();
322   #endif
323  
324   #define  MAT4IDENT              { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \
# Line 267 | Line 336 | typedef struct {
336  
337   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
338  
339 + #define XF_MAXDIM       8               /* maximum array dimensions */
340 +
341 + struct xf_array {
342 +        MG_FPOS spos;                   /* starting position on input */
343 +        int     ndim;                   /* number of array dimensions */
344 +        struct {
345 +                short   i, n;           /* current count and maximum */
346 +                char    arg[8];         /* string argument value */
347 +        } aarg[XF_MAXDIM];
348 + };
349 +
350   typedef struct xf_spec {
351 <        short   xac;            /* transform argument count */
352 <        short   xav0;           /* zeroeth argument in xf_argv array */
353 <        XF      xf;             /* cumulative transformation */
354 <        struct xf_spec  *prev;  /* previous transformation context */
355 < } XF_SPEC;
351 >        long    xid;                    /* unique transform id */
352 >        short   xav0;                   /* zeroeth argument in xf_argv array */
353 >        short   xac;                    /* transform argument count */
354 >        XF      xf;                     /* cumulative transformation */
355 >        struct xf_array *xarr;          /* transformation array pointer */
356 >        struct xf_spec  *prev;          /* previous transformation context */
357 > } XF_SPEC;                      /* followed by argument buffer */
358  
359   extern int      xf_argc;                        /* total # transform args. */
360   extern char     **xf_argv;                      /* transform arguments */
# Line 320 | Line 402 | extern void    xf_clear(void);                 /* clear xf stack */
402   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
403   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
404   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
405 < extern int      xf(XF, int, char **);           /* interpret transform spec. */
405 > extern int      xf(XF *, int, char **);         /* interpret transform spec. */
406  
407   #endif
408  
# Line 345 | Line 427 | extern double  atof();
427   extern MEM_PTR  malloc();
428   extern MEM_PTR  calloc();
429   extern MEM_PTR  realloc();
430 + extern void     free();

Diff Legend

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