--- ray/src/rt/func.c	1990/07/19 11:17:12	1.9
+++ ray/src/rt/func.c	1991/04/23 15:46:22	1.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -15,27 +15,29 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "otypes.h"
 
 
-typedef struct {
-	double  xfm[4][4];		/* transform matrix */
-	double  sca;			/* scalefactor */
-}  XF;
+XF  unitxf = {			/* identity transform */
+	1.0, 0.0, 0.0, 0.0,
+	0.0, 1.0, 0.0, 0.0,
+	0.0, 0.0, 1.0, 0.0,
+	0.0, 0.0, 0.0, 1.0,
+	1.0
+};
 
-static OBJREC  *fobj;		/* current function object */
-static RAY  *fray;		/* current function ray */
-static XF  fxf;			/* current transformation */
+XF  funcxf;			/* current transformation */
+static OBJREC  *fobj = NULL;	/* current function object */
+static RAY  *fray = NULL;	/* current function ray */
 
 
-setmap(m, r, xfm, sca)		/* set channels for function call */
+setmap(m, r, bx)		/* set channels for function call */
 OBJREC  *m;
 register RAY  *r;
-double  xfm[4][4];
-double  sca;
+XF  *bx;
 {
 	extern double  l_noise3(), l_noise3a(), l_noise3b(), l_noise3c();
 	extern double  l_hermite(), l_fnoise3(), l_arg();
 	extern long  eclock;
 	static char  *initfile = "rayinit.cal";
-
+					/* initialize if first call */
 	if (initfile != NULL) {
 		loadfunc(initfile);
 		scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0);
@@ -46,19 +48,25 @@ double  sca;
 		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);
-		funset("arg", 1, l_arg);
-		funset("noise3", 3, l_noise3);
-		funset("noise3a", 3, l_noise3a);
-		funset("noise3b", 3, l_noise3b);
-		funset("noise3c", 3, l_noise3c);
-		funset("hermite", 5, l_hermite);
-		funset("fnoise3", 3, l_fnoise3);
+		funset("arg", 1, '=', l_arg);
+		funset("noise3", 3, ':', l_noise3);
+		funset("noise3a", 3, ':', l_noise3a);
+		funset("noise3b", 3, ':', l_noise3b);
+		funset("noise3c", 3, ':', l_noise3c);
+		funset("hermite", 5, ':', l_hermite);
+		funset("fnoise3", 3, ':', l_fnoise3);
 		initfile = NULL;
 	}
 	fobj = m;
 	fray = r;
-	fxf.sca = r->robs * sca;
-	multmat4(fxf.xfm, r->robx, xfm);
+	if (r->rox != NULL)
+		if (bx != &unitxf) {
+			funcxf.sca = r->rox->b.sca * bx->sca;
+			multmat4(funcxf.xfm, r->rox->b.xfm, bx->xfm);
+		} else
+			copystruct(&funcxf, &r->rox->b);
+	else
+		copystruct(&funcxf, bx);
 	eclock++;		/* notify expression evaluator */
 }
 
@@ -76,20 +84,23 @@ RAY  *r;
 		for (n = m->oargs.nsargs, sa = m->oargs.sarg;
 				n > 0 && **sa != '-'; n--, sa++)
 			;
-		mxf = (XF *)malloc(sizeof(XF));
-		if (mxf == NULL)
-			goto memerr;
-		if (invxf(mxf->xfm, &mxf->sca, n, sa) != n)
-			objerror(m, USER, "bad transform");
-		if (mxf->sca < 0.0)
-			mxf->sca = -mxf->sca;
+		if (n == 0)
+			mxf = &unitxf;
+		else {
+			mxf = (XF *)malloc(sizeof(XF));
+			if (mxf == NULL)
+				goto memerr;
+			if (invxf(mxf, 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->xfm, mxf->sca);
+	setmap(m, r, mxf);
 	return;
 memerr:
 	error(SYSTEM, "out of memory in setfunc");
-#undef  mxf
 }
 
 
@@ -133,55 +144,55 @@ register int  n;
 	double  sum;
 	register RAY  *r;
 
-	n--;				/* for convenience */
+	if (--n < 0)
+		goto badchan;
 
-	if (n < 0 || n > 23)
-		error(USER, "illegal channel number");
+	if (n < 3)			/* 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 */
+
+		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 */
+
+		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) {			/* distance */
 
 		sum = fray->rot;
 		for (r = fray->parent; r != NULL; r = r->parent)
 			sum += r->rot;
-		return(sum * fxf.sca);
+		return(sum * funcxf.sca);
 
 	}
 	if (n == 10)			/* dot product */
 		return(fray->rod);
 
-	if (n < 3)			/* ray direction */
-
-		return( (	fray->rdir[0]*fxf.xfm[0][n] +
-				fray->rdir[1]*fxf.xfm[1][n] +
-				fray->rdir[2]*fxf.xfm[2][n]	)
-			 / fxf.sca );
-
-	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);
+		return(funcxf.sca);
 
 	if (n < 15)			/* origin */
-		return(fxf.xfm[3][n-12]);
+		return(funcxf.xfm[3][n-12]);
 
 	if (n < 18)			/* i unit vector */
-		return(fxf.xfm[0][n-15] / fxf.sca);
+		return(funcxf.xfm[0][n-15] / funcxf.sca);
 
 	if (n < 21)			/* j unit vector */
-		return(fxf.xfm[1][n-15] / fxf.sca);
+		return(funcxf.xfm[1][n-15] / funcxf.sca);
 
 	if (n < 24)			/* k unit vector */
-		return(fxf.xfm[2][n-21] / fxf.sca);
+		return(funcxf.xfm[2][n-21] / funcxf.sca);
+badchan:
+	error(USER, "illegal channel number");
 }