ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/otypes.h
(Generate patch)

Comparing ray/src/common/otypes.h (file contents):
Revision 1.12 by greg, Wed Jul 17 13:41:49 1991 UTC vs.
Revision 2.8 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid: $Id$ */
2   /*
3   *  otypes.h - defines for object types.
4 + */
5 +
6 + /* ====================================================================
7 + * The Radiance Software License, Version 1.0
8   *
9 < *     1/28/86
9 > * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 > * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 > *
12 > * Redistribution and use in source and binary forms, with or without
13 > * modification, are permitted provided that the following conditions
14 > * are met:
15 > *
16 > * 1. Redistributions of source code must retain the above copyright
17 > *         notice, this list of conditions and the following disclaimer.
18 > *
19 > * 2. Redistributions in binary form must reproduce the above copyright
20 > *       notice, this list of conditions and the following disclaimer in
21 > *       the documentation and/or other materials provided with the
22 > *       distribution.
23 > *
24 > * 3. The end-user documentation included with the redistribution,
25 > *           if any, must include the following acknowledgment:
26 > *             "This product includes Radiance software
27 > *                 (http://radsite.lbl.gov/)
28 > *                 developed by the Lawrence Berkeley National Laboratory
29 > *               (http://www.lbl.gov/)."
30 > *       Alternately, this acknowledgment may appear in the software itself,
31 > *       if and wherever such third-party acknowledgments normally appear.
32 > *
33 > * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 > *       and "The Regents of the University of California" must
35 > *       not be used to endorse or promote products derived from this
36 > *       software without prior written permission. For written
37 > *       permission, please contact [email protected].
38 > *
39 > * 5. Products derived from this software may not be called "Radiance",
40 > *       nor may "Radiance" appear in their name, without prior written
41 > *       permission of Lawrence Berkeley National Laboratory.
42 > *
43 > * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 > * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 > * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 > * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 > * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 > * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 > * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 > * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 > * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 > * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 > * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 > * SUCH DAMAGE.
55 > * ====================================================================
56 > *
57 > * This software consists of voluntary contributions made by many
58 > * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 > * information on Lawrence Berkeley National Laboratory, please see
60 > * <http://www.lbl.gov/>.
61   */
62  
63   typedef struct {
# Line 29 | Line 81 | typedef struct {
81   #define  MAT_GLASS      12              /* thin glass surface */
82   #define  MAT_TRANS      13              /* translucent material */
83   #define  MAT_DIELECTRIC 14              /* dielectric material */
84 < #define  MAT_INTERFACE  15              /* dielectric interface */
85 < #define  MAT_PFUNC      16              /* plastic brdf function */
86 < #define  MAT_MFUNC      17              /* metal brdf function */
87 < #define  PAT_BFUNC      18              /* brightness function */
88 < #define  PAT_BDATA      19              /* brightness data */
89 < #define  PAT_BTEXT      20              /* monochromatic text */
90 < #define  PAT_CPICT      21              /* color picture */
91 < #define  MAT_GLOW       22              /* proximity light source */
92 < #define  OBJ_SOURCE     23              /* distant source */
93 < #define  MAT_LIGHT      24              /* primary light source */
94 < #define  MAT_ILLUM      25              /* secondary light source */
95 < #define  MAT_SPOT       26              /* spot light source */
96 < #define  MAT_MIRROR     27              /* mirror (secondary source) */
97 < #define  MAT_TFUNC      28              /* trans brdf function */
98 < #define  MAT_BRTDF      29              /* brtd function */
99 < #define  MAT_PDATA      30              /* plastic brdf data */
100 < #define  MAT_MDATA      31              /* metal brdf data */
101 < #define  MAT_TDATA      32              /* trans brdf data */
102 < #define  PAT_CFUNC      33              /* color function */
103 < #define  MAT_CLIP       34              /* clipping surface */
104 < #define  PAT_CDATA      35              /* color data */
105 < #define  PAT_CTEXT      36              /* colored text */
106 < #define  TEX_DATA       37              /* surface texture data */
107 < #define  MIX_FUNC       38              /* mixing function */
108 < #define  MIX_DATA       39              /* mixing data */
109 < #define  MIX_TEXT       40              /* mixing text */
110 < #define  MAT_DIRECT1    41              /* unidirecting material */
111 < #define  MAT_DIRECT2    42              /* bidirecting material */
84 > #define  MAT_PLASTIC2   15              /* anisotropic plastic */
85 > #define  MAT_METAL2     16              /* anisotropic metal */
86 > #define  MAT_TRANS2     17              /* anisotropic translucent material */
87 > #define  MAT_INTERFACE  18              /* dielectric interface */
88 > #define  MAT_PFUNC      19              /* plastic brdf function */
89 > #define  MAT_MFUNC      20              /* metal brdf function */
90 > #define  PAT_BFUNC      21              /* brightness function */
91 > #define  PAT_BDATA      22              /* brightness data */
92 > #define  PAT_BTEXT      23              /* monochromatic text */
93 > #define  PAT_CPICT      24              /* color picture */
94 > #define  MAT_GLOW       25              /* proximity light source */
95 > #define  OBJ_SOURCE     26              /* distant source */
96 > #define  MAT_LIGHT      27              /* primary light source */
97 > #define  MAT_ILLUM      28              /* secondary light source */
98 > #define  MAT_SPOT       29              /* spot light source */
99 > #define  MAT_MIST       30              /* mist medium */
100 > #define  MAT_MIRROR     31              /* mirror (secondary source) */
101 > #define  MAT_TFUNC      32              /* trans brdf function */
102 > #define  MAT_BRTDF      33              /* brtd function */
103 > #define  MAT_PDATA      34              /* plastic brdf data */
104 > #define  MAT_MDATA      35              /* metal brdf data */
105 > #define  MAT_TDATA      36              /* trans brdf data */
106 > #define  PAT_CFUNC      37              /* color function */
107 > #define  MAT_CLIP       38              /* clipping surface */
108 > #define  PAT_CDATA      39              /* color data */
109 > #define  PAT_CTEXT      40              /* colored text */
110 > #define  TEX_DATA       41              /* surface texture data */
111 > #define  MIX_FUNC       42              /* mixing function */
112 > #define  MIX_DATA       43              /* mixing data */
113 > #define  MIX_TEXT       44              /* mixing text */
114 > #define  MIX_PICT       45              /* mixing picture */
115 > #define  MAT_DIRECT1    46              /* unidirecting material */
116 > #define  MAT_DIRECT2    47              /* bidirecting material */
117                                  /* number of object types */
118 < #define  NUMOTYPE       43
118 > #define  NUMOTYPE       48
119                                  /* type flags */
120   #define  T_S            01              /* surface (object) */
121   #define  T_M            02              /* material */
# Line 81 | Line 138 | extern FUN  ofun[];                    /* our type list */
138  
139   #define  issurface(t)   (ofun[t].flags & T_S)
140   #define  isvolume(t)    (ofun[t].flags & T_V)
141 < #define  ismodifier(t)  (!issurface(t))
141 > #define  ismodifier(t)  (!(ofun[t].flags & (T_S|T_V)))
142   #define  ismaterial(t)  (ofun[t].flags & T_M)
86 #define  istexture(t)   (ofun[t].flags & (T_P|T_T|T_X))
143   #define  islight(t)     (ofun[t].flags & T_L)
144   #define  isvlight(t)    (ofun[t].flags & T_LV)
145   #define  hasdata(t)     (ofun[t].flags & (T_D|T_I))
146   #define  hasfunc(t)     (ofun[t].flags & (T_F|T_D|T_I))
147   #define  hastext(t)     (ofun[t].flags & T_E)
148 + #define  isflat(t)      ((t)==OBJ_FACE || (t)==OBJ_RING)
149  
150   extern int  o_default();
151                                          /* type list initialization */
# Line 98 | Line 155 | extern int  o_default();
155                                  { "texfunc",    T_T|T_F,        o_default }, \
156                                  { "ring",       T_S,            o_default }, \
157                                  { "cylinder",   T_S,            o_default }, \
158 <                                { "instance",   T_S|T_V,        o_default }, \
158 >                                { "instance",   T_V,            o_default }, \
159                                  { "cup",        T_S,            o_default }, \
160                                  { "bubble",     T_S,            o_default }, \
161                                  { "tube",       T_S,            o_default }, \
# Line 107 | Line 164 | extern int  o_default();
164                                  { "glass",      T_M,            o_default }, \
165                                  { "trans",      T_M,            o_default }, \
166                                  { "dielectric", T_M,            o_default }, \
167 +                                { "plastic2",   T_M|T_F,        o_default }, \
168 +                                { "metal2",     T_M|T_F,        o_default }, \
169 +                                { "trans2",     T_M|T_F,        o_default }, \
170                                  { "interface",  T_M,            o_default }, \
171                                  { "plasfunc",   T_M|T_F,        o_default }, \
172                                  { "metfunc",    T_M|T_F,        o_default }, \
# Line 119 | Line 179 | extern int  o_default();
179                                  { "light",      T_M|T_L,        o_default }, \
180                                  { "illum",      T_M|T_L,        o_default }, \
181                                  { "spotlight",  T_M|T_L,        o_default }, \
182 +                                { "mist",       T_M,            o_default }, \
183                                  { "mirror",     T_M|T_LV,       o_default }, \
184                                  { "transfunc",  T_M|T_F,        o_default }, \
185                                  { "BRTDfunc",   T_M|T_F,        o_default }, \
# Line 133 | Line 194 | extern int  o_default();
194                                  { "mixfunc",    T_X|T_F,        o_default }, \
195                                  { "mixdata",    T_X|T_D,        o_default }, \
196                                  { "mixtext",    T_X|T_E,        o_default }, \
197 +                                { "mixpict",    T_X|T_I,        o_default }, \
198                                  { "prism1",     T_M|T_F|T_LV,   o_default }, \
199                                  { "prism2",     T_M|T_F|T_LV,   o_default }, \
200                          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines