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 2.8 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.17 by greg, Sun Jul 29 19:01:39 2012 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  otypes.h - defines for object types.
4   */
5 + #ifndef _RAD_OTYPES_H_
6 + #define _RAD_OTYPES_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
6 – /* ====================================================================
7 – * The Radiance Software License, Version 1.0
8 – *
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 –
11   typedef struct {
12          char  *funame;                  /* function name */
13          int  flags;                     /* type flags */
14 + #ifdef FUN_ARGLIST
15 +        int  (*funp)(FUN_ARGLIST);      /* pointer to function */
16 + #else
17          int  (*funp)();                 /* pointer to function */
18 + #endif
19   }  FUN;
20 +
21 + #ifdef FUN_ARGLIST
22 + extern int  o_default(FUN_ARGLIST);
23 + #else
24 + extern int  o_default(); /* XXX conflict with radogl.h */
25 + #endif
26 +
27                                  /* object types in decreasing frequency */
28   #define  OBJ_FACE       0               /* polygon */
29   #define  OBJ_CONE       1               /* cone */
# Line 76 | Line 35 | typedef struct {
35   #define  OBJ_CUP        7               /* inverted cone */
36   #define  OBJ_BUBBLE     8               /* inverted sphere */
37   #define  OBJ_TUBE       9               /* inverted cylinder */
38 < #define  MAT_PLASTIC    10              /* plastic surface */
39 < #define  MAT_METAL      11              /* metal surface */
40 < #define  MAT_GLASS      12              /* thin glass surface */
41 < #define  MAT_TRANS      13              /* translucent material */
42 < #define  MAT_DIELECTRIC 14              /* dielectric material */
43 < #define  MAT_PLASTIC2   15              /* anisotropic plastic */
44 < #define  MAT_METAL2     16              /* anisotropic metal */
45 < #define  MAT_TRANS2     17              /* anisotropic translucent material */
46 < #define  MAT_INTERFACE  18              /* dielectric interface */
47 < #define  MAT_PFUNC      19              /* plastic brdf function */
48 < #define  MAT_MFUNC      20              /* metal brdf function */
49 < #define  PAT_BFUNC      21              /* brightness function */
50 < #define  PAT_BDATA      22              /* brightness data */
51 < #define  PAT_BTEXT      23              /* monochromatic text */
52 < #define  PAT_CPICT      24              /* color picture */
53 < #define  MAT_GLOW       25              /* proximity light source */
54 < #define  OBJ_SOURCE     26              /* distant source */
55 < #define  MAT_LIGHT      27              /* primary light source */
56 < #define  MAT_ILLUM      28              /* secondary light source */
57 < #define  MAT_SPOT       29              /* spot light source */
58 < #define  MAT_MIST       30              /* mist medium */
59 < #define  MAT_MIRROR     31              /* mirror (secondary source) */
60 < #define  MAT_TFUNC      32              /* trans brdf function */
61 < #define  MAT_BRTDF      33              /* brtd function */
62 < #define  MAT_PDATA      34              /* plastic brdf data */
63 < #define  MAT_MDATA      35              /* metal brdf data */
64 < #define  MAT_TDATA      36              /* trans brdf data */
65 < #define  PAT_CFUNC      37              /* color function */
66 < #define  MAT_CLIP       38              /* clipping surface */
67 < #define  PAT_CDATA      39              /* color data */
68 < #define  PAT_CTEXT      40              /* colored text */
69 < #define  TEX_DATA       41              /* surface texture data */
70 < #define  MIX_FUNC       42              /* mixing function */
71 < #define  MIX_DATA       43              /* mixing data */
72 < #define  MIX_TEXT       44              /* mixing text */
73 < #define  MIX_PICT       45              /* mixing picture */
74 < #define  MAT_DIRECT1    46              /* unidirecting material */
75 < #define  MAT_DIRECT2    47              /* bidirecting material */
38 > #define  OBJ_MESH       10              /* mesh instance */
39 > #define  MOD_ALIAS      11              /* modifier alias */
40 > #define  MAT_PLASTIC    12              /* plastic surface */
41 > #define  MAT_METAL      13              /* metal surface */
42 > #define  MAT_GLASS      14              /* thin glass surface */
43 > #define  MAT_TRANS      15              /* translucent material */
44 > #define  MAT_DIELECTRIC 16              /* dielectric material */
45 > #define  MAT_PLASTIC2   17              /* anisotropic plastic */
46 > #define  MAT_METAL2     18              /* anisotropic metal */
47 > #define  MAT_TRANS2     19              /* anisotropic translucent material */
48 > #define  MAT_INTERFACE  20              /* dielectric interface */
49 > #define  MAT_PFUNC      21              /* plastic brdf function */
50 > #define  MAT_MFUNC      22              /* metal brdf function */
51 > #define  PAT_BFUNC      23              /* brightness function */
52 > #define  PAT_BDATA      24              /* brightness data */
53 > #define  PAT_BTEXT      25              /* monochromatic text */
54 > #define  PAT_CPICT      26              /* color picture */
55 > #define  MAT_GLOW       27              /* proximity light source */
56 > #define  OBJ_SOURCE     28              /* distant source */
57 > #define  MAT_LIGHT      29              /* primary light source */
58 > #define  MAT_ILLUM      30              /* secondary light source */
59 > #define  MAT_SPOT       31              /* spot light source */
60 > #define  MAT_MIST       32              /* mist medium */
61 > #define  MAT_MIRROR     33              /* mirror (secondary source) */
62 > #define  MAT_TFUNC      34              /* trans brdf function */
63 > #define  MAT_BRTDF      35              /* BRTD function */
64 > #define  MAT_BSDF       36              /* BSDF data file */
65 > #define  MAT_PDATA      37              /* plastic brdf data */
66 > #define  MAT_MDATA      38              /* metal brdf data */
67 > #define  MAT_TDATA      39              /* trans brdf data */
68 > #define  PAT_CFUNC      40              /* color function */
69 > #define  MAT_CLIP       41              /* clipping surface */
70 > #define  PAT_CDATA      42              /* color data */
71 > #define  PAT_CTEXT      43              /* colored text */
72 > #define  TEX_DATA       44              /* surface texture data */
73 > #define  MIX_FUNC       45              /* mixing function */
74 > #define  MIX_DATA       46              /* mixing data */
75 > #define  MIX_TEXT       47              /* mixing text */
76 > #define  MIX_PICT       48              /* mixing picture */
77 > #define  MAT_DIRECT1    49              /* unidirecting material */
78 > #define  MAT_DIRECT2    50              /* bidirecting material */
79 > #define  MAT_ASHIKHMIN  51              /* Ashikhmin-Shirley BRDF material */
80                                  /* number of object types */
81 < #define  NUMOTYPE       48
81 > #define  NUMOTYPE       52
82                                  /* type flags */
83   #define  T_S            01              /* surface (object) */
84   #define  T_M            02              /* material */
# Line 140 | Line 103 | extern FUN  ofun[];                    /* our type list */
103   #define  isvolume(t)    (ofun[t].flags & T_V)
104   #define  ismodifier(t)  (!(ofun[t].flags & (T_S|T_V)))
105   #define  ismaterial(t)  (ofun[t].flags & T_M)
106 + #define  ispattern(t)   (ofun[t].flags & T_P)
107 + #define  istexture(t)   (ofun[t].flags & T_T)
108 + #define  ismixture(t)   (ofun[t].flags & T_X)
109   #define  islight(t)     (ofun[t].flags & T_L)
110   #define  isvlight(t)    (ofun[t].flags & T_LV)
111   #define  hasdata(t)     (ofun[t].flags & (T_D|T_I))
# Line 147 | Line 113 | extern FUN  ofun[];                    /* our type list */
113   #define  hastext(t)     (ofun[t].flags & T_E)
114   #define  isflat(t)      ((t)==OBJ_FACE || (t)==OBJ_RING)
115  
116 < extern int  o_default();
116 > #define  ALIASKEY       "alias"                 /* alias keyword */
117 > #define  ALIASMOD       "inherit"               /* inherit target modifier */
118 >
119                                          /* type list initialization */
120   #define  INIT_OTYPE     {       { "polygon",    T_S,            o_default }, \
121                                  { "cone",       T_S,            o_default }, \
# Line 159 | Line 127 | extern int  o_default();
127                                  { "cup",        T_S,            o_default }, \
128                                  { "bubble",     T_S,            o_default }, \
129                                  { "tube",       T_S,            o_default }, \
130 +                                { "mesh",       T_V,            o_default }, \
131 +                                { ALIASKEY,     0,              o_default }, \
132                                  { "plastic",    T_M,            o_default }, \
133                                  { "metal",      T_M,            o_default }, \
134                                  { "glass",      T_M,            o_default }, \
# Line 183 | Line 153 | extern int  o_default();
153                                  { "mirror",     T_M|T_LV,       o_default }, \
154                                  { "transfunc",  T_M|T_F,        o_default }, \
155                                  { "BRTDfunc",   T_M|T_F,        o_default }, \
156 +                                { "BSDF",       T_M|T_D,        o_default }, \
157                                  { "plasdata",   T_M|T_D,        o_default }, \
158                                  { "metdata",    T_M|T_D,        o_default }, \
159                                  { "transdata",  T_M|T_D,        o_default }, \
# Line 197 | Line 168 | extern int  o_default();
168                                  { "mixpict",    T_X|T_I,        o_default }, \
169                                  { "prism1",     T_M|T_F|T_LV,   o_default }, \
170                                  { "prism2",     T_M|T_F|T_LV,   o_default }, \
171 +                                { "ashik2",     T_M|T_F,        o_default }, \
172                          }
173  
174 < #define  ALIASID        "alias"         /* alias type identifier */
174 >
175 > #ifdef __cplusplus
176 > }
177 > #endif
178 > #endif /* _RAD_OTYPES_H_ */

Diff Legend

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