--- ray/src/common/otypes.h	1989/06/07 08:40:24	1.3
+++ ray/src/common/otypes.h	1990/12/13 08:58:30	1.6
@@ -30,15 +30,20 @@ typedef struct {
 #define  MAT_MIN	(OBJ_MIN+OBJ_CNT)
 #define  MAT_LIGHT	(MAT_MIN+0)	/* primary light source */
 #define  MAT_ILLUM	(MAT_MIN+1)	/* secondary light source */
-#define  MAT_GLOW	(MAT_MIN+2)	/* emmissive non-source */
-#define  MAT_PLASTIC	(MAT_MIN+3)	/* plastic surface */
-#define  MAT_METAL	(MAT_MIN+4)	/* metal surface */
-#define  MAT_TRANS	(MAT_MIN+5)	/* translucent material */
-#define  MAT_DIELECTRIC	(MAT_MIN+6)	/* dielectric material */
-#define  MAT_INTERFACE	(MAT_MIN+7)	/* dielectric interface */
-#define  MAT_GLASS	(MAT_MIN+8)	/* thin glass surface */
-#define  MAT_CLIP	(MAT_MIN+9)	/* clipping surface */
-#define  MAT_CNT	10
+#define  MAT_GLOW	(MAT_MIN+2)	/* proximity light source */
+#define  MAT_SPOT	(MAT_MIN+3)	/* spot light source */
+#define  MAT_PLASTIC	(MAT_MIN+4)	/* plastic surface */
+#define  MAT_METAL	(MAT_MIN+5)	/* metal surface */
+#define  MAT_TRANS	(MAT_MIN+6)	/* translucent material */
+#define  MAT_DIELECTRIC	(MAT_MIN+7)	/* dielectric material */
+#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_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 */
@@ -59,6 +64,7 @@ typedef struct {
 #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,6 +79,7 @@ extern int  m_normal();
 extern int  m_dielectric();
 extern int  m_glass();
 extern int  m_clip();
+extern int  m_brdf();
 extern int  t_func(), t_data();
 extern int  p_cfunc(), p_bfunc();
 extern int  p_pdata(), p_cdata(), p_bdata();
@@ -92,6 +99,7 @@ extern int  text();
 			{ "light", m_light }, \
 			{ "illum", m_light }, \
 			{ "glow", m_light }, \
+			{ "spotlight", m_light }, \
 			{ "plastic", m_normal }, \
 			{ "metal", m_normal }, \
 			{ "trans", m_normal }, \
@@ -99,6 +107,10 @@ 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 }, \