--- ray/src/common/otypes.h 1991/07/17 13:41:49 1.12 +++ ray/src/common/otypes.h 2003/11/21 07:15:29 2.14 @@ -1,18 +1,28 @@ -/* Copyright (c) 1986 Regents of the University of California */ - -/* SCCSid "$SunId$ LBL" */ - +/* RCSid $Id: otypes.h,v 2.14 2003/11/21 07:15:29 greg Exp $ */ /* * otypes.h - defines for object types. - * - * 1/28/86 */ +#ifndef _RAD_OTYPES_H_ +#define _RAD_OTYPES_H_ +#ifdef __cplusplus +extern "C" { +#endif typedef struct { char *funame; /* function name */ int flags; /* type flags */ +#ifdef FUN_ARGLIST + int (*funp)(FUN_ARGLIST); /* pointer to function */ +#else int (*funp)(); /* pointer to function */ +#endif } FUN; + +#ifdef FUN_ARGLIST +extern int o_default(FUN_ARGLIST); +#else +extern int o_default(); +#endif /* object types in decreasing frequency */ #define OBJ_FACE 0 /* polygon */ #define OBJ_CONE 1 /* cone */ @@ -24,41 +34,48 @@ typedef struct { #define OBJ_CUP 7 /* inverted cone */ #define OBJ_BUBBLE 8 /* inverted sphere */ #define OBJ_TUBE 9 /* inverted cylinder */ -#define MAT_PLASTIC 10 /* plastic surface */ -#define MAT_METAL 11 /* metal surface */ -#define MAT_GLASS 12 /* thin glass surface */ -#define MAT_TRANS 13 /* translucent material */ -#define MAT_DIELECTRIC 14 /* dielectric material */ -#define MAT_INTERFACE 15 /* dielectric interface */ -#define MAT_PFUNC 16 /* plastic brdf function */ -#define MAT_MFUNC 17 /* metal brdf function */ -#define PAT_BFUNC 18 /* brightness function */ -#define PAT_BDATA 19 /* brightness data */ -#define PAT_BTEXT 20 /* monochromatic text */ -#define PAT_CPICT 21 /* color picture */ -#define MAT_GLOW 22 /* proximity light source */ -#define OBJ_SOURCE 23 /* distant source */ -#define MAT_LIGHT 24 /* primary light source */ -#define MAT_ILLUM 25 /* secondary light source */ -#define MAT_SPOT 26 /* spot light source */ -#define MAT_MIRROR 27 /* mirror (secondary source) */ -#define MAT_TFUNC 28 /* trans brdf function */ -#define MAT_BRTDF 29 /* brtd function */ -#define MAT_PDATA 30 /* plastic brdf data */ -#define MAT_MDATA 31 /* metal brdf data */ -#define MAT_TDATA 32 /* trans brdf data */ -#define PAT_CFUNC 33 /* color function */ -#define MAT_CLIP 34 /* clipping surface */ -#define PAT_CDATA 35 /* color data */ -#define PAT_CTEXT 36 /* colored text */ -#define TEX_DATA 37 /* surface texture data */ -#define MIX_FUNC 38 /* mixing function */ -#define MIX_DATA 39 /* mixing data */ -#define MIX_TEXT 40 /* mixing text */ -#define MAT_DIRECT1 41 /* unidirecting material */ -#define MAT_DIRECT2 42 /* bidirecting material */ +#define OBJ_MESH 10 /* mesh instance */ +#define MOD_ALIAS 11 /* modifier alias */ +#define MAT_PLASTIC 12 /* plastic surface */ +#define MAT_METAL 13 /* metal surface */ +#define MAT_GLASS 14 /* thin glass surface */ +#define MAT_TRANS 15 /* translucent material */ +#define MAT_DIELECTRIC 16 /* dielectric material */ +#define MAT_PLASTIC2 17 /* anisotropic plastic */ +#define MAT_METAL2 18 /* anisotropic metal */ +#define MAT_TRANS2 19 /* anisotropic translucent material */ +#define MAT_INTERFACE 20 /* dielectric interface */ +#define MAT_PFUNC 21 /* plastic brdf function */ +#define MAT_MFUNC 22 /* metal brdf function */ +#define PAT_BFUNC 23 /* brightness function */ +#define PAT_BDATA 24 /* brightness data */ +#define PAT_BTEXT 25 /* monochromatic text */ +#define PAT_CPICT 26 /* color picture */ +#define MAT_GLOW 27 /* proximity light source */ +#define OBJ_SOURCE 28 /* distant source */ +#define MAT_LIGHT 29 /* primary light source */ +#define MAT_ILLUM 30 /* secondary light source */ +#define MAT_SPOT 31 /* spot light source */ +#define MAT_MIST 32 /* mist medium */ +#define MAT_MIRROR 33 /* mirror (secondary source) */ +#define MAT_TFUNC 34 /* trans brdf function */ +#define MAT_BRTDF 35 /* brtd function */ +#define MAT_PDATA 36 /* plastic brdf data */ +#define MAT_MDATA 37 /* metal brdf data */ +#define MAT_TDATA 38 /* trans brdf data */ +#define PAT_CFUNC 39 /* color function */ +#define MAT_CLIP 40 /* clipping surface */ +#define PAT_CDATA 41 /* color data */ +#define PAT_CTEXT 42 /* colored text */ +#define TEX_DATA 43 /* surface texture data */ +#define MIX_FUNC 44 /* mixing function */ +#define MIX_DATA 45 /* mixing data */ +#define MIX_TEXT 46 /* mixing text */ +#define MIX_PICT 47 /* mixing picture */ +#define MAT_DIRECT1 48 /* unidirecting material */ +#define MAT_DIRECT2 49 /* bidirecting material */ /* number of object types */ -#define NUMOTYPE 43 +#define NUMOTYPE 50 /* type flags */ #define T_S 01 /* surface (object) */ #define T_M 02 /* material */ @@ -81,16 +98,21 @@ extern FUN ofun[]; /* our type list */ #define issurface(t) (ofun[t].flags & T_S) #define isvolume(t) (ofun[t].flags & T_V) -#define ismodifier(t) (!issurface(t)) +#define ismodifier(t) (!(ofun[t].flags & (T_S|T_V))) #define ismaterial(t) (ofun[t].flags & T_M) -#define istexture(t) (ofun[t].flags & (T_P|T_T|T_X)) +#define ispattern(t) (ofun[t].flags & T_P) +#define istexture(t) (ofun[t].flags & T_T) +#define ismixture(t) (ofun[t].flags & T_X) #define islight(t) (ofun[t].flags & T_L) #define isvlight(t) (ofun[t].flags & T_LV) #define hasdata(t) (ofun[t].flags & (T_D|T_I)) #define hasfunc(t) (ofun[t].flags & (T_F|T_D|T_I)) #define hastext(t) (ofun[t].flags & T_E) +#define isflat(t) ((t)==OBJ_FACE || (t)==OBJ_RING) -extern int o_default(); +#define ALIASKEY "alias" /* alias keyword */ +#define ALIASMOD "inherit" /* inherit target modifier */ + /* type list initialization */ #define INIT_OTYPE { { "polygon", T_S, o_default }, \ { "cone", T_S, o_default }, \ @@ -98,15 +120,20 @@ extern int o_default(); { "texfunc", T_T|T_F, o_default }, \ { "ring", T_S, o_default }, \ { "cylinder", T_S, o_default }, \ - { "instance", T_S|T_V, o_default }, \ + { "instance", T_V, o_default }, \ { "cup", T_S, o_default }, \ { "bubble", T_S, o_default }, \ { "tube", T_S, o_default }, \ + { "mesh", T_V, o_default }, \ + { ALIASKEY, 0, o_default }, \ { "plastic", T_M, o_default }, \ { "metal", T_M, o_default }, \ { "glass", T_M, o_default }, \ { "trans", T_M, o_default }, \ { "dielectric", T_M, o_default }, \ + { "plastic2", T_M|T_F, o_default }, \ + { "metal2", T_M|T_F, o_default }, \ + { "trans2", T_M|T_F, o_default }, \ { "interface", T_M, o_default }, \ { "plasfunc", T_M|T_F, o_default }, \ { "metfunc", T_M|T_F, o_default }, \ @@ -119,6 +146,7 @@ extern int o_default(); { "light", T_M|T_L, o_default }, \ { "illum", T_M|T_L, o_default }, \ { "spotlight", T_M|T_L, o_default }, \ + { "mist", T_M, o_default }, \ { "mirror", T_M|T_LV, o_default }, \ { "transfunc", T_M|T_F, o_default }, \ { "BRTDfunc", T_M|T_F, o_default }, \ @@ -133,8 +161,13 @@ extern int o_default(); { "mixfunc", T_X|T_F, o_default }, \ { "mixdata", T_X|T_D, o_default }, \ { "mixtext", T_X|T_E, o_default }, \ + { "mixpict", T_X|T_I, o_default }, \ { "prism1", T_M|T_F|T_LV, o_default }, \ { "prism2", T_M|T_F|T_LV, o_default }, \ } -#define ALIASID "alias" /* alias type identifier */ + +#ifdef __cplusplus +} +#endif +#endif /* _RAD_OTYPES_H_ */