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.7 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.13 by greg, Fri Sep 10 17:08:36 2004 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   * Initialize ofun[] list for renderers
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include  "copyright.h"
9  
10   #include  "standard.h"
66 –
11   #include  "otypes.h"
12 <
12 > #include  "rtotypes.h"
13   #include  "otspecial.h"
14  
71 – extern int  o_sphere();
72 – extern int  o_face();
73 – extern int  o_cone();
74 – extern int  o_instance();
75 – extern int  m_light();
76 – extern int  m_normal();
77 – extern int  m_aniso();
78 – extern int  m_dielectric();
79 – extern int  m_mist();
80 – extern int  m_glass();
81 – extern int  m_clip();
82 – extern int  m_mirror();
83 – extern int  m_direct();
84 – extern int  m_brdf();
85 – extern int  m_brdf2();
86 – extern int  t_func(), t_data();
87 – extern int  p_cfunc(), p_bfunc();
88 – extern int  p_pdata(), p_cdata(), p_bdata();
89 – extern int  mx_func(), mx_data(), mx_pdata();
90 – 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 103 | 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_PLASTIC].flags |= T_OPAQUE;
43 +        ofun[MAT_METAL].flags |= T_OPAQUE;
44          ofun[MAT_TRANS].flags |= T_IRR_IGN;
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_IRR_IGN;
51          ofun[MAT_DIELECTRIC].funp =
52          ofun[MAT_INTERFACE].funp = m_dielectric;
# Line 134 | Line 67 | initotypes()                   /* initialize ofun array */
67          ofun[MAT_MDATA].funp =
68          ofun[MAT_TFUNC].funp =
69          ofun[MAT_TDATA].funp = m_brdf2;
70 +        ofun[MAT_PFUNC].flags |= T_OPAQUE;
71 +        ofun[MAT_MFUNC].flags |= T_OPAQUE;
72 +        ofun[MAT_PDATA].flags |= T_OPAQUE;
73 +        ofun[MAT_MDATA].flags |= T_OPAQUE;
74          ofun[TEX_FUNC].funp = t_func;
75          ofun[TEX_DATA].funp = t_data;
76          ofun[PAT_CFUNC].funp = p_cfunc;
# Line 150 | 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 */
93 >        error(CONSISTENCY, "unexpected object call");
94 >                                /* call to pull in freeobjmem.o */ /* XXX ? */
95          free_objs(0, 0);
96   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines