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.11 by greg, Wed Dec 31 01:50:02 2003 UTC vs.
Revision 2.17 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7  
8   #include  "copyright.h"
9  
10 < #include  "standard.h"
11 <
10 > #include  "ray.h"
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  o_mesh();
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  m_alias();
33 extern int  t_func(), t_data();
34 extern int  p_cfunc(), p_bfunc();
35 extern int  p_pdata(), p_cdata(), p_bdata();
36 extern int  mx_func(), mx_data(), mx_pdata();
37 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 83 | Line 61 | initotypes()                   /* initialize ofun array */
61          ofun[MAT_DIRECT2].funp = m_direct;
62          ofun[MAT_CLIP].funp = m_clip;
63          ofun[MAT_BRTDF].funp = m_brdf;
64 +        ofun[MAT_BSDF].funp = m_bsdf;
65          ofun[MAT_PFUNC].funp =
66          ofun[MAT_MFUNC].funp =
67          ofun[MAT_PDATA].funp =
# Line 109 | Line 88 | initotypes()                   /* initialize ofun array */
88   }
89  
90  
91 < o_default()                     /* default action is error */
91 > extern int
92 > o_default(OBJREC *o, RAY *r)                    /* default action is error */
93   {
94 <        error(INTERNAL, "unexpected object call");
95 <                                /* call to pull in freeobjmem.o */
94 >        objerror(o, CONSISTENCY, "unexpected object call");
95 >                                /* unused call to load freeobjmem.o */
96          free_objs(0, 0);
97 +        return(0);
98   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines