--- ray/src/rt/initotypes.c	1991/06/19 16:38:10	1.5
+++ ray/src/rt/initotypes.c	2004/03/30 16:13:01	2.12
@@ -1,40 +1,23 @@
-/* Copyright (c) 1990 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: initotypes.c,v 2.12 2004/03/30 16:13:01 schorsch Exp $";
 #endif
-
 /*
  * Initialize ofun[] list for renderers
  */
 
-#include  "standard.h"
+#include  "copyright.h"
 
+#include  "standard.h"
 #include  "otypes.h"
-
+#include  "rtotypes.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_dielectric();
-extern int  m_glass();
-extern int  m_clip();
-extern int  m_mirror();
-extern int  m_brdf();
-extern int  t_func(), t_data();
-extern int  p_cfunc(), p_bfunc();
-extern int  p_pdata(), p_cdata(), p_bdata();
-extern int  mx_func(), mx_data();
-extern int  text();
 
 FUN  ofun[NUMOTYPE] = INIT_OTYPE;
 
 
-initotypes()			/* initialize ofun array */
+extern void
+initotypes(void)			/* initialize ofun array */
 {
 	ofun[OBJ_SPHERE].funp =
 	ofun[OBJ_BUBBLE].funp = o_sphere;
@@ -45,29 +28,49 @@ initotypes()			/* initialize ofun array */
 	ofun[OBJ_TUBE].funp =
 	ofun[OBJ_RING].funp = o_cone;
 	ofun[OBJ_INSTANCE].funp = o_instance;
+	ofun[OBJ_MESH].funp = o_mesh;
+	ofun[MOD_ALIAS].funp = m_alias;
 	ofun[MAT_LIGHT].funp =
 	ofun[MAT_ILLUM].funp =
 	ofun[MAT_GLOW].funp =
 	ofun[MAT_SPOT].funp = m_light;
+	ofun[MAT_LIGHT].flags |= T_OPAQUE;
+	ofun[MAT_SPOT].flags |= T_OPAQUE;
 	ofun[MAT_PLASTIC].funp =
 	ofun[MAT_METAL].funp =
 	ofun[MAT_TRANS].funp = m_normal;
+	ofun[MAT_PLASTIC].flags |= T_OPAQUE;
+	ofun[MAT_METAL].flags |= T_OPAQUE;
 	ofun[MAT_TRANS].flags |= T_IRR_IGN;
+	ofun[MAT_PLASTIC2].funp =
+	ofun[MAT_METAL2].funp =
+	ofun[MAT_TRANS2].funp = m_aniso;
+	ofun[MAT_PLASTIC2].flags |= T_OPAQUE;
+	ofun[MAT_METAL2].flags |= T_OPAQUE;
+	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_MIST].funp = m_mist;
+	ofun[MAT_MIST].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 = 
 	ofun[MAT_TFUNC].funp =
-	ofun[MAT_BRTDF].funp = 
-	ofun[MAT_TDATA].funp = m_brdf;
+	ofun[MAT_TDATA].funp = m_brdf2;
+	ofun[MAT_PFUNC].flags |= T_OPAQUE;
+	ofun[MAT_MFUNC].flags |= T_OPAQUE;
+	ofun[MAT_PDATA].flags |= T_OPAQUE;
+	ofun[MAT_MDATA].flags |= T_OPAQUE;
 	ofun[TEX_FUNC].funp = t_func;
 	ofun[TEX_DATA].funp = t_data;
 	ofun[PAT_CFUNC].funp = p_cfunc;
@@ -77,13 +80,17 @@ initotypes()			/* initialize ofun array */
 	ofun[PAT_BDATA].funp = p_bdata;
 	ofun[PAT_CTEXT].funp =
 	ofun[PAT_BTEXT].funp =
-	ofun[MIX_TEXT].funp = text;
+	ofun[MIX_TEXT].funp = do_text;
 	ofun[MIX_FUNC].funp = mx_func;
 	ofun[MIX_DATA].funp = mx_data;
+	ofun[MIX_PICT].funp = mx_pdata;
 }
 
 
-o_default()			/* default action is error */
+extern int
+o_default(OBJREC *o, RAY *r)			/* default action is error */
 {
 	error(INTERNAL, "unexpected object call");
+				/* call to pull in freeobjmem.o */ /* XXX ? */
+	free_objs(0, 0);
 }