--- ray/src/rt/t_func.c	1989/04/11 13:30:33	1.5
+++ ray/src/rt/t_func.c	2003/03/05 16:16:53	2.6
@@ -1,17 +1,16 @@
-/* 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.6 2003/03/05 16:16:53 greg Exp $";
 #endif
-
 /*
  *  t_func.c - routine for procedural textures.
- *
- *     4/8/86
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
+#include  "func.h"
+
 /*
  *	A procedural texture perturbs the surface normal
  *  at the point of intersection with an object.  It has
@@ -28,65 +27,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;
-	register XFORM  *mxf;
+	double  d;
+	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;
-		mxf->fore.sca = 1.0;
-		setident4(mxf->fore.xfm);
-		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;
-		mxf->back.sca = 1.0;
-		setident4(mxf->back.xfm);
-		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 == EDOM || errno == ERANGE) {
+			objerror(m, WARNING, "compute error");
+			return(0);
+		}
 	}
-	multv3(disp, disp, mxf->fore.xfm);
-	multv3(disp, disp, r->rofx);
+	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] / (mxf->fore.sca * r->rofs);
-	return;
-memerr:
-	error(SYSTEM, "out of memory in t_func");
+		r->pert[i] += disp[i] * d;
+	return(0);
 }