--- ray/src/rt/func.c	1990/12/15 15:03:26	1.12
+++ ray/src/rt/func.c	1991/06/19 15:08:39	1.19
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -15,6 +15,14 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "otypes.h"
 
 
+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
+};
+
 XF  funcxf;			/* current transformation */
 static OBJREC  *fobj = NULL;	/* current function object */
 static RAY  *fray = NULL;	/* current function ray */
@@ -25,14 +33,13 @@ OBJREC  *m;
 register RAY  *r;
 XF  *bx;
 {
-	extern double  l_noise3(), l_noise3a(), l_noise3b(), l_noise3c();
-	extern double  l_hermite(), l_fnoise3(), l_arg();
+	extern double  l_arg(), l_erf(), l_erfc();
 	extern long  eclock;
 	static char  *initfile = "rayinit.cal";
 	static long  lastrno = -1;
 					/* check to see if already set */
 	if (m == fobj && r->rno == lastrno)
-		return;
+		return(0);
 					/* initialize if first call */
 	if (initfile != NULL) {
 		loadfunc(initfile);
@@ -44,24 +51,25 @@ XF  *bx;
 		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("erf", 1, ':', l_erf);
+		funset("erfc", 1, ':', l_erfc);
+		setnoisefuncs();
 		initfile = NULL;
 	}
 	fobj = m;
 	fray = r;
-	lastrno = r->rno;
-	if (r->rox != NULL) {
-		funcxf.sca = r->rox->b.sca * bx->sca;
-		multmat4(funcxf.xfm, r->rox->b.xfm, bx->xfm);
-	} else
+	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);
+	lastrno = r->rno;
 	eclock++;		/* notify expression evaluator */
+	return(1);
 }
 
 
@@ -78,17 +86,20 @@ 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, 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);
-	return;
+	return(setmap(m, r, mxf));
 memerr:
 	error(SYSTEM, "out of memory in setfunc");
 }
@@ -128,6 +139,24 @@ l_arg()				/* return nth real argument */
 
 
 double
+l_erf()				/* error function */
+{
+	extern double  erf();
+
+	return(erf(argument(1)));
+}
+
+
+double
+l_erfc()			/* cumulative error function */
+{
+	extern double  erfc();
+
+	return(erfc(argument(1)));
+}
+
+
+double
 chanvalue(n)			/* return channel n to calcomp */
 register int  n;
 {
@@ -166,8 +195,10 @@ register int  n;
 		return(sum * funcxf.sca);
 
 	}
-	if (n == 10)			/* dot product */
-		return(fray->rod);
+	if (n == 10)			/* dot product (range [-1,1]) */
+		return(	fray->rod <= -1.0 ? -1.0 :
+			fray->rod >= 1.0 ? 1.0 :
+			fray->rod );
 
 	if (n == 11)			/* scale */
 		return(funcxf.sca);