--- ray/src/rt/mx_func.c	1991/08/08 11:29:54	1.2
+++ ray/src/rt/mx_func.c	2003/02/22 02:07:28	2.5
@@ -1,17 +1,71 @@
-/* Copyright (c) 1988 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: mx_func.c,v 2.5 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  mx_func.c - routine for mixture functions.
+ */
+
+/* ====================================================================
+ * 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"
 
+#include  "func.h"
+
 /*
  *	A mixture function is specified:
  *
@@ -31,32 +85,35 @@ mx_func(m, r)			/* compute mixture function */
 register OBJREC  *m;
 RAY  *r;
 {
-	extern double  varvalue();
-	extern int  errno;
+	OBJECT	obj;
 	register int  i;
 	double  coef;
 	OBJECT  mod[2];
-	register char  **sa;
+	register MFUNC  *mf;
 
-	setfunc(m, r);
-
-	sa = m->oargs.sarg;
-
 	if (m->oargs.nsargs < 4)
 		objerror(m, USER, "bad # arguments");
+	obj = objndx(m);
 	for (i = 0; i < 2; i++)
-		if (!strcmp(sa[i], VOIDID))
+		if (!strcmp(m->oargs.sarg[i], VOIDID))
 			mod[i] = OVOID;
-		else if ((mod[i] = modifier(sa[i])) == OVOID) {
-			sprintf(errmsg, "undefined modifier \"%s\"", sa[i]);
+		else if ((mod[i] = lastmod(obj, m->oargs.sarg[i])) == OVOID) {
+			sprintf(errmsg, "undefined modifier \"%s\"",
+					m->oargs.sarg[i]);
 			objerror(m, USER, errmsg);
 		}
-	funcfile(sa[3]);
+	mf = getfunc(m, 3, 0x4, 0);
+	setfunc(m, r);
 	errno = 0;
-	coef = varvalue(sa[2]);
+	coef = evalue(mf->ep[0]);
 	if (errno) {
 		objerror(m, WARNING, "compute error");
-		return;
+		return(0);
 	}
-	raymixture(r, mod[0], mod[1], coef);
+	if (raymixture(r, mod[0], mod[1], coef)) {
+		if (m->omod != OVOID)
+			objerror(m, USER, "inappropriate modifier");
+		return(1);
+	}
+	return(0);
 }