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.11 by schorsch, Fri Jun 6 16:38:47 2003 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  
11 < /* ====================================================================
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 < */
11 > #include "copyright.h"
12  
13   typedef struct {
14          char  *funame;                  /* function name */
# Line 76 | Line 26 | typedef struct {
26   #define  OBJ_CUP        7               /* inverted cone */
27   #define  OBJ_BUBBLE     8               /* inverted sphere */
28   #define  OBJ_TUBE       9               /* inverted cylinder */
29 < #define  MAT_PLASTIC    10              /* plastic surface */
30 < #define  MAT_METAL      11              /* metal surface */
31 < #define  MAT_GLASS      12              /* thin glass surface */
32 < #define  MAT_TRANS      13              /* translucent material */
33 < #define  MAT_DIELECTRIC 14              /* dielectric material */
34 < #define  MAT_PLASTIC2   15              /* anisotropic plastic */
35 < #define  MAT_METAL2     16              /* anisotropic metal */
36 < #define  MAT_TRANS2     17              /* anisotropic translucent material */
37 < #define  MAT_INTERFACE  18              /* dielectric interface */
38 < #define  MAT_PFUNC      19              /* plastic brdf function */
39 < #define  MAT_MFUNC      20              /* metal brdf function */
40 < #define  PAT_BFUNC      21              /* brightness function */
41 < #define  PAT_BDATA      22              /* brightness data */
42 < #define  PAT_BTEXT      23              /* monochromatic text */
43 < #define  PAT_CPICT      24              /* color picture */
44 < #define  MAT_GLOW       25              /* proximity light source */
45 < #define  OBJ_SOURCE     26              /* distant source */
46 < #define  MAT_LIGHT      27              /* primary light source */
47 < #define  MAT_ILLUM      28              /* secondary light source */
48 < #define  MAT_SPOT       29              /* spot light source */
49 < #define  MAT_MIST       30              /* mist medium */
50 < #define  MAT_MIRROR     31              /* mirror (secondary source) */
51 < #define  MAT_TFUNC      32              /* trans brdf function */
52 < #define  MAT_BRTDF      33              /* brtd function */
53 < #define  MAT_PDATA      34              /* plastic brdf data */
54 < #define  MAT_MDATA      35              /* metal brdf data */
55 < #define  MAT_TDATA      36              /* trans brdf data */
56 < #define  PAT_CFUNC      37              /* color function */
57 < #define  MAT_CLIP       38              /* clipping surface */
58 < #define  PAT_CDATA      39              /* color data */
59 < #define  PAT_CTEXT      40              /* colored text */
60 < #define  TEX_DATA       41              /* surface texture data */
61 < #define  MIX_FUNC       42              /* mixing function */
62 < #define  MIX_DATA       43              /* mixing data */
63 < #define  MIX_TEXT       44              /* mixing text */
64 < #define  MIX_PICT       45              /* mixing picture */
65 < #define  MAT_DIRECT1    46              /* unidirecting material */
66 < #define  MAT_DIRECT2    47              /* bidirecting material */
29 > #define  OBJ_MESH       10              /* mesh instance */
30 > #define  MOD_ALIAS      11              /* modifier alias */
31 > #define  MAT_PLASTIC    12              /* plastic surface */
32 > #define  MAT_METAL      13              /* metal surface */
33 > #define  MAT_GLASS      14              /* thin glass surface */
34 > #define  MAT_TRANS      15              /* translucent material */
35 > #define  MAT_DIELECTRIC 16              /* dielectric material */
36 > #define  MAT_PLASTIC2   17              /* anisotropic plastic */
37 > #define  MAT_METAL2     18              /* anisotropic metal */
38 > #define  MAT_TRANS2     19              /* anisotropic translucent material */
39 > #define  MAT_INTERFACE  20              /* dielectric interface */
40 > #define  MAT_PFUNC      21              /* plastic brdf function */
41 > #define  MAT_MFUNC      22              /* metal brdf function */
42 > #define  PAT_BFUNC      23              /* brightness function */
43 > #define  PAT_BDATA      24              /* brightness data */
44 > #define  PAT_BTEXT      25              /* monochromatic text */
45 > #define  PAT_CPICT      26              /* color picture */
46 > #define  MAT_GLOW       27              /* proximity light source */
47 > #define  OBJ_SOURCE     28              /* distant source */
48 > #define  MAT_LIGHT      29              /* primary light source */
49 > #define  MAT_ILLUM      30              /* secondary light source */
50 > #define  MAT_SPOT       31              /* spot light source */
51 > #define  MAT_MIST       32              /* mist medium */
52 > #define  MAT_MIRROR     33              /* mirror (secondary source) */
53 > #define  MAT_TFUNC      34              /* trans brdf function */
54 > #define  MAT_BRTDF      35              /* brtd function */
55 > #define  MAT_PDATA      36              /* plastic brdf data */
56 > #define  MAT_MDATA      37              /* metal brdf data */
57 > #define  MAT_TDATA      38              /* trans brdf data */
58 > #define  PAT_CFUNC      39              /* color function */
59 > #define  MAT_CLIP       40              /* clipping surface */
60 > #define  PAT_CDATA      41              /* color data */
61 > #define  PAT_CTEXT      42              /* colored text */
62 > #define  TEX_DATA       43              /* surface texture data */
63 > #define  MIX_FUNC       44              /* mixing function */
64 > #define  MIX_DATA       45              /* mixing data */
65 > #define  MIX_TEXT       46              /* mixing text */
66 > #define  MIX_PICT       47              /* mixing picture */
67 > #define  MAT_DIRECT1    48              /* unidirecting material */
68 > #define  MAT_DIRECT2    49              /* bidirecting material */
69                                  /* number of object types */
70 < #define  NUMOTYPE       48
70 > #define  NUMOTYPE       50
71                                  /* type flags */
72   #define  T_S            01              /* surface (object) */
73   #define  T_M            02              /* material */
# Line 140 | Line 92 | extern FUN  ofun[];                    /* our type list */
92   #define  isvolume(t)    (ofun[t].flags & T_V)
93   #define  ismodifier(t)  (!(ofun[t].flags & (T_S|T_V)))
94   #define  ismaterial(t)  (ofun[t].flags & T_M)
95 + #define  ispattern(t)   (ofun[t].flags & T_P)
96 + #define  istexture(t)   (ofun[t].flags & T_T)
97 + #define  ismixture(t)   (ofun[t].flags & T_X)
98   #define  islight(t)     (ofun[t].flags & T_L)
99   #define  isvlight(t)    (ofun[t].flags & T_LV)
100   #define  hasdata(t)     (ofun[t].flags & (T_D|T_I))
# Line 148 | Line 103 | extern FUN  ofun[];                    /* our type list */
103   #define  isflat(t)      ((t)==OBJ_FACE || (t)==OBJ_RING)
104  
105   extern int  o_default();
106 +
107 + #define  ALIASKEY       "alias"                 /* alias keyword */
108 + #define  ALIASMOD       "inherit"               /* inherit target modifier */
109 +
110                                          /* type list initialization */
111   #define  INIT_OTYPE     {       { "polygon",    T_S,            o_default }, \
112                                  { "cone",       T_S,            o_default }, \
# Line 159 | Line 118 | extern int  o_default();
118                                  { "cup",        T_S,            o_default }, \
119                                  { "bubble",     T_S,            o_default }, \
120                                  { "tube",       T_S,            o_default }, \
121 +                                { "mesh",       T_V,            o_default }, \
122 +                                { ALIASKEY,     0,              o_default }, \
123                                  { "plastic",    T_M,            o_default }, \
124                                  { "metal",      T_M,            o_default }, \
125                                  { "glass",      T_M,            o_default }, \
# Line 199 | Line 160 | extern int  o_default();
160                                  { "prism2",     T_M|T_F|T_LV,   o_default }, \
161                          }
162  
163 < #define  ALIASID        "alias"         /* alias type identifier */
163 >
164 > #ifdef __cplusplus
165 > }
166 > #endif
167 > #endif /* _RAD_OTYPES_H_ */

Diff Legend

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