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.19 by greg, Fri Mar 10 15:16:42 1995 UTC vs.
Revision 1.20 by greg, Thu Apr 13 12:54:23 1995 UTC

# Line 21 | Line 21
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
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    27
41 > #define MG_NENTITIES    28
42  
43   #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
44 <                        "f","i","ies","m","n","o","p","prism","rd","ring",\
45 <                        "rs","sides","sph","td","torus","ts","v","xf"}
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 225 | Line 226 | typedef struct {
226  
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 247 | 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