--- ray/src/rt/initotypes.c	1995/12/08 18:22:37	2.4
+++ ray/src/rt/initotypes.c	2003/12/31 01:50:02	2.11
@@ -1,13 +1,12 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: initotypes.c,v 2.11 2003/12/31 01:50:02 greg Exp $";
 #endif
-
 /*
  * Initialize ofun[] list for renderers
  */
 
+#include  "copyright.h"
+
 #include  "standard.h"
 
 #include  "otypes.h"
@@ -18,6 +17,7 @@ extern int  o_sphere();
 extern int  o_face();
 extern int  o_cone();
 extern int  o_instance();
+extern int  o_mesh();
 extern int  m_light();
 extern int  m_normal();
 extern int  m_aniso();
@@ -29,11 +29,12 @@ extern int  m_mirror();
 extern int  m_direct();
 extern int  m_brdf();
 extern int  m_brdf2();
+extern int  m_alias();
 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();
+extern int  mx_func(), mx_data(), mx_pdata();
+extern int  do_text();
 
 FUN  ofun[NUMOTYPE] = INIT_OTYPE;
 
@@ -49,17 +50,25 @@ 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;
@@ -80,6 +89,10 @@ initotypes()			/* initialize ofun array */
 	ofun[MAT_MDATA].funp = 
 	ofun[MAT_TFUNC].funp =
 	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;
@@ -89,13 +102,16 @@ 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 */
 {
 	error(INTERNAL, "unexpected object call");
+				/* call to pull in freeobjmem.o */
+	free_objs(0, 0);
 }