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.27 by greg, Wed Nov 29 16:45:13 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_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
11 > #define MG_VMAJOR       1               /* major version number */
12 > #define MG_VMINOR       0               /* minor version number */
13  
14 < #define MG_NENTITIES    26
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",\
42 <                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
43 <                        "sides","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 */
50 <
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 66 | Line 79 | extern int     (*mg_ehand[MG_NENTITIES])(int argc, char **
79   #define MG_EMEM         8               /* out of memory */
80   #define MG_ESEEK        9               /* file seek error */
81   #define MG_EBADMAT      10              /* bad material specification */
82 + #define MG_ELINE        11              /* input line too long */
83 + #define MG_ECNTXT       12              /* unmatched context close */
84  
85 < #define MG_NERRS        11
85 > #define MG_NERRS        13
86  
87 < extern char     *mg_err[MG_NERRS];
87 > extern char     *mg_err[MG_NERRS];      /* list of error messages */
88  
89   /*
90   * The general process for running the parser is to fill in the mg_ehand
# Line 84 | Line 99 | extern char    *mg_err[MG_NERRS];
99   * the mg_handle function rather than the mg_ehand routines directly.
100   * (The first argument to mg_handle is the entity #, or -1.)
101   * To free any data structures and clear the parser, use mg_clear.
102 < * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
103 < * will return an error from the list above.  In addition, mg_load
104 < * will report the error to stderr.  The mg_read routine returns 0
105 < * when the end of file has been reached.
102 > * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
103 > * mg_fgoto will return an error from the list above.  In addition,
104 > * mg_load will report the error to stderr.  The mg_read routine
105 > * returns 0 when the end of file has been reached.
106   */
107  
108 < #define MG_MAXLINE      512             /* maximum input line length */
108 > #define MG_MAXLINE      4096            /* maximum input line length */
109   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
110  
111   typedef struct mg_fctxt {
# Line 148 | Line 163 | extern int     mg_nqcdivs;             /* divisions per quarter circl
163   extern int mg_entity();                 /* get entity number from its name */
164   extern int isint();                     /* non-zero if integer format */
165   extern int isflt();                     /* non-zero if floating point format */
166 + extern int isname();                    /* non-zero if legal identifier name */
167   #else
168   extern int mg_entity(char *);           /* get entity number from its name */
169   extern int isint(char *);               /* non-zero if integer format */
170   extern int isflt(char *);               /* non-zero if floating point format */
171 + extern int isname(char *);              /* non-zero if legal identifier name */
172   #endif
173  
174   /************************************************************************
# Line 195 | Line 212 | extern double  normalize(FVECT);       /* normalize a vector
212   #define C_CNSS          41              /* number of spectral samples */
213   #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
214   #define C_CMAXV         10000           /* nominal maximum sample value */
215 + #define C_CLPWM         (683./C_CMAXV)  /* peak lumens/watt multiplier */
216  
217   #define C_CSSPEC        01              /* flag if spectrum is set */
218   #define C_CDSPEC        02              /* flag if defined w/ spectrum */
219   #define C_CSXY          04              /* flag if xy is set */
220   #define C_CDXY          010             /* flag if defined w/ xy */
221 + #define C_CSEFF         020             /* flag if efficacy set */
222  
223   typedef struct {
224          int     clock;                  /* incremented each change */
# Line 207 | Line 226 | typedef struct {
226          short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
227          long    ssum;                   /* straight sum of spectral values */
228          float   cx, cy;                 /* xy chromaticity value */
229 +        float   eff;                    /* efficacy (lumens/watt) */
230   } C_COLOR;
231  
232 < #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC,\
232 > #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
233                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
234                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
235                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 217 | Line 237 | typedef struct {
237                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
238                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
239                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
240 <                        (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
240 >                        (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
241  
242 < #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 }
242 > #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
243  
244 < #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 }
244 > #define C_1SIDEDTHICK   0.005           /* assumed thickness of 1-sided mat. */
245  
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 –
246   typedef struct {
247          int     clock;          /* incremented each change -- resettable */
248          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
249 +        float   nr, ni;         /* index of refraction, real and imaginary */
250          float   rd;             /* diffuse reflectance */
251          C_COLOR rd_c;           /* diffuse reflectance color */
252          float   td;             /* diffuse transmittance */
# Line 261 | Line 266 | typedef struct {
266          FVECT   p, n;           /* point and normal */
267   } C_VERTEX;             /* vertex context */
268  
269 < #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
269 > #define C_DEFMATERIAL   {1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
270                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
271   #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
272  
# Line 349 | Line 354 | struct xf_array {
354  
355   typedef struct xf_spec {
356          long    xid;                    /* unique transform id */
357 <        short   xav0;                   /* zeroeth argument in xf_argv array */
353 <        short   xac;                    /* transform argument count */
357 >        short   xac;                    /* context 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 */
366 < extern XF_SPEC  *xf_context;                    /* current context */
364 > extern XF_SPEC  *xf_context;                    /* current transform context */
365 > extern char     **xf_argend;                    /* last transform argument */
366 >
367 > #define xf_ac(xf)       ((xf)->xac)
368 > #define xf_av(xf)       (xf_argend - (xf)->xac)
369 >
370 > #define xf_argc         (xf_context==NULL ? 0 : xf_ac(xf_context))
371 > #define xf_argv         xf_av(xf_context)
372  
373   /*
374   * The transformation handler should do most of the work that needs

Diff Legend

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