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 */ |
65 |
> |
#define MAT_ABSDF 37 /* aperture BSDF data file */ |
66 |
> |
#define MAT_PDATA 38 /* plastic brdf data */ |
67 |
> |
#define MAT_MDATA 39 /* metal brdf data */ |
68 |
> |
#define MAT_TDATA 40 /* trans brdf data */ |
69 |
> |
#define PAT_CFUNC 41 /* color function */ |
70 |
> |
#define MAT_CLIP 42 /* clipping surface */ |
71 |
> |
#define PAT_CDATA 43 /* color data */ |
72 |
> |
#define PAT_CTEXT 44 /* colored text */ |
73 |
> |
#define TEX_DATA 45 /* surface texture data */ |
74 |
> |
#define MIX_FUNC 46 /* mixing function */ |
75 |
> |
#define MIX_DATA 47 /* mixing data */ |
76 |
> |
#define MIX_TEXT 48 /* mixing text */ |
77 |
> |
#define MIX_PICT 49 /* mixing picture */ |
78 |
> |
#define MAT_DIRECT1 50 /* unidirecting material */ |
79 |
> |
#define MAT_DIRECT2 51 /* bidirecting material */ |
80 |
> |
#define MAT_ASHIKHMIN 52 /* Ashikhmin-Shirley BRDF material */ |
81 |
> |
#define PAT_SPECTRUM 53 /* constant spectrum */ |
82 |
> |
#define PAT_SPECFILE 54 /* spectrum file */ |
83 |
> |
#define PAT_SPECFUNC 55 /* spectral function */ |
84 |
> |
#define PAT_SPECDATA 56 /* spectral data file */ |
85 |
> |
#define PAT_SPECPICT 57 /* hyperspectral picture */ |
86 |
|
/* number of object types */ |
87 |
< |
#define NUMOTYPE 52 |
87 |
> |
#define NUMOTYPE 58 |
88 |
|
/* type flags */ |
89 |
|
#define T_S 01 /* surface (object) */ |
90 |
|
#define T_M 02 /* material */ |
115 |
|
#define islight(t) (ofun[t].flags & T_L) |
116 |
|
#define isvlight(t) (ofun[t].flags & T_LV) |
117 |
|
#define hasdata(t) (ofun[t].flags & (T_D|T_I)) |
118 |
< |
#define hasfunc(t) (ofun[t].flags & (T_F|T_D|T_I)) |
118 |
> |
#define hasfunc(t) (ofun[t].flags & T_F) |
119 |
|
#define hastext(t) (ofun[t].flags & T_E) |
120 |
< |
#define isflat(t) ((t)==OBJ_FACE || (t)==OBJ_RING) |
120 |
> |
#define isflat(t) (((t)==OBJ_FACE) | ((t)==OBJ_RING)) |
121 |
|
|
122 |
|
#define ALIASKEY "alias" /* alias keyword */ |
123 |
|
#define ALIASMOD "inherit" /* inherit target modifier */ |
147 |
|
{ "plasfunc", T_M|T_F, o_default }, \ |
148 |
|
{ "metfunc", T_M|T_F, o_default }, \ |
149 |
|
{ "brightfunc", T_P|T_F, o_default }, \ |
150 |
< |
{ "brightdata", T_P|T_D, o_default }, \ |
150 |
> |
{ "brightdata", T_P|T_D|T_F, o_default }, \ |
151 |
|
{ "brighttext", T_P|T_E, o_default }, \ |
152 |
|
{ "colorpict", T_P|T_I, o_default }, \ |
153 |
|
{ "glow", T_M|T_L, o_default }, \ |
159 |
|
{ "mirror", T_M|T_LV, o_default }, \ |
160 |
|
{ "transfunc", T_M|T_F, o_default }, \ |
161 |
|
{ "BRTDfunc", T_M|T_F, o_default }, \ |
162 |
< |
{ "BSDF", T_M|T_D, o_default }, \ |
163 |
< |
{ "plasdata", T_M|T_D, o_default }, \ |
164 |
< |
{ "metdata", T_M|T_D, o_default }, \ |
165 |
< |
{ "transdata", T_M|T_D, o_default }, \ |
162 |
> |
{ "BSDF", T_M|T_D|T_F, o_default }, \ |
163 |
> |
{ "aBSDF", T_M|T_D|T_F, o_default }, \ |
164 |
> |
{ "plasdata", T_M|T_D|T_F, o_default }, \ |
165 |
> |
{ "metdata", T_M|T_D|T_F, o_default }, \ |
166 |
> |
{ "transdata", T_M|T_D|T_F, o_default }, \ |
167 |
|
{ "colorfunc", T_P|T_F, o_default }, \ |
168 |
|
{ "antimatter", T_M, o_default }, \ |
169 |
< |
{ "colordata", T_P|T_D, o_default }, \ |
169 |
> |
{ "colordata", T_P|T_D|T_F, o_default }, \ |
170 |
|
{ "colortext", T_P|T_E, o_default }, \ |
171 |
< |
{ "texdata", T_T|T_D, o_default }, \ |
171 |
> |
{ "texdata", T_T|T_D|T_F, o_default }, \ |
172 |
|
{ "mixfunc", T_X|T_F, o_default }, \ |
173 |
< |
{ "mixdata", T_X|T_D, o_default }, \ |
173 |
> |
{ "mixdata", T_X|T_D|T_F, o_default }, \ |
174 |
|
{ "mixtext", T_X|T_E, o_default }, \ |
175 |
|
{ "mixpict", T_X|T_I, o_default }, \ |
176 |
|
{ "prism1", T_M|T_F|T_LV, o_default }, \ |
177 |
|
{ "prism2", T_M|T_F|T_LV, o_default }, \ |
178 |
|
{ "ashik2", T_M|T_F, o_default }, \ |
179 |
+ |
{ "spectrum", T_P, o_default }, \ |
180 |
+ |
{ "specfile", T_P|T_D, o_default }, \ |
181 |
+ |
{ "specfunc", T_P|T_F, o_default }, \ |
182 |
+ |
{ "specdata", T_P|T_D|T_F, o_default }, \ |
183 |
+ |
{ "specpict", T_P|T_I|T_F, o_default }, \ |
184 |
|
} |
185 |
|
|
186 |
|
|