--- ray/src/rt/func.c	1994/04/14 04:50:29	2.12
+++ ray/src/rt/func.c	2003/05/13 17:58:33	2.18
@@ -1,15 +1,12 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: func.c,v 2.18 2003/05/13 17:58:33 greg Exp $";
 #endif
-
 /*
  *  func.c - interface to calcomp functions.
- *
- *     4/7/86
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
 #include  "otypes.h"
@@ -41,10 +38,9 @@ MFUNC *
 getfunc(m, ff, ef, dofwd)	/* get function for this modifier */
 OBJREC  *m;
 int  ff;
-unsigned  ef;
+unsigned int  ef;
 int  dofwd;
 {
-	extern EPNODE  *curfunc;
 	static char  initfile[] = INITFILE;
 	char  sbuf[MAXSTR];
 	register char  **arg;
@@ -56,6 +52,8 @@ int  dofwd;
 		return(f);
 	fobj = NULL; fray = NULL;
 	if (initfile[0]) {		/* initialize on first call */
+		esupport |= E_VARIABLE|E_FUNCTION|E_INCHAN|E_RCONST|E_REDEFW;
+		esupport &= ~(E_OUTCHAN);
 		setcontext("");
 		scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0);
 		scompile("Nx=$4;Ny=$5;Nz=$6;", NULL, 0);
@@ -65,6 +63,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);
@@ -82,7 +81,7 @@ int  dofwd;
 	if (i == 1 && arg[ff][0] == '.')
 		setcontext(f->ctx = "");	/* "." means no file */
 	else {
-		strcpy(sbuf,arg[ff]);	/* file name is context */
+		strcpy(sbuf,arg[ff]);		/* file name is context */
 		if (i > LCALSUF && !strcmp(sbuf+i-LCALSUF, CALSUF))
 			sbuf[i-LCALSUF] = '\0';	/* remove suffix */
 		setcontext(f->ctx = savestr(sbuf));
@@ -135,6 +134,7 @@ memerr:
 }
 
 
+void
 freefunc(m)			/* free memory associated with modifier */
 OBJREC  *m;
 {
@@ -155,14 +155,15 @@ OBJREC  *m;
 		freestr(f->ctx);
 	}
 	if (f->b != &unitxf)
-		free((char *)f->b);
+		free((void *)f->b);
 	if (f->f != NULL && f->f != &unitxf)
-		free((char *)f->f);
-	free((char *)f);
+		free((void *)f->f);
+	free((void *)f);
 	m->os = NULL;
 }
 
 
+int
 setfunc(m, r)			/* set channels for function call */
 OBJREC  *m;
 register RAY  *r;
@@ -171,7 +172,7 @@ register RAY  *r;
 	register MFUNC  *f;
 					/* get function */
 	if ((f = (MFUNC *)m->os) == NULL)
-		error(m, CONSISTENCY, "setfunc called before getfunc");
+		objerror(m, CONSISTENCY, "setfunc called before getfunc");
 					/* set evaluator context */
 	setcontext(f->ctx);
 					/* check to see if matrix set */
@@ -193,13 +194,13 @@ register RAY  *r;
 }
 
 
+void
 loadfunc(fname)			/* load definition file */
 char  *fname;
 {
-	extern char  *getlibpath();	/* library search path */
 	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);
 	}
@@ -210,7 +211,6 @@ char  *fname;
 static double
 l_arg()				/* return nth real argument */
 {
-	extern double  argument();
 	register int  n;
 
 	if (fobj == NULL)
@@ -251,44 +251,36 @@ double
 chanvalue(n)			/* return channel n to calcomp */
 register int  n;
 {
-	double  sum;
-	register RAY  *r;
-
 	if (fray == NULL)
 		syntax("ray parameter used in constant expression");
 
 	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] +
 				fray->rop[2]*funcxf.xfm[2][n-6] +
 					     funcxf.xfm[3][n-6] );
 
-	if (n == 9) {			/* total distance */
-		sum = fray->rot;
-		for (r = fray->parent; r != NULL; r = r->parent)
-			sum += r->rot;
-		return(sum * funcxf.sca);
+	if (n == 9)			/* total distance */
+		return(raydist(fray,PRIMARY) * funcxf.sca);
 
-	}
-
 	if (n == 10)			/* dot product (range [-1,1]) */
 		return(	fray->rod <= -1.0 ? -1.0 :
 			fray->rod >= 1.0 ? 1.0 :
@@ -297,25 +289,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 */
-		sum = fray->rot;
-		for (r = fray->parent; r != NULL && r->crtype&SHADOW;
-				r = r->parent)
-			sum += r->rot;
-		return(sum * 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);
 }