ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/cv/mgflib/parser.h
(Generate patch)

Comparing ray/src/cv/mgflib/parser.h (file contents):
Revision 1.17 by greg, Fri Feb 24 16:50:05 1995 UTC vs.
Revision 1.20 by greg, Thu Apr 13 12:54:23 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_IR         12
25 > #define MG_E_MATERIAL   13
26 > #define MG_E_NORMAL     14
27 > #define MG_E_OBJECT     15
28 > #define MG_E_POINT      16
29 > #define MG_E_PRISM      17
30 > #define MG_E_RD         18
31 > #define MG_E_RING       19
32 > #define MG_E_RS         20
33 > #define MG_E_SIDES      21
34 > #define MG_E_SPH        22
35 > #define MG_E_TD         23
36 > #define MG_E_TORUS      24
37 > #define MG_E_TS         25
38 > #define MG_E_VERTEX     26
39 > #define MG_E_XF         27
40  
41 < #define MG_NENTITIES    26
41 > #define MG_NENTITIES    28
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 205 | Line 207 | extern double  normalize(FVECT);       /* normalize a vector
207  
208   typedef struct {
209          int     clock;                  /* incremented each change */
210 <        unsigned short  flags;          /* what's been set */
211 <        unsigned short  ssamp[C_CNSS];  /* spectral samples, min wl to max */
212 <        unsigned long   ssum;           /* straight sum of spectral values */
210 >        short   flags;                  /* what's been set */
211 >        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
212 >        long    ssum;                   /* straight sum of spectral values */
213          float   cx, cy;                 /* xy chromaticity value */
214          float   eff;                    /* efficacy (lumens/watt) */
215   } C_COLOR;
# Line 222 | Line 224 | typedef struct {
224                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
225                          (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
226  
225 – #define C_CIEX          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
226 –                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
227 –                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
228 –                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
229 –                        114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 }
230 –
231 – #define C_CIEY          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
232 –                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
233 –                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
234 –                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
235 –                        5,2,1,1,0,0}, 106856L, .398, .542, 493.525 }
236 –
237 – #define C_CIEZ          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
238 –                        {65,201,679,2074,6456,13856,17471,17721,16692,\
239 –                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
240 –                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
241 –                        106770L, .147, .077, 54.363 }
242 –
227   #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
228  
229 + #define C_1SIDEDTHICK   0.005           /* assumed thickness of 1-sided mat. */
230 +
231   typedef struct {
232          int     clock;          /* incremented each change -- resettable */
233          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
234 +        float   nr, ni;         /* index of refraction, real and imaginary */
235          float   rd;             /* diffuse reflectance */
236          C_COLOR rd_c;           /* diffuse reflectance color */
237          float   td;             /* diffuse transmittance */
# Line 264 | Line 251 | typedef struct {
251          FVECT   p, n;           /* point and normal */
252   } C_VERTEX;             /* vertex context */
253  
254 < #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
254 > #define C_DEFMATERIAL   {1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
255                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
256   #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
257  

Diff Legend

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