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.12 by greg, Fri Jul 1 10:18:36 1994 UTC vs.
Revision 1.13 by greg, Fri Jul 1 18:06:53 1994 UTC

# Line 28 | Line 28
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
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
38  
39 < #define MG_NENTITIES    25
39 > #define MG_NENTITIES    26
40  
41   #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
42                          "i","ies","m","n","o","p","prism","rd","ring","rs",\
43 <                        "sph","td","torus","ts","v","xf"}
43 >                        "sides","sph","td","torus","ts","v","xf"}
44  
45   #define MG_MAXELEN      6
46  
# Line 240 | Line 241 | typedef struct {
241  
242   typedef struct {
243          int     clock;          /* incremented each change -- resettable */
244 +        int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
245          float   rd;             /* diffuse reflectance */
246          C_COLOR rd_c;           /* diffuse reflectance color */
247          float   td;             /* diffuse transmittance */
# Line 259 | Line 261 | typedef struct {
261          FVECT   p, n;           /* point and normal */
262   } C_VERTEX;             /* vertex context */
263  
264 < #define C_DEFMATERIAL   {1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
264 > #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
265                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
266   #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
267  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines