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 2.8 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.13 by greg, Fri Sep 10 17:08:36 2004 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   * Initialize ofun[] list for renderers
6   */
7  
8 < #include "copyright.h"
8 > #include  "copyright.h"
9  
10   #include  "standard.h"
11
11   #include  "otypes.h"
12 <
12 > #include  "rtotypes.h"
13   #include  "otspecial.h"
14  
16 extern int  o_sphere();
17 extern int  o_face();
18 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(), mx_pdata();
35 extern int  do_text();
15  
16   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
17  
18  
19 < initotypes()                    /* initialize ofun array */
19 > extern void
20 > initotypes(void)                        /* initialize ofun array */
21   {
22          ofun[OBJ_SPHERE].funp =
23          ofun[OBJ_BUBBLE].funp = o_sphere;
# Line 48 | Line 28 | initotypes()                   /* initialize ofun array */
28          ofun[OBJ_TUBE].funp =
29          ofun[OBJ_RING].funp = o_cone;
30          ofun[OBJ_INSTANCE].funp = o_instance;
31 +        ofun[OBJ_MESH].funp = o_mesh;
32 +        ofun[MOD_ALIAS].funp = m_alias;
33          ofun[MAT_LIGHT].funp =
34          ofun[MAT_ILLUM].funp =
35          ofun[MAT_GLOW].funp =
36          ofun[MAT_SPOT].funp = m_light;
37 +        ofun[MAT_LIGHT].flags |= T_OPAQUE;
38 +        ofun[MAT_SPOT].flags |= T_OPAQUE;
39          ofun[MAT_PLASTIC].funp =
40          ofun[MAT_METAL].funp =
41          ofun[MAT_TRANS].funp = m_normal;
42 +        ofun[MAT_PLASTIC].flags |= T_OPAQUE;
43 +        ofun[MAT_METAL].flags |= T_OPAQUE;
44          ofun[MAT_TRANS].flags |= T_IRR_IGN;
45          ofun[MAT_PLASTIC2].funp =
46          ofun[MAT_METAL2].funp =
47          ofun[MAT_TRANS2].funp = m_aniso;
48 +        ofun[MAT_PLASTIC2].flags |= T_OPAQUE;
49 +        ofun[MAT_METAL2].flags |= T_OPAQUE;
50          ofun[MAT_TRANS2].flags |= T_IRR_IGN;
51          ofun[MAT_DIELECTRIC].funp =
52          ofun[MAT_INTERFACE].funp = m_dielectric;
# Line 79 | Line 67 | initotypes()                   /* initialize ofun array */
67          ofun[MAT_MDATA].funp =
68          ofun[MAT_TFUNC].funp =
69          ofun[MAT_TDATA].funp = m_brdf2;
70 +        ofun[MAT_PFUNC].flags |= T_OPAQUE;
71 +        ofun[MAT_MFUNC].flags |= T_OPAQUE;
72 +        ofun[MAT_PDATA].flags |= T_OPAQUE;
73 +        ofun[MAT_MDATA].flags |= T_OPAQUE;
74          ofun[TEX_FUNC].funp = t_func;
75          ofun[TEX_DATA].funp = t_data;
76          ofun[PAT_CFUNC].funp = p_cfunc;
# Line 95 | Line 87 | initotypes()                   /* initialize ofun array */
87   }
88  
89  
90 < o_default()                     /* default action is error */
90 > extern int
91 > o_default(OBJREC *o, RAY *r)                    /* default action is error */
92   {
93 <        error(INTERNAL, "unexpected object call");
94 <                                /* call to pull in freeobjmem.o */
93 >        error(CONSISTENCY, "unexpected object call");
94 >                                /* call to pull in freeobjmem.o */ /* XXX ? */
95          free_objs(0, 0);
96   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines