--- ray/src/rt/func.c	2003/02/25 02:47:22	2.15
+++ ray/src/rt/func.c	2004/02/12 18:55:50	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: func.c,v 2.15 2003/02/25 02:47:22 greg Exp $";
+static const char	RCSid[] = "$Id: func.c,v 2.21 2004/02/12 18:55:50 greg Exp $";
 #endif
 /*
  *  func.c - interface to calcomp functions.
@@ -9,6 +9,8 @@ static const char	RCSid[] = "$Id: func.c,v 2.15 2003/0
 
 #include  "ray.h"
 
+#include  "paths.h"
+
 #include  "otypes.h"
 
 #include  "func.h"
@@ -31,7 +33,7 @@ XF  funcxf;			/* current transformation */
 static OBJREC  *fobj = NULL;	/* current function object */
 static RAY  *fray = NULL;	/* current function ray */
 
-static double  l_erf(), l_erfc(), l_arg();
+static double  l_erf(char *), l_erfc(char *), l_arg(char *);
 
 
 MFUNC *
@@ -63,6 +65,7 @@ int  dofwd;
 		scompile("Ix=$16;Iy=$17;Iz=$18;", NULL, 0);
 		scompile("Jx=$19;Jy=$20;Jz=$21;", NULL, 0);
 		scompile("Kx=$22;Ky=$23;Kz=$24;", NULL, 0);
+		scompile("Lu=$26;Lv=$27;", NULL, 0);
 		funset("arg", 1, '=', l_arg);
 		funset("erf", 1, ':', l_erf);
 		funset("erfc", 1, ':', l_erfc);
@@ -184,9 +187,9 @@ register RAY  *r;
 			funcxf.sca = r->rox->b.sca * f->b->sca;
 			multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
 		} else
-			copystruct(&funcxf, &r->rox->b);
+			funcxf = r->rox->b;
 	else
-		copystruct(&funcxf, f->b);
+		funcxf = *(f->b);
 	lastrno = r->rno;
 	eclock++;		/* notify expression evaluator */
 	return(1);
@@ -199,7 +202,7 @@ char  *fname;
 {
 	char  *ffname;
 
-	if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
+	if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find function file \"%s\"", fname);
 		error(USER, errmsg);
 	}
@@ -208,7 +211,7 @@ char  *fname;
 
 
 static double
-l_arg()				/* return nth real argument */
+l_arg(char *nm)			/* return nth real argument */
 {
 	register int  n;
 
@@ -229,7 +232,7 @@ l_arg()				/* return nth real argument */
 
 
 static double
-l_erf()				/* error function */
+l_erf(char *nm)			/* error function */
 {
 	extern double  erf();
 
@@ -238,7 +241,7 @@ l_erf()				/* error function */
 
 
 static double
-l_erfc()			/* cumulative error function */
+l_erfc(char *nm)		/* cumulative error function */
 {
 	extern double  erfc();
 
@@ -256,21 +259,21 @@ register int  n;
 	if (--n < 0)
 		goto badchan;
 
-	if (n < 3)			/* ray direction */
+	if (n <= 2)			/* ray direction */
 
 		return( (	fray->rdir[0]*funcxf.xfm[0][n] +
 				fray->rdir[1]*funcxf.xfm[1][n] +
 				fray->rdir[2]*funcxf.xfm[2][n]	)
 			 / funcxf.sca );
 
-	if (n < 6)			/* surface normal */
+	if (n <= 5)			/* surface normal */
 
 		return( (	fray->ron[0]*funcxf.xfm[0][n-3] +
 				fray->ron[1]*funcxf.xfm[1][n-3] +
 				fray->ron[2]*funcxf.xfm[2][n-3]	)
 			 / funcxf.sca );
 
-	if (n < 9)			/* intersection */
+	if (n <= 8)			/* intersection */
 
 		return( fray->rop[0]*funcxf.xfm[0][n-6] +
 				fray->rop[1]*funcxf.xfm[1][n-6] +
@@ -288,20 +291,24 @@ register int  n;
 	if (n == 11)			/* scale */
 		return(funcxf.sca);
 
-	if (n < 15)			/* origin */
+	if (n <= 14)			/* origin */
 		return(funcxf.xfm[3][n-12]);
 
-	if (n < 18)			/* i unit vector */
+	if (n <= 17)			/* i unit vector */
 		return(funcxf.xfm[0][n-15] / funcxf.sca);
 
-	if (n < 21)			/* j unit vector */
-		return(funcxf.xfm[1][n-15] / funcxf.sca);
+	if (n <= 20)			/* j unit vector */
+		return(funcxf.xfm[1][n-18] / funcxf.sca);
 
-	if (n < 24)			/* k unit vector */
+	if (n <= 23)			/* k unit vector */
 		return(funcxf.xfm[2][n-21] / funcxf.sca);
 
 	if (n == 24)			/* single ray (shadow) distance */
 		return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
+
+	if (n <= 26)			/* local (u,v) coordinates */
+		return(fray->uv[n-25]);
 badchan:
 	error(USER, "illegal channel number");
+	return(0.0);
 }