| 7 |
|
|
| 8 |
|
#include "copyright.h" |
| 9 |
|
|
| 10 |
< |
#include "standard.h" |
| 10 |
> |
#include "ray.h" |
| 11 |
|
#include "otypes.h" |
| 12 |
|
#include "rtotypes.h" |
| 13 |
|
#include "otspecial.h" |
| 16 |
|
FUN ofun[NUMOTYPE] = INIT_OTYPE; |
| 17 |
|
|
| 18 |
|
|
| 19 |
< |
extern void |
| 19 |
> |
void |
| 20 |
|
initotypes(void) /* initialize ofun array */ |
| 21 |
|
{ |
| 22 |
|
ofun[OBJ_SPHERE].funp = |
| 41 |
|
ofun[MAT_TRANS].funp = m_normal; |
| 42 |
|
ofun[MAT_PLASTIC].flags |= T_OPAQUE; |
| 43 |
|
ofun[MAT_METAL].flags |= T_OPAQUE; |
| 44 |
< |
ofun[MAT_TRANS].flags |= T_IRR_IGN; |
| 44 |
> |
ofun[MAT_TRANS].flags |= T_TRANSP; |
| 45 |
|
ofun[MAT_PLASTIC2].funp = |
| 46 |
|
ofun[MAT_METAL2].funp = |
| 47 |
|
ofun[MAT_TRANS2].funp = m_aniso; |
| 48 |
|
ofun[MAT_PLASTIC2].flags |= T_OPAQUE; |
| 49 |
|
ofun[MAT_METAL2].flags |= T_OPAQUE; |
| 50 |
< |
ofun[MAT_TRANS2].flags |= T_IRR_IGN; |
| 50 |
> |
ofun[MAT_TRANS2].flags |= T_TRANSP; |
| 51 |
> |
ofun[MAT_ASHIKHMIN].funp = m_ashikhmin; |
| 52 |
> |
ofun[MAT_ASHIKHMIN].flags |= T_OPAQUE; |
| 53 |
|
ofun[MAT_DIELECTRIC].funp = |
| 54 |
|
ofun[MAT_INTERFACE].funp = m_dielectric; |
| 55 |
< |
ofun[MAT_DIELECTRIC].flags |= T_IRR_IGN; |
| 56 |
< |
ofun[MAT_INTERFACE].flags |= T_IRR_IGN; |
| 55 |
> |
ofun[MAT_DIELECTRIC].flags |= T_TRANSP; |
| 56 |
> |
ofun[MAT_INTERFACE].flags |= T_TRANSP; |
| 57 |
|
ofun[MAT_MIST].funp = m_mist; |
| 58 |
< |
ofun[MAT_MIST].flags |= T_IRR_IGN; |
| 58 |
> |
ofun[MAT_MIST].flags |= T_TRANSP; |
| 59 |
|
ofun[MAT_GLASS].funp = m_glass; |
| 60 |
< |
ofun[MAT_GLASS].flags |= T_IRR_IGN; |
| 60 |
> |
ofun[MAT_GLASS].flags |= T_TRANSP; |
| 61 |
|
ofun[MAT_MIRROR].funp = m_mirror; |
| 62 |
|
ofun[MAT_DIRECT1].funp = |
| 63 |
|
ofun[MAT_DIRECT2].funp = m_direct; |
| 64 |
|
ofun[MAT_CLIP].funp = m_clip; |
| 65 |
|
ofun[MAT_BRTDF].funp = m_brdf; |
| 66 |
+ |
ofun[MAT_BSDF].funp = |
| 67 |
+ |
ofun[MAT_ABSDF].funp = m_bsdf; |
| 68 |
+ |
ofun[MAT_ABSDF].flags |= T_TRANSP; |
| 69 |
|
ofun[MAT_PFUNC].funp = |
| 70 |
|
ofun[MAT_MFUNC].funp = |
| 71 |
|
ofun[MAT_PDATA].funp = |
| 92 |
|
} |
| 93 |
|
|
| 94 |
|
|
| 95 |
< |
extern int |
| 95 |
> |
int |
| 96 |
|
o_default(OBJREC *o, RAY *r) /* default action is error */ |
| 97 |
|
{ |
| 98 |
|
objerror(o, CONSISTENCY, "unexpected object call"); |
| 99 |
< |
/* call to pull in freeobjmem.o */ /* XXX ? */ |
| 99 |
> |
/* unused call to load freeobjmem.o */ |
| 100 |
|
free_objs(0, 0); |
| 101 |
+ |
return(0); |
| 102 |
|
} |
