21 |
|
#ifdef FUN_ARGLIST |
22 |
|
extern int o_default(FUN_ARGLIST); |
23 |
|
#else |
24 |
< |
extern int o_default(); |
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 */ |
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_PDATA 36 /* plastic brdf data */ |
65 |
< |
#define MAT_MDATA 37 /* metal brdf data */ |
66 |
< |
#define MAT_TDATA 38 /* trans brdf data */ |
67 |
< |
#define PAT_CFUNC 39 /* color function */ |
68 |
< |
#define MAT_CLIP 40 /* clipping surface */ |
69 |
< |
#define PAT_CDATA 41 /* color data */ |
70 |
< |
#define PAT_CTEXT 42 /* colored text */ |
71 |
< |
#define TEX_DATA 43 /* surface texture data */ |
72 |
< |
#define MIX_FUNC 44 /* mixing function */ |
73 |
< |
#define MIX_DATA 45 /* mixing data */ |
74 |
< |
#define MIX_TEXT 46 /* mixing text */ |
75 |
< |
#define MIX_PICT 47 /* mixing picture */ |
76 |
< |
#define MAT_DIRECT1 48 /* unidirecting material */ |
77 |
< |
#define MAT_DIRECT2 49 /* bidirecting material */ |
63 |
> |
#define MAT_BRTDF 35 /* BRTD function */ |
64 |
> |
#define MAT_BSDF 36 /* BSDF data file */ |
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 |
|
/* number of object types */ |
85 |
< |
#define NUMOTYPE 50 |
85 |
> |
#define NUMOTYPE 56 |
86 |
|
/* type flags */ |
87 |
|
#define T_S 01 /* surface (object) */ |
88 |
|
#define T_M 02 /* material */ |
113 |
|
#define islight(t) (ofun[t].flags & T_L) |
114 |
|
#define isvlight(t) (ofun[t].flags & T_LV) |
115 |
|
#define hasdata(t) (ofun[t].flags & (T_D|T_I)) |
116 |
< |
#define hasfunc(t) (ofun[t].flags & (T_F|T_D|T_I)) |
116 |
> |
#define hasfunc(t) (ofun[t].flags & (T_F|T_D|T_I) && (t)!=PAT_SPECFILE) |
117 |
|
#define hastext(t) (ofun[t].flags & T_E) |
118 |
< |
#define isflat(t) ((t)==OBJ_FACE || (t)==OBJ_RING) |
118 |
> |
#define isflat(t) (((t)==OBJ_FACE) | ((t)==OBJ_RING)) |
119 |
|
|
120 |
|
#define ALIASKEY "alias" /* alias keyword */ |
121 |
|
#define ALIASMOD "inherit" /* inherit target modifier */ |
157 |
|
{ "mirror", T_M|T_LV, o_default }, \ |
158 |
|
{ "transfunc", T_M|T_F, o_default }, \ |
159 |
|
{ "BRTDfunc", T_M|T_F, o_default }, \ |
160 |
+ |
{ "BSDF", T_M|T_D, o_default }, \ |
161 |
+ |
{ "aBSDF", T_M|T_D, o_default }, \ |
162 |
|
{ "plasdata", T_M|T_D, o_default }, \ |
163 |
|
{ "metdata", T_M|T_D, o_default }, \ |
164 |
|
{ "transdata", T_M|T_D, o_default }, \ |
173 |
|
{ "mixpict", T_X|T_I, o_default }, \ |
174 |
|
{ "prism1", T_M|T_F|T_LV, o_default }, \ |
175 |
|
{ "prism2", T_M|T_F|T_LV, o_default }, \ |
176 |
+ |
{ "ashik2", T_M|T_F, o_default }, \ |
177 |
+ |
{ "spectrum", T_P, o_default }, \ |
178 |
+ |
{ "specfile", T_P|T_D, o_default }, \ |
179 |
+ |
{ "specfunc", T_P|T_F, o_default }, \ |
180 |
|
} |
181 |
|
|
182 |
|
|