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.8 by greg, Tue Feb 25 02:47:22 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1990 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Initialize ofun[] list for renderers
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  "standard.h"
11  
12   #include  "otypes.h"
# Line 20 | Line 19 | extern int  o_cone();
19   extern int  o_instance();
20   extern int  m_light();
21   extern int  m_normal();
22 + extern int  m_aniso();
23   extern int  m_dielectric();
24 + extern int  m_mist();
25   extern int  m_glass();
26   extern int  m_clip();
27   extern int  m_mirror();
28 + extern int  m_direct();
29   extern int  m_brdf();
30 + extern int  m_brdf2();
31   extern int  t_func(), t_data();
32   extern int  p_cfunc(), p_bfunc();
33   extern int  p_pdata(), p_cdata(), p_bdata();
34 < extern int  mx_func(), mx_data();
35 < extern int  text();
34 > extern int  mx_func(), mx_data(), mx_pdata();
35 > extern int  do_text();
36  
37   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
38  
# Line 53 | Line 56 | initotypes()                   /* initialize ofun array */
56          ofun[MAT_METAL].funp =
57          ofun[MAT_TRANS].funp = m_normal;
58          ofun[MAT_TRANS].flags |= T_IRR_IGN;
59 +        ofun[MAT_PLASTIC2].funp =
60 +        ofun[MAT_METAL2].funp =
61 +        ofun[MAT_TRANS2].funp = m_aniso;
62 +        ofun[MAT_TRANS2].flags |= T_IRR_IGN;
63          ofun[MAT_DIELECTRIC].funp =
64          ofun[MAT_INTERFACE].funp = m_dielectric;
65          ofun[MAT_DIELECTRIC].flags |= T_IRR_IGN;
66          ofun[MAT_INTERFACE].flags |= T_IRR_IGN;
67 +        ofun[MAT_MIST].funp = m_mist;
68 +        ofun[MAT_MIST].flags |= T_IRR_IGN;
69          ofun[MAT_GLASS].funp = m_glass;
70          ofun[MAT_GLASS].flags |= T_IRR_IGN;
71          ofun[MAT_MIRROR].funp = m_mirror;
72 +        ofun[MAT_DIRECT1].funp =
73 +        ofun[MAT_DIRECT2].funp = m_direct;
74          ofun[MAT_CLIP].funp = m_clip;
75 +        ofun[MAT_BRTDF].funp = m_brdf;
76          ofun[MAT_PFUNC].funp =
77          ofun[MAT_MFUNC].funp =
78          ofun[MAT_PDATA].funp =
79          ofun[MAT_MDATA].funp =
80          ofun[MAT_TFUNC].funp =
81 <        ofun[MAT_BRTDF].funp =
70 <        ofun[MAT_TDATA].funp = m_brdf;
81 >        ofun[MAT_TDATA].funp = m_brdf2;
82          ofun[TEX_FUNC].funp = t_func;
83          ofun[TEX_DATA].funp = t_data;
84          ofun[PAT_CFUNC].funp = p_cfunc;
# Line 77 | Line 88 | initotypes()                   /* initialize ofun array */
88          ofun[PAT_BDATA].funp = p_bdata;
89          ofun[PAT_CTEXT].funp =
90          ofun[PAT_BTEXT].funp =
91 <        ofun[MIX_TEXT].funp = text;
91 >        ofun[MIX_TEXT].funp = do_text;
92          ofun[MIX_FUNC].funp = mx_func;
93          ofun[MIX_DATA].funp = mx_data;
94 +        ofun[MIX_PICT].funp = mx_pdata;
95   }
96  
97  
98   o_default()                     /* default action is error */
99   {
100          error(INTERNAL, "unexpected object call");
101 +                                /* call to pull in freeobjmem.o */
102 +        free_objs(0, 0);
103   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines