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.3 by greg, Wed Jun 22 17:15:46 1994 UTC vs.
Revision 1.5 by greg, Fri Jun 24 09:32:55 1994 UTC

# Line 12 | Line 12
12   #define MG_E_COMMENT    0
13   #define MG_E_COLOR      1
14   #define MG_E_CONE       2
15 < #define MG_E_CXY        3
16 < #define MG_E_CYL        4
17 < #define MG_E_ED         5
18 < #define MG_E_FACE       6
19 < #define MG_E_INCLUDE    7
20 < #define MG_E_IES        8
21 < #define MG_E_MATERIAL   9
22 < #define MG_E_NORMAL     10
23 < #define MG_E_OBJECT     11
24 < #define MG_E_POINT      12
25 < #define MG_E_RD         13
26 < #define MG_E_RING       14
27 < #define MG_E_RS         15
28 < #define MG_E_SPH        16
29 < #define MG_E_TD         17
30 < #define MG_E_TORUS      18
31 < #define MG_E_TS         19
32 < #define MG_E_VERTEX     20
33 < #define MG_E_XF         21
15 > #define MG_E_CMIX       3
16 > #define MG_E_CXY        4
17 > #define MG_E_CSPEC      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
37  
38 < #define MG_NENTITIES    22
38 > #define MG_NENTITIES    25
39  
40 < #define MG_NAMELIST     {"#","c","cone","cxy","cyl","ed","f","i","ies",\
41 <        "m","n","o","p","rd","ring","rs","sph","td","torus","ts","v","xf"}
40 > #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
41 >                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
42 >                        "sph","td","torus","ts","v","xf"}
43  
44   #define MG_MAXELEN      6
45  
# Line 173 | Line 177 | extern double  normalize(FVECT);       /* normalize a vector
177   *      (materials, colors, vectors)
178   */
179  
180 + /* The following structure will change when we add spectral data support */
181   typedef struct {
182          float   cx, cy;         /* XY chromaticity coordinates */
183   } C_COLOR;              /* color context */
184  
185 + #ifdef later
186 +
187 + #define C_CMAXWL        780             /* maximum wavelength */
188 + #define C_CMINWL        380             /* minimum wavelength */
189 + #define C_CNSS          41              /* number of spectral samples */
190 + #define C_WLINC         ((C_MAXWL-C_MINWL)/(C_NSS-1))   /* 10 nm increment */
191 + #define C_CMAXV         10000           /* nominal maximum sample value */
192 +
193 + #define C_CXY           1               /* flag if has xy chromaticity */
194 + #define C_CSPEC         2               /* flag if has spectrum */
195 +
196   typedef struct {
197 +        short   flags;                  /* what's been set */
198 +        float   cx, cy;                 /* xy chromaticity value */
199 +        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
200 +        long    ssum;                   /* straight sum of spectral values */
201 + } C_COLOR;
202 +
203 + #define C_DEFCOLOR      { C_CXY|C_CSPEC, 1./3., 1./3.,
204 +                        {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
205 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
206 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
207 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
208 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
209 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
210 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
211 +                        (long)C_CNSS*C_MAXV }
212 +
213 + #define C_CIEX          { C_CXY|C_CSPEC, ???, ???,
214 +                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
215 +                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
216 +                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
217 +                        114,58,29,14,7,3,2,1,0}, 106836L }
218 +
219 + #define C_CIEY          { C_CXY|C_CSPEC, ???, ???,
220 +                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
221 +                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
222 +                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
223 +                        5,2,1,1,0,0}, 106856L }
224 +
225 + #define C_CIEZ          { C_CXY|C_CSPEC, ???, ???,
226 +                        {65,201,679,2074,6456,13856,17471,17721,16692,\
227 +                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
228 +                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 106770L }
229 +
230 + #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_WLINC] / (c)->sum)
231 +
232 + #endif
233 +
234 + typedef struct {
235          char    *name;          /* material name */
236          int     clock;          /* incremented each change -- resettable */
237          float   rd;             /* diffuse reflectance */
# Line 198 | Line 252 | typedef struct {
252          FVECT   p, n;           /* point and normal */
253   } C_VERTEX;             /* vertex context */
254  
255 < #define isgrey(cxy)     ((cxy)->cx > .31 && (cxy)->cx < .35 && \
256 <                        (cxy)->cy > .31 && (cxy)->cy < .35)
255 > #define isgrey(cxy)     ((cxy)->cx > .32 && (cxy)->cx < .34 && \
256 >                        (cxy)->cy > .32 && (cxy)->cy < .34)
257  
258   #define C_DEFCOLOR      {.333,.333}
259   #define C_DEFMATERIAL   {NULL,1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
# Line 345 | Line 399 | extern double  atof();
399   extern MEM_PTR  malloc();
400   extern MEM_PTR  calloc();
401   extern MEM_PTR  realloc();
402 + extern void     free();

Diff Legend

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