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 1.5 by greg, Wed Jun 19 16:38:10 1991 UTC vs.
Revision 2.21 by greg, Mon Jun 25 20:49:10 2018 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1990 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  "standard.h"
8 > #include  "copyright.h"
9  
10 + #include  "ray.h"
11   #include  "otypes.h"
12 <
12 > #include  "rtotypes.h"
13   #include  "otspecial.h"
14  
17 extern int  o_sphere();
18 extern int  o_face();
19 extern int  o_cone();
20 extern int  o_instance();
21 extern int  m_light();
22 extern int  m_normal();
23 extern int  m_dielectric();
24 extern int  m_glass();
25 extern int  m_clip();
26 extern int  m_mirror();
27 extern int  m_brdf();
28 extern int  t_func(), t_data();
29 extern int  p_cfunc(), p_bfunc();
30 extern int  p_pdata(), p_cdata(), p_bdata();
31 extern int  mx_func(), mx_data();
32 extern int  text();
15  
16   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
17  
18  
19 < initotypes()                    /* initialize ofun array */
19 > void
20 > initotypes(void)                        /* initialize ofun array */
21   {
22          ofun[OBJ_SPHERE].funp =
23          ofun[OBJ_BUBBLE].funp = o_sphere;
# Line 45 | 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_TRANS].flags |= T_IRR_IGN;
42 >        ofun[MAT_PLASTIC].flags |= T_OPAQUE;
43 >        ofun[MAT_METAL].flags |= T_OPAQUE;
44 >        ofun[MAT_TRANS].flags |= T_TRANSP;
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_TRANSP;
51 >        ofun[MAT_ASHIKHMIN].funp = m_ashikhmin;
52 >        ofun[MAT_ASHIKHMIN].flags |= T_OPAQUE;
53          ofun[MAT_DIELECTRIC].funp =
54          ofun[MAT_INTERFACE].funp = m_dielectric;
55 <        ofun[MAT_DIELECTRIC].flags |= T_IRR_IGN;
56 <        ofun[MAT_INTERFACE].flags |= T_IRR_IGN;
55 >        ofun[MAT_DIELECTRIC].flags |= T_TRANSP;
56 >        ofun[MAT_INTERFACE].flags |= T_TRANSP;
57 >        ofun[MAT_MIST].funp = m_mist;
58 >        ofun[MAT_MIST].flags |= T_TRANSP;
59          ofun[MAT_GLASS].funp = m_glass;
60 <        ofun[MAT_GLASS].flags |= T_IRR_IGN;
60 >        ofun[MAT_GLASS].flags |= T_TRANSP;
61          ofun[MAT_MIRROR].funp = m_mirror;
62 +        ofun[MAT_DIRECT1].funp =
63 +        ofun[MAT_DIRECT2].funp = m_direct;
64          ofun[MAT_CLIP].funp = m_clip;
65 +        ofun[MAT_BRTDF].funp = m_brdf;
66 +        ofun[MAT_BSDF].funp =
67 +        ofun[MAT_SBSDF].funp = m_bsdf;
68 +        ofun[MAT_SBSDF].flags |= T_TRANSP;
69          ofun[MAT_PFUNC].funp =
70          ofun[MAT_MFUNC].funp =
71          ofun[MAT_PDATA].funp =
72          ofun[MAT_MDATA].funp =
73          ofun[MAT_TFUNC].funp =
74 <        ofun[MAT_BRTDF].funp =
75 <        ofun[MAT_TDATA].funp = m_brdf;
74 >        ofun[MAT_TDATA].funp = m_brdf2;
75 >        ofun[MAT_PFUNC].flags |= T_OPAQUE;
76 >        ofun[MAT_MFUNC].flags |= T_OPAQUE;
77 >        ofun[MAT_PDATA].flags |= T_OPAQUE;
78 >        ofun[MAT_MDATA].flags |= T_OPAQUE;
79          ofun[TEX_FUNC].funp = t_func;
80          ofun[TEX_DATA].funp = t_data;
81          ofun[PAT_CFUNC].funp = p_cfunc;
# Line 77 | Line 85 | initotypes()                   /* initialize ofun array */
85          ofun[PAT_BDATA].funp = p_bdata;
86          ofun[PAT_CTEXT].funp =
87          ofun[PAT_BTEXT].funp =
88 <        ofun[MIX_TEXT].funp = text;
88 >        ofun[MIX_TEXT].funp = do_text;
89          ofun[MIX_FUNC].funp = mx_func;
90          ofun[MIX_DATA].funp = mx_data;
91 +        ofun[MIX_PICT].funp = mx_pdata;
92   }
93  
94  
95 < o_default()                     /* default action is error */
95 > int
96 > o_default(OBJREC *o, RAY *r)                    /* default action is error */
97   {
98 <        error(INTERNAL, "unexpected object call");
98 >        objerror(o, CONSISTENCY, "unexpected object call");
99 >                                /* unused call to load freeobjmem.o */
100 >        free_objs(0, 0);
101 >        return(0);
102   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines