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.12 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 8 | Line 8 | static const char RCSid[] = "$Id$";
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  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 109 | 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 */
94 >                                /* call to pull in freeobjmem.o */ /* XXX ? */
95          free_objs(0, 0);
96   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines