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.10 by greg, Wed Jun 29 16:15:17 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_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_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
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    25
40 > #define MG_NENTITIES    27
41  
42 < #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
43 <                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
44 <                        "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 83 | Line 85 | extern char    *mg_err[MG_NERRS];
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 {
# Line 194 | Line 196 | extern double  normalize(FVECT);       /* normalize a vector
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 {
204 –        char    *name;                  /* material name */
208          int     clock;                  /* incremented each change */
209 <        short   flags;                  /* what's been set */
210 <        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
211 <        long    ssum;                   /* straight sum of spectral values */
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      { NULL, 0, C_CDXY|C_CSXY|C_CSSPEC,\
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,\
# Line 217 | Line 221 | typedef struct {
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. }
224 >                        (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
225  
226 < #define C_CIEX          { "_cie_x", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
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, .735, .265 }
230 >                        114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 }
231  
232 < #define C_CIEY          { "_cie_y", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
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, .274, .717 }
236 >                        5,2,1,1,0,0}, 106856L, .398, .542, 493.525 }
237  
238 < #define C_CIEZ          { "_cie_z", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
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, .167, .009 }
242 >                        106770L, .147, .077, 54.363 }
243  
244 < #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum)
244 > #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
245  
246   typedef struct {
243 –        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 257 | Line 261 | typedef struct {
261   } C_MATERIAL;           /* material context */
262  
263   typedef struct {
260 –        char    *name;          /* vector name */
264          int     clock;          /* incremented each change -- resettable */
265          FVECT   p, n;           /* point and normal */
266   } C_VERTEX;             /* vertex context */
267  
268 < #define C_DEFMATERIAL   {NULL,0,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     {NULL,0,{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 */
# Line 284 | Line 291 | extern int     c_hcolor(int, char **);         /* handle color en
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 */
# Line 326 | 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)
# Line 347 | Line 355 | typedef struct 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 */

Diff Legend

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