--- ray/src/common/otypes.h	1995/09/15 14:55:08	2.5
+++ ray/src/common/otypes.h	2003/02/22 02:07:22	2.8
@@ -1,11 +1,63 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid: $Id: otypes.h,v 2.8 2003/02/22 02:07:22 greg Exp $ */
 /*
  *  otypes.h - defines for object types.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     1/28/86
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
  */
 
 typedef struct {
@@ -44,24 +96,26 @@ typedef struct {
 #define  MAT_LIGHT	27		/* primary light source */
 #define  MAT_ILLUM	28		/* secondary light source */
 #define  MAT_SPOT	29		/* spot light source */
-#define  MAT_MIRROR	30		/* mirror (secondary source) */
-#define  MAT_TFUNC	31		/* trans brdf function */
-#define  MAT_BRTDF	32		/* brtd function */
-#define  MAT_PDATA	33		/* plastic brdf data */
-#define  MAT_MDATA	34		/* metal brdf data */
-#define  MAT_TDATA	35		/* trans brdf data */
-#define  PAT_CFUNC	36		/* color function */
-#define  MAT_CLIP	37		/* clipping surface */
-#define  PAT_CDATA	38		/* color data */
-#define  PAT_CTEXT	39		/* colored text */
-#define  TEX_DATA	40		/* surface texture data */
-#define  MIX_FUNC	41		/* mixing function */
-#define  MIX_DATA	42		/* mixing data */
-#define  MIX_TEXT	43		/* mixing text */
-#define  MAT_DIRECT1	44		/* unidirecting material */
-#define  MAT_DIRECT2	45		/* bidirecting material */
+#define  MAT_MIST	30		/* mist medium */
+#define  MAT_MIRROR	31		/* mirror (secondary source) */
+#define  MAT_TFUNC	32		/* trans brdf function */
+#define  MAT_BRTDF	33		/* brtd function */
+#define  MAT_PDATA	34		/* plastic brdf data */
+#define  MAT_MDATA	35		/* metal brdf data */
+#define  MAT_TDATA	36		/* trans brdf data */
+#define  PAT_CFUNC	37		/* color function */
+#define  MAT_CLIP	38		/* clipping surface */
+#define  PAT_CDATA	39		/* color data */
+#define  PAT_CTEXT	40		/* colored text */
+#define  TEX_DATA	41		/* surface texture data */
+#define  MIX_FUNC	42		/* mixing function */
+#define  MIX_DATA	43		/* mixing data */
+#define  MIX_TEXT	44		/* mixing text */
+#define  MIX_PICT	45		/* mixing picture */
+#define  MAT_DIRECT1	46		/* unidirecting material */
+#define  MAT_DIRECT2	47		/* bidirecting material */
 				/* number of object types */
-#define  NUMOTYPE	46
+#define  NUMOTYPE	48
 				/* type flags */
 #define  T_S		01		/* surface (object) */
 #define  T_M		02		/* material */
@@ -125,6 +179,7 @@ extern int  o_default();
 				{ "light",	T_M|T_L,	o_default }, \
 				{ "illum",	T_M|T_L,	o_default }, \
 				{ "spotlight",	T_M|T_L,	o_default }, \
+				{ "mist",	T_M,		o_default }, \
 				{ "mirror",	T_M|T_LV,	o_default }, \
 				{ "transfunc",	T_M|T_F,	o_default }, \
 				{ "BRTDfunc",	T_M|T_F,	o_default }, \
@@ -139,6 +194,7 @@ extern int  o_default();
 				{ "mixfunc",	T_X|T_F,	o_default }, \
 				{ "mixdata",	T_X|T_D,	o_default }, \
 				{ "mixtext",	T_X|T_E,	o_default }, \
+				{ "mixpict",	T_X|T_I,	o_default }, \
 				{ "prism1",	T_M|T_F|T_LV,	o_default }, \
 				{ "prism2",	T_M|T_F|T_LV,	o_default }, \
 			}