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.22 by greg, Wed May 10 17:46:05 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 9 | Line 9
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
12 > #define MG_E_COMMENT    0               /* #            */
13 > #define MG_E_COLOR      1               /* c            */
14 > #define MG_E_CCT        2               /* cct          */
15 > #define MG_E_CONE       3               /* cone         */
16 > #define MG_E_CMIX       4               /* cmix         */
17 > #define MG_E_CSPEC      5               /* cspec        */
18 > #define MG_E_CXY        6               /* cxy          */
19 > #define MG_E_CYL        7               /* cyl          */
20 > #define MG_E_ED         8               /* ed           */
21 > #define MG_E_FACE       9               /* f            */
22 > #define MG_E_INCLUDE    10              /* i            */
23 > #define MG_E_IES        11              /* ies          */
24 > #define MG_E_IR         12              /* ir           */
25 > #define MG_E_MATERIAL   13              /* m            */
26 > #define MG_E_NORMAL     14              /* n            */
27 > #define MG_E_OBJECT     15              /* o            */
28 > #define MG_E_POINT      16              /* p            */
29 > #define MG_E_PRISM      17              /* prism        */
30 > #define MG_E_RD         18              /* rd           */
31 > #define MG_E_RING       19              /* ring         */
32 > #define MG_E_RS         20              /* rs           */
33 > #define MG_E_SIDES      21              /* sides        */
34 > #define MG_E_SPH        22              /* sph          */
35 > #define MG_E_TD         23              /* td           */
36 > #define MG_E_TORUS      24              /* torus        */
37 > #define MG_E_TS         25              /* ts           */
38 > #define MG_E_VERTEX     26              /* v            */
39 > #define MG_E_XF         27              /* xf           */
40  
41 < #define MG_NENTITIES    26
41 > #define MG_NENTITIES    28              /* total # entities */
42  
43 < #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
44 <                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
45 <                        "sides","sph","td","torus","ts","v","xf"}
43 > #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
44 >                        "f","i","ies","ir","m","n","o","p","prism","rd",\
45 >                        "ring","rs","sides","sph","td","torus","ts","v","xf"}
46  
47   #define MG_MAXELEN      6
48  
# Line 84 | Line 86 | extern char    *mg_err[MG_NERRS];
86   * the mg_handle function rather than the mg_ehand routines directly.
87   * (The first argument to mg_handle is the entity #, or -1.)
88   * To free any data structures and clear the parser, use mg_clear.
89 < * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
90 < * will return an error from the list above.  In addition, mg_load
91 < * will report the error to stderr.  The mg_read routine returns 0
92 < * when the end of file has been reached.
89 > * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
90 > * mg_fgoto will return an error from the list above.  In addition,
91 > * mg_load will report the error to stderr.  The mg_read routine
92 > * returns 0 when the end of file has been reached.
93   */
94  
95 < #define MG_MAXLINE      512             /* maximum input line length */
95 > #define MG_MAXLINE      4096            /* maximum input line length */
96   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
97  
98   typedef struct mg_fctxt {
# Line 148 | Line 150 | extern int     mg_nqcdivs;             /* divisions per quarter circl
150   extern int mg_entity();                 /* get entity number from its name */
151   extern int isint();                     /* non-zero if integer format */
152   extern int isflt();                     /* non-zero if floating point format */
153 + extern int isname();                    /* non-zero if legal identifier name */
154   #else
155   extern int mg_entity(char *);           /* get entity number from its name */
156   extern int isint(char *);               /* non-zero if integer format */
157   extern int isflt(char *);               /* non-zero if floating point format */
158 + extern int isname(char *);              /* non-zero if legal identifier name */
159   #endif
160  
161   /************************************************************************
# Line 195 | Line 199 | extern double  normalize(FVECT);       /* normalize a vector
199   #define C_CNSS          41              /* number of spectral samples */
200   #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
201   #define C_CMAXV         10000           /* nominal maximum sample value */
202 + #define C_CLPWM         (683./C_CMAXV)  /* peak lumens/watt multiplier */
203  
204   #define C_CSSPEC        01              /* flag if spectrum is set */
205   #define C_CDSPEC        02              /* flag if defined w/ spectrum */
206   #define C_CSXY          04              /* flag if xy is set */
207   #define C_CDXY          010             /* flag if defined w/ xy */
208 + #define C_CSEFF         020             /* flag if efficacy set */
209  
210   typedef struct {
211          int     clock;                  /* incremented each change */
# Line 207 | Line 213 | typedef struct {
213          short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
214          long    ssum;                   /* straight sum of spectral values */
215          float   cx, cy;                 /* xy chromaticity value */
216 +        float   eff;                    /* efficacy (lumens/watt) */
217   } C_COLOR;
218  
219 < #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC,\
219 > #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
220                          {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,\
# Line 217 | Line 224 | typedef struct {
224                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
225                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
226                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
227 <                        (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
227 >                        (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
228  
229 < #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 }
229 > #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
230  
231 < #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 }
231 > #define C_1SIDEDTHICK   0.005           /* assumed thickness of 1-sided mat. */
232  
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 –
233   typedef struct {
234          int     clock;          /* incremented each change -- resettable */
235          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
236 +        float   nr, ni;         /* index of refraction, real and imaginary */
237          float   rd;             /* diffuse reflectance */
238          C_COLOR rd_c;           /* diffuse reflectance color */
239          float   td;             /* diffuse transmittance */
# Line 261 | Line 253 | typedef struct {
253          FVECT   p, n;           /* point and normal */
254   } C_VERTEX;             /* vertex context */
255  
256 < #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
256 > #define C_DEFMATERIAL   {1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
257                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
258   #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
259  

Diff Legend

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