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.1 by greg, Thu Feb 2 10:34:19 1989 UTC vs.
Revision 1.2 by greg, Tue Mar 14 11:32:57 1989 UTC

# Line 43 | Line 43 | typedef struct {
43                                  /* textures and patterns */
44   #define  TP_MIN         (MAT_MIN+MAT_CNT)
45   #define  TEX_FUNC       (TP_MIN+0)      /* surface texture function */
46 < #define  PAT_CFUNC      (TP_MIN+1)      /* color function */
47 < #define  PAT_BFUNC      (TP_MIN+2)      /* brightness function */
48 < #define  PAT_CPICT      (TP_MIN+3)      /* color picture */
49 < #define  PAT_CDATA      (TP_MIN+4)      /* color data */
50 < #define  PAT_BDATA      (TP_MIN+5)      /* brightness data */
51 < #define  PAT_CTEXT      (TP_MIN+6)      /* colored text */
52 < #define  PAT_BTEXT      (TP_MIN+7)      /* monochromatic text */
53 < #define  MIX_FUNC       (TP_MIN+8)      /* mixing function */
54 < #define  MIX_DATA       (TP_MIN+9)      /* mixing data */
55 < #define  MIX_TEXT       (TP_MIN+10)     /* mixing text */
56 < #define  TP_CNT         11
46 > #define  TEX_DATA       (TP_MIN+1)      /* surface texture data */
47 > #define  PAT_CFUNC      (TP_MIN+2)      /* color function */
48 > #define  PAT_BFUNC      (TP_MIN+3)      /* brightness function */
49 > #define  PAT_CPICT      (TP_MIN+4)      /* color picture */
50 > #define  PAT_CDATA      (TP_MIN+5)      /* color data */
51 > #define  PAT_BDATA      (TP_MIN+6)      /* brightness data */
52 > #define  PAT_CTEXT      (TP_MIN+7)      /* colored text */
53 > #define  PAT_BTEXT      (TP_MIN+8)      /* monochromatic text */
54 > #define  MIX_FUNC       (TP_MIN+9)      /* mixing function */
55 > #define  MIX_DATA       (TP_MIN+10)     /* mixing data */
56 > #define  MIX_TEXT       (TP_MIN+11)     /* mixing text */
57 > #define  TP_CNT         12
58   #define  MOD_CNT        (MAT_CNT+TP_CNT)
59                                  /* number of object types */
60   #define  NUMOTYPE       (OBJ_CNT+MAT_CNT+TP_CNT)
# Line 73 | Line 74 | extern int  m_normal();
74   extern int  m_dielectric();
75   extern int  m_glass();
76   extern int  m_clip();
77 < extern int  t_func();
77 > extern int  t_func(), t_data();
78   extern int  p_cfunc(), p_bfunc();
79   extern int  p_pdata(), p_cdata(), p_bdata();
80   extern int  mx_func(), mx_data();
# Line 101 | Line 102 | extern int  text();
102                          { "glass", m_glass }, \
103                          { "antimatter", m_clip }, \
104                          { "texfunc", t_func }, \
105 +                        { "texdata", t_data }, \
106                          { "colorfunc", p_cfunc }, \
107                          { "brightfunc", p_bfunc }, \
108                          { "colorpict", p_pdata }, \

Diff Legend

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