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 1.2 by greg, Tue Mar 14 11:32:57 1989 UTC vs.
Revision 1.6 by greg, Thu Dec 13 08:58:30 1990 UTC

# Line 39 | Line 39 | typedef struct {
39   #define  MAT_INTERFACE  (MAT_MIN+8)     /* dielectric interface */
40   #define  MAT_GLASS      (MAT_MIN+9)     /* thin glass surface */
41   #define  MAT_CLIP       (MAT_MIN+10)    /* clipping surface */
42 < #define  MAT_CNT        11
42 > #define  MAT_PFUNC      (MAT_MIN+11)    /* plastic brdf function */
43 > #define  MAT_MFUNC      (MAT_MIN+12)    /* metal brdf function */
44 > #define  MAT_PDATA      (MAT_MIN+13)    /* plastic brdf data */
45 > #define  MAT_MDATA      (MAT_MIN+14)    /* metal brdf data */
46 > #define  MAT_CNT        15
47                                  /* textures and patterns */
48   #define  TP_MIN         (MAT_MIN+MAT_CNT)
49   #define  TEX_FUNC       (TP_MIN+0)      /* surface texture function */
# Line 60 | Line 64 | typedef struct {
64   #define  NUMOTYPE       (OBJ_CNT+MAT_CNT+TP_CNT)
65  
66   #define  issurface(t)   ((t) >= OBJ_MIN && (t) < OBJ_MIN+OBJ_CNT)
67 + #define  isvolume(t)    ((t) == OBJ_INSTANCE)
68   #define  ismodifier(t)  ((t) >= MOD_MIN && (t) < MOD_MIN+MOD_CNT)
69   #define  ismaterial(t)  ((t) >= MAT_MIN && (t) < MAT_MIN+MAT_CNT)
70   #define  istexture(t)   ((t) >= TP_MIN && (t) < TP_MIN+TP_CNT)
# Line 74 | Line 79 | extern int  m_normal();
79   extern int  m_dielectric();
80   extern int  m_glass();
81   extern int  m_clip();
82 + extern int  m_brdf();
83   extern int  t_func(), t_data();
84   extern int  p_cfunc(), p_bfunc();
85   extern int  p_pdata(), p_cdata(), p_bdata();
# Line 101 | Line 107 | extern int  text();
107                          { "interface", m_dielectric }, \
108                          { "glass", m_glass }, \
109                          { "antimatter", m_clip }, \
110 +                        { "plasfunc", m_brdf }, \
111 +                        { "metfunc", m_brdf }, \
112 +                        { "plasdata", m_brdf }, \
113 +                        { "metdata", m_brdf }, \
114                          { "texfunc", t_func }, \
115                          { "texdata", t_data }, \
116                          { "colorfunc", p_cfunc }, \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines