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.15 by greg, Thu Sep 1 09:17:46 1994 UTC vs.
Revision 1.19 by greg, Fri Mar 10 15:16:42 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_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
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    26
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 <                        "sides","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 90 | Line 91 | extern char    *mg_err[MG_NERRS];
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 195 | 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 {
208          int     clock;                  /* incremented each change */
# Line 207 | Line 210 | typedef struct {
210          short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
211          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,\
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. }
221 <
222 < #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 }
227 <
228 < #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 }
233 <
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 }
224 >                        (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
225  
226   #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
227  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines