--- ray/src/rt/initotypes.c 1990/12/13 10:44:17 1.1 +++ ray/src/rt/initotypes.c 1993/05/27 15:27:59 2.3 @@ -1,4 +1,4 @@ -/* Copyright (c) 1990 Regents of the University of California */ +/* Copyright (c) 1992 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -12,16 +12,22 @@ static char SCCSid[] = "$SunId$ LBL"; #include "otypes.h" +#include "otspecial.h" + extern int o_sphere(); extern int o_face(); extern int o_cone(); extern int o_instance(); extern int m_light(); extern int m_normal(); +extern int m_aniso(); extern int m_dielectric(); extern int m_glass(); extern int m_clip(); +extern int m_mirror(); +extern int m_direct(); extern int m_brdf(); +extern int m_brdf2(); extern int t_func(), t_data(); extern int p_cfunc(), p_bfunc(); extern int p_pdata(), p_cdata(), p_bdata(); @@ -49,14 +55,28 @@ initotypes() /* initialize ofun array */ ofun[MAT_PLASTIC].funp = ofun[MAT_METAL].funp = ofun[MAT_TRANS].funp = m_normal; + ofun[MAT_TRANS].flags |= T_IRR_IGN; + ofun[MAT_PLASTIC2].funp = + ofun[MAT_METAL2].funp = + ofun[MAT_TRANS2].funp = m_aniso; + ofun[MAT_TRANS2].flags |= T_IRR_IGN; ofun[MAT_DIELECTRIC].funp = ofun[MAT_INTERFACE].funp = m_dielectric; + ofun[MAT_DIELECTRIC].flags |= T_IRR_IGN; + ofun[MAT_INTERFACE].flags |= T_IRR_IGN; ofun[MAT_GLASS].funp = m_glass; + ofun[MAT_GLASS].flags |= T_IRR_IGN; + ofun[MAT_MIRROR].funp = m_mirror; + ofun[MAT_DIRECT1].funp = + ofun[MAT_DIRECT2].funp = m_direct; ofun[MAT_CLIP].funp = m_clip; + ofun[MAT_BRTDF].funp = m_brdf; ofun[MAT_PFUNC].funp = ofun[MAT_MFUNC].funp = ofun[MAT_PDATA].funp = - ofun[MAT_MDATA].funp = m_brdf; + ofun[MAT_MDATA].funp = + ofun[MAT_TFUNC].funp = + ofun[MAT_TDATA].funp = m_brdf2; ofun[TEX_FUNC].funp = t_func; ofun[TEX_DATA].funp = t_data; ofun[PAT_CFUNC].funp = p_cfunc;