ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/otypes.h
(Generate patch)

Comparing ray/src/common/otypes.h (file contents):
Revision 2.16 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.17 by greg, Sun Jul 29 19:01:39 2012 UTC

# Line 76 | Line 76 | extern int  o_default(); /* XXX conflict with radogl.h
76   #define  MIX_PICT       48              /* mixing picture */
77   #define  MAT_DIRECT1    49              /* unidirecting material */
78   #define  MAT_DIRECT2    50              /* bidirecting material */
79 + #define  MAT_ASHIKHMIN  51              /* Ashikhmin-Shirley BRDF material */
80                                  /* number of object types */
81 < #define  NUMOTYPE       51
81 > #define  NUMOTYPE       52
82                                  /* type flags */
83   #define  T_S            01              /* surface (object) */
84   #define  T_M            02              /* material */
# Line 167 | Line 168 | extern FUN  ofun[];                    /* our type list */
168                                  { "mixpict",    T_X|T_I,        o_default }, \
169                                  { "prism1",     T_M|T_F|T_LV,   o_default }, \
170                                  { "prism2",     T_M|T_F|T_LV,   o_default }, \
171 +                                { "ashik2",     T_M|T_F,        o_default }, \
172                          }
173  
174  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines