--- ray/src/common/otypes.h	1989/02/02 10:34:19	1.1
+++ ray/src/common/otypes.h	1990/12/13 08:58:30	1.6
@@ -39,26 +39,32 @@ typedef struct {
 #define  MAT_INTERFACE	(MAT_MIN+8)	/* dielectric interface */
 #define  MAT_GLASS	(MAT_MIN+9)	/* thin glass surface */
 #define  MAT_CLIP	(MAT_MIN+10)	/* clipping surface */
-#define  MAT_CNT	11
+#define  MAT_PFUNC	(MAT_MIN+11)	/* plastic brdf function */
+#define  MAT_MFUNC	(MAT_MIN+12)	/* metal brdf function */
+#define  MAT_PDATA	(MAT_MIN+13)	/* plastic brdf data */
+#define  MAT_MDATA	(MAT_MIN+14)	/* metal brdf data */
+#define  MAT_CNT	15
 				/* textures and patterns */
 #define  TP_MIN		(MAT_MIN+MAT_CNT)
 #define  TEX_FUNC	(TP_MIN+0)	/* surface texture function */
-#define  PAT_CFUNC	(TP_MIN+1)	/* color function */
-#define  PAT_BFUNC	(TP_MIN+2)	/* brightness function */
-#define  PAT_CPICT	(TP_MIN+3)	/* color picture */
-#define  PAT_CDATA	(TP_MIN+4)	/* color data */
-#define  PAT_BDATA	(TP_MIN+5)	/* brightness data */
-#define  PAT_CTEXT	(TP_MIN+6)	/* colored text */
-#define  PAT_BTEXT	(TP_MIN+7)	/* monochromatic text */
-#define  MIX_FUNC	(TP_MIN+8)	/* mixing function */
-#define  MIX_DATA	(TP_MIN+9)	/* mixing data */
-#define  MIX_TEXT	(TP_MIN+10)	/* mixing text */
-#define  TP_CNT		11
+#define  TEX_DATA	(TP_MIN+1)	/* surface texture data */
+#define  PAT_CFUNC	(TP_MIN+2)	/* color function */
+#define  PAT_BFUNC	(TP_MIN+3)	/* brightness function */
+#define  PAT_CPICT	(TP_MIN+4)	/* color picture */
+#define  PAT_CDATA	(TP_MIN+5)	/* color data */
+#define  PAT_BDATA	(TP_MIN+6)	/* brightness data */
+#define  PAT_CTEXT	(TP_MIN+7)	/* colored text */
+#define  PAT_BTEXT	(TP_MIN+8)	/* monochromatic text */
+#define  MIX_FUNC	(TP_MIN+9)	/* mixing function */
+#define  MIX_DATA	(TP_MIN+10)	/* mixing data */
+#define  MIX_TEXT	(TP_MIN+11)	/* mixing text */
+#define  TP_CNT		12
 #define  MOD_CNT	(MAT_CNT+TP_CNT)
 				/* number of object types */
 #define  NUMOTYPE	(OBJ_CNT+MAT_CNT+TP_CNT)
 
 #define  issurface(t)	((t) >= OBJ_MIN && (t) < OBJ_MIN+OBJ_CNT)
+#define  isvolume(t)	((t) == OBJ_INSTANCE)
 #define  ismodifier(t)	((t) >= MOD_MIN && (t) < MOD_MIN+MOD_CNT)
 #define  ismaterial(t)	((t) >= MAT_MIN && (t) < MAT_MIN+MAT_CNT)
 #define  istexture(t)	((t) >= TP_MIN && (t) < TP_MIN+TP_CNT)
@@ -73,7 +79,8 @@ extern int  m_normal();
 extern int  m_dielectric();
 extern int  m_glass();
 extern int  m_clip();
-extern int  t_func();
+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();
@@ -100,7 +107,12 @@ extern int  text();
 			{ "interface", m_dielectric }, \
 			{ "glass", m_glass }, \
 			{ "antimatter", m_clip }, \
+			{ "plasfunc", m_brdf }, \
+			{ "metfunc", m_brdf }, \
+			{ "plasdata", m_brdf }, \
+			{ "metdata", m_brdf }, \
 			{ "texfunc", t_func }, \
+			{ "texdata", t_data }, \
 			{ "colorfunc", p_cfunc }, \
 			{ "brightfunc", p_bfunc }, \
 			{ "colorpict", p_pdata }, \