--- ray/src/rt/t_func.c	1989/10/05 07:23:20	1.7
+++ ray/src/rt/t_func.c	2003/02/22 02:07:29	2.4
@@ -1,17 +1,71 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: t_func.c,v 2.4 2003/02/22 02:07:29 greg Exp $";
 #endif
-
 /*
  *  t_func.c - routine for procedural textures.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     4/8/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/>.
  */
 
 #include  "ray.h"
 
+#include  "func.h"
+
 /*
  *	A procedural texture perturbs the surface normal
  *  at the point of intersection with an object.  It has
@@ -28,63 +82,36 @@ static char SCCSid[] = "$SunId$ LBL";
  *  from the original coordinates to the current coordinates.
  */
 
-typedef struct {
-	struct {
-		double  sca;		/* scale factor */
-		double  xfm[4][4];	/* transformation matrix */
-	}  fore, back;
-}  XFORM;
 
-
 t_func(m, r)			/* compute texture for ray */
 register OBJREC  *m;
 register RAY  *r;
 {
-	extern double  varvalue();
-	extern int  errno;
 	FVECT  disp;
 	double  d;
-	register XFORM  *mxf;
+	register MFUNC  *mf;
 	register int  i;
-	register char  **sa;
 
 	if (m->oargs.nsargs < 4)
 		objerror(m, USER, "bad # arguments");
-	sa = m->oargs.sarg;
-
-	if ((mxf = (XFORM *)m->os) == NULL) {
-		mxf = (XFORM *)malloc(sizeof(XFORM));
-		if (mxf == NULL)
-			goto memerr;
-		if (xf(mxf->fore.xfm, &mxf->fore.sca,
-			m->oargs.nsargs-4, sa+4) != m->oargs.nsargs-4)
-			objerror(m, USER, "bad transform");
-		if (mxf->fore.sca < 0.0)
-			mxf->fore.sca = -mxf->fore.sca;
-		invxf(mxf->back.xfm, &mxf->back.sca,
-				m->oargs.nsargs-4, sa+4);
-		if (mxf->back.sca < 0.0)
-			mxf->back.sca = -mxf->back.sca;
-		m->os = (char *)mxf;
-	}
-
-	setmap(m, r, mxf->back.xfm, mxf->back.sca);
-
-	if (!vardefined(sa[0]))
-		loadfunc(sa[3]);
+	mf = getfunc(m, 3, 0x7, 1);
+	setfunc(m, r);
 	errno = 0;
-	for (i = 0; i < 3; i++)
-		disp[i] = varvalue(sa[i]);
-	if (errno) {
-		objerror(m, WARNING, "compute error");
-		return;
+	for (i = 0; i < 3; i++) {
+		disp[i] = evalue(mf->ep[i]);
+		if (errno) {
+			objerror(m, WARNING, "compute error");
+			return(0);
+		}
 	}
-	multv3(disp, disp, mxf->fore.xfm);
-	multv3(disp, disp, r->rofx);
-	d = 1.0 / (mxf->fore.sca * r->rofs);
+	if (mf->f != &unitxf)
+		multv3(disp, disp, mf->f->xfm);
+	if (r->rox != NULL) {
+		multv3(disp, disp, r->rox->f.xfm);
+		d = 1.0 / (mf->f->sca * r->rox->f.sca);
+	} else
+		d = 1.0 / mf->f->sca;
 	for (i = 0; i < 3; i++)
 		r->pert[i] += disp[i] * d;
-	return;
-memerr:
-	error(SYSTEM, "out of memory in t_func");
+	return(0);
 }