--- ray/src/rt/mx_data.c	1998/08/10 18:35:14	2.4
+++ ray/src/rt/mx_data.c	2003/02/22 02:07:28	2.6
@@ -1,13 +1,65 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: mx_data.c,v 2.6 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  mx_data.c - routine for stored mixtures.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     11/2/88
+ * 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/>.
  */
 
 #include  "ray.h"
@@ -17,19 +69,29 @@ static char SCCSid[] = "$SunId$ SGI";
 #include  "func.h"
 
 /*
- *	A stored mixture is specified:
+ *  A stored mixture is specified:
  *
  *	modifier mixdata name
  *	6+ foremod backmod func dfname vfname v0 v1 .. xf
  *	0
  *	n A1 A2 ..
  *
+ *  A picture mixture is specified as:
+ *
+ *	modifier mixpict name
+ *	7+ foremod backmod func pfname vfname vx vy xf
+ *	0
+ *	n A1 A2 ..
+ *
+ *
  *  Vfname is the name of the file where the variable definitions
  *  can be found.  The list of real arguments can be accessed by
  *  definitions in the file.  Dfname is the data file.
+ *  (Pfname is a picture file.)
  *  The dimensions of the data files and the number
  *  of variables must match.  The func is a single argument
- *  function which returns the corrected data value given the
+ *  function in the case of mixdata (three argument in the case
+ *  of mixpict), which returns the corrected data value given the
  *  interpolated value from the file.  The xf is a transformation
  *  to get from the original coordinates to the current coordinates.
  */
@@ -71,6 +133,55 @@ RAY  *r;
 	coef = datavalue(dp, pt);
 	errno = 0;
 	coef = funvalue(m->oargs.sarg[2], 1, &coef);
+	if (errno)
+		goto computerr;
+	if (raymixture(r, mod[0], mod[1], coef)) {
+		if (m->omod != OVOID)
+			objerror(m, USER, "inappropriate modifier");
+		return(1);
+	}
+	return(0);
+computerr:
+	objerror(m, WARNING, "compute error");
+	return(0);
+}
+
+
+mx_pdata(m, r)			/* interpolate mixture picture */
+register OBJREC  *m;
+RAY  *r;
+{
+	OBJECT	obj;
+	double	col[3], coef;
+	double  pt[MAXDIM];
+	DATARRAY  *dp;
+	OBJECT  mod[2];
+	register MFUNC  *mf;
+	register int  i;
+
+	if (m->oargs.nsargs < 7)
+		objerror(m, USER, "bad # arguments");
+	obj = objndx(m);
+	for (i = 0; i < 2; i++)
+		if (!strcmp(m->oargs.sarg[i], VOIDID))
+			mod[i] = OVOID;
+		else if ((mod[i] = lastmod(obj, m->oargs.sarg[i])) == OVOID) {
+			sprintf(errmsg, "undefined modifier \"%s\"",
+					m->oargs.sarg[i]);
+			objerror(m, USER, errmsg);
+		}
+	dp = getpict(m->oargs.sarg[3]);
+	mf = getfunc(m, 4, 0x3<<5, 0);
+	setfunc(m, r);
+	errno = 0;
+	pt[1] = evalue(mf->ep[0]);	/* y major ordering */
+	pt[0] = evalue(mf->ep[1]);
+	if (errno)
+		goto computerr;
+	for (i = 0; i < 3; i++)		/* get pixel from picture */
+		col[i] = datavalue(dp+i, pt);
+	errno = 0;			/* evaluate function on pixel */
+	coef = funvalue(m->oargs.sarg[2], 3, col);
 	if (errno)
 		goto computerr;
 	if (raymixture(r, mod[0], mod[1], coef)) {