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.4 by greg, Fri Dec 8 18:22:37 1995 UTC vs.
Revision 2.10 by greg, Tue Mar 11 19:29:05 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 29 | Line 29 | 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();
37 < extern int  text();
36 > extern int  mx_func(), mx_data(), mx_pdata();
37 > extern int  do_text();
38  
39   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
40  
# Line 49 | Line 50 | initotypes()                   /* initialize ofun array */
50          ofun[OBJ_TUBE].funp =
51          ofun[OBJ_RING].funp = o_cone;
52          ofun[OBJ_INSTANCE].funp = o_instance;
53 +        ofun[OBJ_MESH].funp = o_mesh;
54 +        ofun[MOD_ALIAS].funp = m_alias;
55          ofun[MAT_LIGHT].funp =
56          ofun[MAT_ILLUM].funp =
57          ofun[MAT_GLOW].funp =
# Line 89 | Line 92 | initotypes()                   /* initialize ofun array */
92          ofun[PAT_BDATA].funp = p_bdata;
93          ofun[PAT_CTEXT].funp =
94          ofun[PAT_BTEXT].funp =
95 <        ofun[MIX_TEXT].funp = text;
95 >        ofun[MIX_TEXT].funp = do_text;
96          ofun[MIX_FUNC].funp = mx_func;
97          ofun[MIX_DATA].funp = mx_data;
98 +        ofun[MIX_PICT].funp = mx_pdata;
99   }
100  
101  
102   o_default()                     /* default action is error */
103   {
104          error(INTERNAL, "unexpected object call");
105 +                                /* call to pull in freeobjmem.o */
106 +        free_objs(0, 0);
107   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines