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.14 by greg, Thu Jul 21 14:56:36 1994 UTC vs.
Revision 1.31 by gregl, Fri Oct 10 16:45:50 1997 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 6 | Line 6
6   * Header file for MGF interpreter
7   */
8  
9 + #ifndef MG_VMAJOR
10 +
11   /* must include stdio.h before us */
12  
13 <                        /* Entities (order doesn't really matter) */
14 < #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_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
13 > #define MG_VMAJOR       2               /* major version number */
14 > #define MG_VMINOR       0               /* minor version number */
15  
16 < #define MG_NENTITIES    26
16 >                        /* Entities (list is only appended, never modified) */
17 > #define MG_E_COMMENT    0               /* #            */
18 > #define MG_E_COLOR      1               /* c            */
19 > #define MG_E_CCT        2               /* cct          */
20 > #define MG_E_CONE       3               /* cone         */
21 > #define MG_E_CMIX       4               /* cmix         */
22 > #define MG_E_CSPEC      5               /* cspec        */
23 > #define MG_E_CXY        6               /* cxy          */
24 > #define MG_E_CYL        7               /* cyl          */
25 > #define MG_E_ED         8               /* ed           */
26 > #define MG_E_FACE       9               /* f            */
27 > #define MG_E_INCLUDE    10              /* i            */
28 > #define MG_E_IES        11              /* ies          */
29 > #define MG_E_IR         12              /* ir           */
30 > #define MG_E_MATERIAL   13              /* m            */
31 > #define MG_E_NORMAL     14              /* n            */
32 > #define MG_E_OBJECT     15              /* o            */
33 > #define MG_E_POINT      16              /* p            */
34 > #define MG_E_PRISM      17              /* prism        */
35 > #define MG_E_RD         18              /* rd           */
36 > #define MG_E_RING       19              /* ring         */
37 > #define MG_E_RS         20              /* rs           */
38 > #define MG_E_SIDES      21              /* sides        */
39 > #define MG_E_SPH        22              /* sph          */
40 > #define MG_E_TD         23              /* td           */
41 > #define MG_E_TORUS      24              /* torus        */
42 > #define MG_E_TS         25              /* ts           */
43 > #define MG_E_VERTEX     26              /* v            */
44 > #define MG_E_XF         27              /* xf           */
45 >                        /* end of Version 1 entities */
46 > #define MG_E_FACEH      28              /* fh           */
47 >                        /* end of Version 2 entities */
48  
49 < #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"}
49 > #define MG_NENTITIES    29              /* total # entities */
50  
51 + #define MG_NELIST       {28,29}         /* entity count for version 1 and up */
52 +
53 + #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
54 +                        "f","i","ies","ir","m","n","o","p","prism","rd",\
55 +                        "ring","rs","sides","sph","td","torus","ts","v","xf",\
56 +                        "fh"}
57 +
58   #define MG_MAXELEN      6
59  
60   extern char     mg_ename[MG_NENTITIES][MG_MAXELEN];
61  
62 <                        /* Handler routines for each entity */
50 <
62 >                        /* Handler routines for each entity and unknown ones */
63   #ifdef NOPROTO
64   extern int      (*mg_ehand[MG_NENTITIES])();
65 + extern int      (*mg_uhand)();
66 + extern int      mg_defuhand();
67   #else
68   extern int      (*mg_ehand[MG_NENTITIES])(int argc, char **argv);
69 + extern int      (*mg_uhand)(int argc, char **argv);
70 + extern int      mg_defuhand(int, char **);
71   #endif
72  
73 + extern unsigned mg_nunknown;            /* count of unknown entities */
74 +
75                          /* Error codes */
76   #define MG_OK           0               /* normal return value */
77   #define MG_EUNK         1               /* unknown entity */
# Line 66 | Line 84 | extern int     (*mg_ehand[MG_NENTITIES])(int argc, char **
84   #define MG_EMEM         8               /* out of memory */
85   #define MG_ESEEK        9               /* file seek error */
86   #define MG_EBADMAT      10              /* bad material specification */
87 + #define MG_ELINE        11              /* input line too long */
88 + #define MG_ECNTXT       12              /* unmatched context close */
89  
90 < #define MG_NERRS        11
90 > #define MG_NERRS        13
91  
92 < extern char     *mg_err[MG_NERRS];
92 > extern char     *mg_err[MG_NERRS];      /* list of error messages */
93  
94   /*
95   * The general process for running the parser is to fill in the mg_ehand
# Line 84 | Line 104 | extern char    *mg_err[MG_NERRS];
104   * the mg_handle function rather than the mg_ehand routines directly.
105   * (The first argument to mg_handle is the entity #, or -1.)
106   * To free any data structures and clear the parser, use mg_clear.
107 < * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
108 < * will return an error from the list above.  In addition, mg_load
109 < * will report the error to stderr.  The mg_read routine returns 0
110 < * when the end of file has been reached.
107 > * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
108 > * mg_fgoto will return an error from the list above.  In addition,
109 > * mg_load will report the error to stderr.  The mg_read routine
110 > * returns 0 when the end of file has been reached.
111   */
112  
113 < #define MG_MAXLINE      512             /* maximum input line length */
113 > #define MG_MAXLINE      4096            /* maximum input line length */
114   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
115  
116   typedef struct mg_fctxt {
# Line 147 | Line 167 | extern int     mg_nqcdivs;             /* divisions per quarter circl
167   #ifdef NOPROTO
168   extern int mg_entity();                 /* get entity number from its name */
169   extern int isint();                     /* non-zero if integer format */
170 + extern int isintd();                    /* same with delimiter set */
171   extern int isflt();                     /* non-zero if floating point format */
172 + extern int isfltd();                    /* same with delimiter set */
173 + extern int isname();                    /* non-zero if legal identifier name */
174 + extern int badarg();                    /* check argument format */
175 + extern int e_include();                 /* expand include entity */
176 + extern int e_pipe();                    /* expand piped command */
177 + extern int e_sph();                     /* expand sphere as other entities */
178 + extern int e_torus();                   /* expand torus as other entities */
179 + extern int e_cyl();                     /* expand cylinder as other entities */
180 + extern int e_ring();                    /* expand ring as other entities */
181 + extern int e_cone();                    /* expand cone as other entities */
182 + extern int e_prism();                   /* expand prism as other entities */
183 + extern int e_faceh();                   /* expand face w/ holes as face */
184   #else
185   extern int mg_entity(char *);           /* get entity number from its name */
186   extern int isint(char *);               /* non-zero if integer format */
187 + extern int isintd(char *, char *);      /* same with delimiter set */
188   extern int isflt(char *);               /* non-zero if floating point format */
189 + extern int isfltd(char *, char *);      /* same with delimiter set */
190 + extern int isname(char *);              /* non-zero if legal identifier name */
191 + extern int badarg(int, char **, char *);/* check argument format */
192 + extern int e_include(int, char **);     /* expand include entity */
193 + extern int e_pipe(int, char **);        /* expand piped command */
194 + extern int e_sph(int, char **);         /* expand sphere as other entities */
195 + extern int e_torus(int, char **);       /* expand torus as other entities */
196 + extern int e_cyl(int, char **);         /* expand cylinder as other entities */
197 + extern int e_ring(int, char **);        /* expand ring as other entities */
198 + extern int e_cone(int, char **);        /* expand cone as other entities */
199 + extern int e_prism(int, char **);       /* expand prism as other entities */
200 + extern int e_faceh(int, char **);       /* expand face w/ holes as face */
201   #endif
202  
203   /************************************************************************
# Line 183 | Line 229 | typedef FLOAT  FVECT[3];
229   extern double   normalize();            /* normalize a vector */
230   #else
231   extern double   normalize(FVECT);       /* normalize a vector */
232 + extern void     fcross(FVECT,FVECT,FVECT);/* cross product of two vectors */
233   #endif
234  
235   /************************************************************************
# Line 195 | Line 242 | extern double  normalize(FVECT);       /* normalize a vector
242   #define C_CNSS          41              /* number of spectral samples */
243   #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
244   #define C_CMAXV         10000           /* nominal maximum sample value */
245 + #define C_CLPWM         (683./C_CMAXV)  /* peak lumens/watt multiplier */
246  
247   #define C_CSSPEC        01              /* flag if spectrum is set */
248   #define C_CDSPEC        02              /* flag if defined w/ spectrum */
249   #define C_CSXY          04              /* flag if xy is set */
250   #define C_CDXY          010             /* flag if defined w/ xy */
251 + #define C_CSEFF         020             /* flag if efficacy set */
252  
253   typedef struct {
254 <        int     clock;                  /* incremented each change */
255 <        short   flags;                  /* what's been set */
256 <        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
257 <        long    ssum;                   /* straight sum of spectral values */
258 <        float   cx, cy;                 /* xy chromaticity value */
254 >        int     clock;          /* incremented each change */
255 >        char    *client_data;   /* pointer to private client-owned data */
256 >        short   flags;          /* what's been set */
257 >        short   ssamp[C_CNSS];  /* spectral samples, min wl to max */
258 >        long    ssum;           /* straight sum of spectral values */
259 >        float   cx, cy;         /* xy chromaticity value */
260 >        float   eff;            /* efficacy (lumens/watt) */
261   } C_COLOR;
262  
263 < #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC,\
263 > #define C_DEFCOLOR      { 1, NULL, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
264                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
265                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
266                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 217 | Line 268 | typedef struct {
268                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
269                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
270                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
271 <                        (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
271 >                        (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
272  
273 < #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 }
273 > #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
274  
275 < #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 }
275 > #define C_1SIDEDTHICK   0.005           /* assumed thickness of 1-sided mat. */
276  
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 –
277   typedef struct {
278          int     clock;          /* incremented each change -- resettable */
279 +        char    *client_data;   /* pointer to private client-owned data */
280          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
281 +        float   nr, ni;         /* index of refraction, real and imaginary */
282          float   rd;             /* diffuse reflectance */
283          C_COLOR rd_c;           /* diffuse reflectance color */
284          float   td;             /* diffuse transmittance */
# Line 258 | Line 295 | typedef struct {
295  
296   typedef struct {
297          int     clock;          /* incremented each change -- resettable */
298 +        char    *client_data;   /* pointer to private client-owned data */
299          FVECT   p, n;           /* point and normal */
300   } C_VERTEX;             /* vertex context */
301  
302 < #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
303 <                                        0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
304 < #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
302 > #define C_DEFMATERIAL   {1,NULL,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,\
303 >                                C_DEFCOLOR,0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
304 > #define C_DEFVERTEX     {1,NULL,{0.,0.,0.},{0.,0.,0.}}
305  
306   extern C_COLOR          *c_ccolor;      /* the current color */
307   extern char             *c_ccname;      /* current color name */
# Line 349 | Line 387 | struct xf_array {
387  
388   typedef struct xf_spec {
389          long    xid;                    /* unique transform id */
390 <        short   xav0;                   /* zeroeth argument in xf_argv array */
353 <        short   xac;                    /* transform argument count */
390 >        short   xac;                    /* context argument count */
391          short   rev;                    /* boolean true if vertices reversed */
392          XF      xf;                     /* cumulative transformation */
393          struct xf_array *xarr;          /* transformation array pointer */
394          struct xf_spec  *prev;          /* previous transformation context */
395   } XF_SPEC;                      /* followed by argument buffer */
396  
397 < extern int      xf_argc;                        /* total # transform args. */
398 < extern char     **xf_argv;                      /* transform arguments */
362 < extern XF_SPEC  *xf_context;                    /* current context */
397 > extern XF_SPEC  *xf_context;                    /* current transform context */
398 > extern char     **xf_argend;                    /* last transform argument */
399  
400 + #define xf_ac(xf)       ((xf)==NULL ? 0 : (xf)->xac)
401 + #define xf_av(xf)       (xf_argend - (xf)->xac)
402 +
403 + #define xf_argc         xf_ac(xf_context)
404 + #define xf_argv         xf_av(xf_context)
405 +
406   /*
407   * The transformation handler should do most of the work that needs
408   * doing.  Just pass it any xf entities, then use the associated
# Line 384 | Line 426 | extern void    xf_clear();             /* clear xf stack */
426  
427   /* The following are support routines you probably won't call directly */
428  
429 + XF_SPEC         *new_xf();              /* allocate new transform */
430 + void            free_xf();              /* free a transform */
431 + int             xf_aname();             /* name this instance */
432 + long            comp_xfid();            /* compute unique ID */
433   extern void     multmat4();             /* m4a = m4b X m4c */
434   extern void     multv3();               /* v3a = v3b X m4 (vectors) */
435   extern void     multp3();               /* p3a = p3b X m4 (points) */
# Line 400 | Line 446 | extern void    xf_clear(void);                 /* clear xf stack */
446  
447   /* The following are support routines you probably won't call directly */
448  
449 + XF_SPEC         *new_xf(int, char **);          /* allocate new transform */
450 + void            free_xf(XF_SPEC *);             /* free a transform */
451 + int             xf_aname(struct xf_array *);    /* name this instance */
452 + long            comp_xfid(MAT4);                /* compute unique ID */
453   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
454   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
455   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
# Line 411 | Line 461 | extern int     xf(XF *, int, char **);         /* interpret trans
461   *      Miscellaneous definitions
462   */
463  
464 + #ifndef  PI
465   #ifdef  M_PI
466   #define  PI             M_PI
467   #else
468   #define  PI             3.14159265358979323846
469   #endif
470 + #endif
471  
472   #ifdef DCL_ATOF
473   extern double   atof();
# Line 429 | Line 481 | extern MEM_PTR malloc();
481   extern MEM_PTR  calloc();
482   extern MEM_PTR  realloc();
483   extern void     free();
484 +
485 + #endif /*MG_VMAJOR*/

Diff Legend

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