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.4 by greg, Thu Jun 23 07:48:36 1994 UTC vs.
Revision 1.18 by greg, Tue Mar 7 14:53:17 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_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
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    22
40 > #define MG_NENTITIES    27
41  
42 < #define MG_NAMELIST     {"#","c","cone","cxy","cyl","ed","f","i","ies",\
43 <        "m","n","o","p","rd","ring","rs","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 75 | 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 101 | 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 158 | Line 176 | typedef FLOAT  FVECT[3];
176                                  (vr)[1]=(v1)[1]+(f)*(v2)[1], \
177                                  (vr)[2]=(v1)[2]+(f)*(v2)[2])
178  
179 < #define is0vect(v)      (DOT(v,v) < FTINY*FTINY)
179 > #define is0vect(v)      (DOT(v,v) <= FTINY*FTINY)
180  
181   #define round0(x)       if (x <= FTINY && x >= -FTINY) x = 0
182  
# Line 173 | Line 191 | extern double  normalize(FVECT);       /* normalize a vector
191   *      (materials, colors, vectors)
192   */
193  
194 + #define C_CMINWL        380             /* minimum wavelength */
195 + #define C_CMAXWL        780             /* maximum wavelength */
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 <        float   cx, cy;         /* XY chromaticity coordinates */
209 < } C_COLOR;              /* color context */
208 >        int     clock;                  /* incremented each change */
209 >        unsigned short  flags;          /* what's been set */
210 >        unsigned short  ssamp[C_CNSS];  /* spectral samples, min wl to max */
211 >        unsigned 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      { 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,\
220 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
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., 178.006 }
225 +
226 + #define C_CIEX          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
227 +                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
228 +                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
229 +                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
230 +                        114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 }
231 +
232 + #define C_CIEY          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
233 +                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
234 +                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
235 +                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
236 +                        5,2,1,1,0,0}, 106856L, .398, .542, 493.525 }
237 +
238 + #define C_CIEZ          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
239 +                        {65,201,679,2074,6456,13856,17471,17721,16692,\
240 +                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
241 +                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
242 +                        106770L, .147, .077, 54.363 }
243 +
244 + #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
245 +
246   typedef struct {
181 –        char    *name;          /* material name */
247          int     clock;          /* incremented each change -- resettable */
248 +        int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
249          float   rd;             /* diffuse reflectance */
250          C_COLOR rd_c;           /* diffuse reflectance color */
251          float   td;             /* diffuse transmittance */
# Line 195 | Line 261 | typedef struct {
261   } C_MATERIAL;           /* material context */
262  
263   typedef struct {
264 +        int     clock;          /* incremented each change -- resettable */
265          FVECT   p, n;           /* point and normal */
266   } C_VERTEX;             /* vertex context */
267  
268 < #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,\
268 > #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
269                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
270 < #define C_DEFVERTEX     {{0.,0.,0.},{0.,0.,0.}}
270 > #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
271  
272   extern C_COLOR          *c_ccolor;      /* the current color */
273 + extern char             *c_ccname;      /* current color name */
274   extern C_MATERIAL       *c_cmaterial;   /* the current material */
275 + extern char             *c_cmname;      /* current material name */
276   extern C_VERTEX         *c_cvertex;     /* the current vertex */
277 + extern char             *c_cvname;      /* current vertex name */
278  
279   #ifdef NOPROTO
280   extern int      c_hcolor();                     /* handle color entity */
281   extern int      c_hmaterial();                  /* handle material entity */
282   extern int      c_hvertex();                    /* handle vertex entity */
283   extern void     c_clearall();                   /* clear context tables */
284 + extern C_MATERIAL       *c_getmaterial();       /* get a named material */
285   extern C_VERTEX *c_getvert();                   /* get a named vertex */
286 + extern C_COLOR  *c_getcolor();                  /* get a named color */
287 + extern void     c_ccvt();                       /* fix color representation */
288 + extern int      c_isgrey();                     /* check if color is grey */
289   #else
290   extern int      c_hcolor(int, char **);         /* handle color entity */
291   extern int      c_hmaterial(int, char **);      /* handle material entity */
292   extern int      c_hvertex(int, char **);        /* handle vertex entity */
293   extern void     c_clearall(void);               /* clear context tables */
294 + extern C_MATERIAL       *c_getmaterial(char *); /* get a named material */
295   extern C_VERTEX *c_getvert(char *);             /* get a named vertex */
296 + extern C_COLOR  *c_getcolor(char *);            /* get a named color */
297 + extern void     c_ccvt(C_COLOR *, int);         /* fix color representation */
298 + extern int      c_isgrey(C_COLOR *);            /* check if color is grey */
299   #endif
300  
301   /*************************************************************************
# Line 249 | Line 323 | typedef FLOAT  MAT4[4][4];
323   #define  copymat4(m4a,m4b)      bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
324   #else
325   #define  copymat4(m4a,m4b)      (void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4))
252 – extern char  *memcpy();
326   #endif
327  
328   #define  MAT4IDENT              { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \
# Line 261 | Line 334 | extern MAT4  m4ident;
334  
335                                  /* regular transformation */
336   typedef struct {
337 <        MAT4  xfm;                              /* transform matrix */
338 <        FLOAT  sca;                             /* scalefactor */
337 >        MAT4    xfm;                            /* transform matrix */
338 >        FLOAT   sca;                            /* scalefactor */
339   }  XF;
340  
341   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
342  
343 + #define XF_MAXDIM       8               /* maximum array dimensions */
344 +
345 + struct xf_array {
346 +        MG_FPOS spos;                   /* starting position on input */
347 +        int     ndim;                   /* number of array dimensions */
348 +        struct {
349 +                short   i, n;           /* current count and maximum */
350 +                char    arg[8];         /* string argument value */
351 +        } aarg[XF_MAXDIM];
352 + };
353 +
354   typedef struct xf_spec {
355 <        short   xac;            /* transform argument count */
356 <        short   xav0;           /* zeroeth argument in xf_argv array */
357 <        XF      xf;             /* cumulative transformation */
358 <        struct xf_spec  *prev;  /* previous transformation context */
359 < } XF_SPEC;
355 >        long    xid;                    /* unique transform id */
356 >        short   xav0;                   /* zeroeth argument in xf_argv array */
357 >        short   xac;                    /* transform argument count */
358 >        short   rev;                    /* boolean true if vertices reversed */
359 >        XF      xf;                     /* cumulative transformation */
360 >        struct xf_array *xarr;          /* transformation array pointer */
361 >        struct xf_spec  *prev;          /* previous transformation context */
362 > } XF_SPEC;                      /* followed by argument buffer */
363  
364   extern int      xf_argc;                        /* total # transform args. */
365   extern char     **xf_argv;                      /* transform arguments */
# Line 320 | Line 407 | extern void    xf_clear(void);                 /* clear xf stack */
407   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
408   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
409   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
410 < extern int      xf(XF, int, char **);           /* interpret transform spec. */
410 > extern int      xf(XF *, int, char **);         /* interpret transform spec. */
411  
412   #endif
413  

Diff Legend

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