--- ray/src/common/otypes.h 1991/05/07 14:53:16 1.10 +++ ray/src/common/otypes.h 1994/01/12 15:55:08 2.4 @@ -1,4 +1,4 @@ -/* Copyright (c) 1986 Regents of the University of California */ +/* Copyright (c) 1992 Regents of the University of California */ /* SCCSid "$SunId$ LBL" */ @@ -26,36 +26,42 @@ typedef struct { #define OBJ_TUBE 9 /* inverted cylinder */ #define MAT_PLASTIC 10 /* plastic surface */ #define MAT_METAL 11 /* metal surface */ -#define OBJ_SOURCE 12 /* distant source */ -#define MAT_GLASS 13 /* thin glass surface */ -#define MAT_TRANS 14 /* translucent material */ -#define MAT_DIELECTRIC 15 /* dielectric material */ -#define MAT_INTERFACE 16 /* dielectric interface */ -#define MAT_PFUNC 17 /* plastic brdf function */ -#define MAT_MFUNC 18 /* metal brdf function */ -#define PAT_BFUNC 19 /* brightness function */ -#define PAT_BDATA 20 /* brightness data */ -#define PAT_BTEXT 21 /* monochromatic text */ -#define PAT_CPICT 22 /* color picture */ -#define MAT_LIGHT 23 /* primary light source */ -#define MAT_ILLUM 24 /* secondary light source */ +#define MAT_GLASS 12 /* thin glass surface */ +#define MAT_TRANS 13 /* translucent material */ +#define MAT_DIELECTRIC 14 /* dielectric material */ +#define MAT_PLASTIC2 15 /* anisotropic plastic */ +#define MAT_METAL2 16 /* anisotropic metal */ +#define MAT_TRANS2 17 /* anisotropic translucent material */ +#define MAT_INTERFACE 18 /* dielectric interface */ +#define MAT_PFUNC 19 /* plastic brdf function */ +#define MAT_MFUNC 20 /* metal brdf function */ +#define PAT_BFUNC 21 /* brightness function */ +#define PAT_BDATA 22 /* brightness data */ +#define PAT_BTEXT 23 /* monochromatic text */ +#define PAT_CPICT 24 /* color picture */ #define MAT_GLOW 25 /* proximity light source */ -#define MAT_SPOT 26 /* spot light source */ -#define MAT_TFUNC 27 /* trans brdf function */ -#define MAT_BRTDF 28 /* brtd function */ -#define MAT_PDATA 29 /* plastic brdf data */ -#define MAT_MDATA 30 /* metal brdf data */ -#define MAT_TDATA 31 /* trans brdf data */ -#define PAT_CFUNC 32 /* color function */ -#define MAT_CLIP 33 /* clipping surface */ -#define PAT_CDATA 34 /* color data */ -#define PAT_CTEXT 35 /* colored text */ -#define TEX_DATA 36 /* surface texture data */ -#define MIX_FUNC 37 /* mixing function */ -#define MIX_DATA 38 /* mixing data */ -#define MIX_TEXT 39 /* mixing text */ +#define OBJ_SOURCE 26 /* distant source */ +#define MAT_LIGHT 27 /* primary light source */ +#define MAT_ILLUM 28 /* secondary light source */ +#define MAT_SPOT 29 /* spot light source */ +#define MAT_MIRROR 30 /* mirror (secondary source) */ +#define MAT_TFUNC 31 /* trans brdf function */ +#define MAT_BRTDF 32 /* brtd function */ +#define MAT_PDATA 33 /* plastic brdf data */ +#define MAT_MDATA 34 /* metal brdf data */ +#define MAT_TDATA 35 /* trans brdf data */ +#define PAT_CFUNC 36 /* color function */ +#define MAT_CLIP 37 /* clipping surface */ +#define PAT_CDATA 38 /* color data */ +#define PAT_CTEXT 39 /* colored text */ +#define TEX_DATA 40 /* surface texture data */ +#define MIX_FUNC 41 /* mixing function */ +#define MIX_DATA 42 /* mixing data */ +#define MIX_TEXT 43 /* mixing text */ +#define MAT_DIRECT1 44 /* unidirecting material */ +#define MAT_DIRECT2 45 /* bidirecting material */ /* number of object types */ -#define NUMOTYPE 40 +#define NUMOTYPE 46 /* type flags */ #define T_S 01 /* surface (object) */ #define T_M 02 /* material */ @@ -64,10 +70,11 @@ typedef struct { #define T_X 020 /* mixture */ #define T_V 040 /* volume */ #define T_L 0100 /* light source modifier */ -#define T_F 0200 /* function */ -#define T_D 0400 /* data */ -#define T_I 01000 /* picture */ -#define T_E 02000 /* text */ +#define T_LV 0200 /* virtual light source modifier */ +#define T_F 0400 /* function */ +#define T_D 01000 /* data */ +#define T_I 02000 /* picture */ +#define T_E 04000 /* text */ /* user-defined types */ #define T_SP1 010000 #define T_SP2 020000 @@ -77,10 +84,10 @@ 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 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) @@ -93,16 +100,18 @@ 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 }, \ { "plastic", T_M, o_default }, \ { "metal", T_M, o_default }, \ - { "source", T_S, 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 }, \ @@ -110,10 +119,12 @@ extern int o_default(); { "brightdata", T_P|T_D, o_default }, \ { "brighttext", T_P|T_E, o_default }, \ { "colorpict", T_P|T_I, o_default }, \ + { "glow", T_M|T_L, o_default }, \ + { "source", T_S, o_default }, \ { "light", T_M|T_L, o_default }, \ { "illum", T_M|T_L, o_default }, \ - { "glow", T_M|T_L, o_default }, \ { "spotlight", T_M|T_L, o_default }, \ + { "mirror", T_M|T_LV, o_default }, \ { "transfunc", T_M|T_F, o_default }, \ { "BRTDfunc", T_M|T_F, o_default }, \ { "plasdata", T_M|T_D, o_default }, \ @@ -127,6 +138,8 @@ 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 }, \ + { "prism1", T_M|T_F|T_LV, o_default }, \ + { "prism2", T_M|T_F|T_LV, o_default }, \ } #define ALIASID "alias" /* alias type identifier */