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.5 by greg, Sat Jun 22 09:48:55 1996 UTC vs.
Revision 2.9 by greg, Tue Mar 11 17:08:55 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1992 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 18 | Line 17 | 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();
# Line 32 | Line 32 | 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();
35 > extern int  mx_func(), mx_data(), mx_pdata();
36   extern int  do_text();
37  
38   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
# Line 49 | Line 49 | initotypes()                   /* initialize ofun array */
49          ofun[OBJ_TUBE].funp =
50          ofun[OBJ_RING].funp = o_cone;
51          ofun[OBJ_INSTANCE].funp = o_instance;
52 +        ofun[OBJ_MESH].funp = o_mesh;
53          ofun[MAT_LIGHT].funp =
54          ofun[MAT_ILLUM].funp =
55          ofun[MAT_GLOW].funp =
# Line 92 | Line 93 | initotypes()                   /* initialize ofun array */
93          ofun[MIX_TEXT].funp = do_text;
94          ofun[MIX_FUNC].funp = mx_func;
95          ofun[MIX_DATA].funp = mx_data;
96 +        ofun[MIX_PICT].funp = mx_pdata;
97   }
98  
99  
100   o_default()                     /* default action is error */
101   {
102          error(INTERNAL, "unexpected object call");
103 +                                /* call to pull in freeobjmem.o */
104 +        free_objs(0, 0);
105   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines