ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/initotypes.c
(Generate patch)

Comparing ray/src/rt/initotypes.c (file contents):
Revision 1.5 by greg, Wed Jun 19 16:38:10 1991 UTC vs.
Revision 2.5 by greg, Sat Jun 22 09:48:55 1996 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1990 Regents of the University of California */
1 > /* Copyright (c) 1992 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 20 | Line 20 | extern int  o_cone();
20   extern int  o_instance();
21   extern int  m_light();
22   extern int  m_normal();
23 + extern int  m_aniso();
24   extern int  m_dielectric();
25 + extern int  m_mist();
26   extern int  m_glass();
27   extern int  m_clip();
28   extern int  m_mirror();
29 + extern int  m_direct();
30   extern int  m_brdf();
31 + extern int  m_brdf2();
32   extern int  t_func(), t_data();
33   extern int  p_cfunc(), p_bfunc();
34   extern int  p_pdata(), p_cdata(), p_bdata();
35   extern int  mx_func(), mx_data();
36 < extern int  text();
36 > extern int  do_text();
37  
38   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
39  
# Line 53 | Line 57 | initotypes()                   /* initialize ofun array */
57          ofun[MAT_METAL].funp =
58          ofun[MAT_TRANS].funp = m_normal;
59          ofun[MAT_TRANS].flags |= T_IRR_IGN;
60 +        ofun[MAT_PLASTIC2].funp =
61 +        ofun[MAT_METAL2].funp =
62 +        ofun[MAT_TRANS2].funp = m_aniso;
63 +        ofun[MAT_TRANS2].flags |= T_IRR_IGN;
64          ofun[MAT_DIELECTRIC].funp =
65          ofun[MAT_INTERFACE].funp = m_dielectric;
66          ofun[MAT_DIELECTRIC].flags |= T_IRR_IGN;
67          ofun[MAT_INTERFACE].flags |= T_IRR_IGN;
68 +        ofun[MAT_MIST].funp = m_mist;
69 +        ofun[MAT_MIST].flags |= T_IRR_IGN;
70          ofun[MAT_GLASS].funp = m_glass;
71          ofun[MAT_GLASS].flags |= T_IRR_IGN;
72          ofun[MAT_MIRROR].funp = m_mirror;
73 +        ofun[MAT_DIRECT1].funp =
74 +        ofun[MAT_DIRECT2].funp = m_direct;
75          ofun[MAT_CLIP].funp = m_clip;
76 +        ofun[MAT_BRTDF].funp = m_brdf;
77          ofun[MAT_PFUNC].funp =
78          ofun[MAT_MFUNC].funp =
79          ofun[MAT_PDATA].funp =
80          ofun[MAT_MDATA].funp =
81          ofun[MAT_TFUNC].funp =
82 <        ofun[MAT_BRTDF].funp =
70 <        ofun[MAT_TDATA].funp = m_brdf;
82 >        ofun[MAT_TDATA].funp = m_brdf2;
83          ofun[TEX_FUNC].funp = t_func;
84          ofun[TEX_DATA].funp = t_data;
85          ofun[PAT_CFUNC].funp = p_cfunc;
# Line 77 | Line 89 | initotypes()                   /* initialize ofun array */
89          ofun[PAT_BDATA].funp = p_bdata;
90          ofun[PAT_CTEXT].funp =
91          ofun[PAT_BTEXT].funp =
92 <        ofun[MIX_TEXT].funp = text;
92 >        ofun[MIX_TEXT].funp = do_text;
93          ofun[MIX_FUNC].funp = mx_func;
94          ofun[MIX_DATA].funp = mx_data;
95   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines