--- ray/src/rt/func.c	1989/02/02 10:41:23	1.1
+++ ray/src/rt/func.c	1990/04/07 16:12:56	1.8
@@ -16,8 +16,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 
 typedef struct {
-	double  sca;			/* scalefactor */
 	double  xfm[4][4];		/* transform matrix */
+	double  sca;			/* scalefactor */
 }  XF;
 
 static OBJREC  *fobj;		/* current function object */
@@ -25,11 +25,11 @@ static RAY  *fray;		/* current function ray */
 static XF  fxf;			/* current transformation */
 
 
-setmap(m, r, sca, xfm)		/* set channels for function call */
+setmap(m, r, xfm, sca)		/* set channels for function call */
 OBJREC  *m;
 register RAY  *r;
-double  sca;
 double  xfm[4][4];
+double  sca;
 {
 	extern double  l_noise3(), l_noise3a(), l_noise3b(), l_noise3c();
 	extern double  l_hermite(), l_fnoise3(), l_arg();
@@ -42,6 +42,10 @@ double  xfm[4][4];
 		scompile(NULL, "Nx=$4;Ny=$5;Nz=$6;");
 		scompile(NULL, "Px=$7;Py=$8;Pz=$9;");
 		scompile(NULL, "T=$10;Rdot=$11;");
+		scompile(NULL, "S=$12;Tx=$13;Ty=$14;Tz=$15;");
+		scompile(NULL, "Ix=$16;Iy=$17;Iz=$18;");
+		scompile(NULL, "Jx=$19;Jy=$20;Jz=$21;");
+		scompile(NULL, "Kx=$22;Ky=$23;Kz=$24;");
 		funset("arg", 1, l_arg);
 		funset("noise3", 3, l_noise3);
 		funset("noise3a", 3, l_noise3a);
@@ -53,8 +57,8 @@ double  xfm[4][4];
 	}
 	fobj = m;
 	fray = r;
-	fxf.sca = r->ros * sca;
-	multmat4(fxf.xfm, r->rox, xfm);
+	fxf.sca = r->robs * sca;
+	multmat4(fxf.xfm, r->robx, xfm);
 	eclock++;		/* notify expression evaluator */
 }
 
@@ -63,27 +67,25 @@ setfunc(m, r)				/* simplified interface to setmap */
 register OBJREC  *m;
 RAY  *r;
 {
-#define  mxf	((XF *)m->os)
+	register XF  *mxf;
 
-	if (mxf == NULL) {
-		register int  n = m->oargs.nsargs;
-		register char  **sa = m->oargs.sarg;
+	if ((mxf = (XF *)m->os) == NULL) {
+		register int  n;
+		register char  **sa;
 
-		while (n > 0 && **sa != '-') {
-			n--;
-			sa++;
-		}
+		for (n = m->oargs.nsargs, sa = m->oargs.sarg;
+				n > 0 && **sa != '-'; n--, sa++)
+			;
 		mxf = (XF *)malloc(sizeof(XF));
 		if (mxf == NULL)
 			goto memerr;
-		mxf->sca = 1.0;
-		setident4(mxf->xfm);
 		if (invxf(mxf->xfm, &mxf->sca, n, sa) != n)
 			objerror(m, USER, "bad transform");
 		if (mxf->sca < 0.0)
 			mxf->sca = -mxf->sca;
+		m->os = (char *)mxf;
 	}
-	setmap(m, r, mxf->sca, mxf->xfm);
+	setmap(m, r, mxf->xfm, mxf->sca);
 	return;
 memerr:
 	error(SYSTEM, "out of memory in setfunc");
@@ -97,7 +99,7 @@ char  *fname;
 	extern char  *libpath;		/* library search path */
 	char  *ffname;
 
-	if ((ffname = getpath(fname, libpath)) == NULL) {
+	if ((ffname = getpath(fname, libpath, R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find function file \"%s\"", fname);
 		error(USER, errmsg);
 	}
@@ -128,41 +130,58 @@ double
 chanvalue(n)			/* return channel n to calcomp */
 register int  n;
 {
-	double  res;
+	double  sum;
 	register RAY  *r;
 
-	n--;					/* for convenience */
+	n--;				/* for convenience */
 
-	if (n < 0 || n > 10)
+	if (n < 0 || n > 23)
 		error(USER, "illegal channel number");
 
-	if (n == 9) {				/* distance */
+	if (n == 9) {			/* distance */
 
-		res = fray->rot;
+		sum = fray->rot;
 		for (r = fray->parent; r != NULL; r = r->parent)
-			res += r->rot;
-		res *= fxf.sca;
+			sum += r->rot;
+		return(sum * fxf.sca);
 
-	} else if (n == 10) {			/* dot product */
+	}
+	if (n == 10)			/* dot product */
+		return(fray->rod);
 
-		res = fray->rod;
+	if (n < 3)			/* ray direction */
 
-	} else if (n < 3) {			/* ray direction */
-			res = (	fray->rdir[0]*fxf.xfm[0][n] +
-					fray->rdir[1]*fxf.xfm[1][n] +
-					fray->rdir[2]*fxf.xfm[2][n]	)
-				 / fxf.sca ;
-	} else if (n < 6) {			/* surface normal */
-			res = (	fray->ron[0]*fxf.xfm[0][n-3] +
-					fray->ron[1]*fxf.xfm[1][n-3] +
-					fray->ron[2]*fxf.xfm[2][n-3]	)
-				 / fxf.sca ;
-	} else {				/* intersection */
-			res =	fray->rop[0]*fxf.xfm[0][n-6] +
-					fray->rop[1]*fxf.xfm[1][n-6] +
-					fray->rop[2]*fxf.xfm[2][n-6] +
-						     fxf.xfm[3][n-6] ;
-	}
+		return( (	fray->rdir[0]*fxf.xfm[0][n] +
+				fray->rdir[1]*fxf.xfm[1][n] +
+				fray->rdir[2]*fxf.xfm[2][n]	)
+			 / fxf.sca );
 
-	return(res);
+	if (n < 6)			/* surface normal */
+
+		return( (	fray->ron[0]*fxf.xfm[0][n-3] +
+				fray->ron[1]*fxf.xfm[1][n-3] +
+				fray->ron[2]*fxf.xfm[2][n-3]	)
+			 / fxf.sca );
+
+	if (n < 9)			/* intersection */
+
+		return( fray->rop[0]*fxf.xfm[0][n-6] +
+				fray->rop[1]*fxf.xfm[1][n-6] +
+				fray->rop[2]*fxf.xfm[2][n-6] +
+					     fxf.xfm[3][n-6] );
+
+	if (n == 11)			/* scale */
+		return(fxf.sca);
+
+	if (n < 15)			/* origin */
+		return(fxf.xfm[3][n-12]);
+
+	if (n < 18)			/* i unit vector */
+		return(fxf.xfm[0][n-15] / fxf.sca);
+
+	if (n < 21)			/* j unit vector */
+		return(fxf.xfm[1][n-15] / fxf.sca);
+
+	if (n < 24)			/* k unit vector */
+		return(fxf.xfm[2][n-21] / fxf.sca);
 }