--- ray/src/rt/func.c	1992/09/26 08:10:41	2.7
+++ ray/src/rt/func.c	2012/06/09 07:16:47	2.26
@@ -1,32 +1,28 @@
-/* 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.26 2012/06/09 07:16:47 greg Exp $";
 #endif
-
 /*
  *  func.c - interface to calcomp functions.
- *
- *     4/7/86
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
+#include  "ray.h"
+#include  "paths.h"
 #include  "otypes.h"
-
 #include  "func.h"
 
 
 #define  INITFILE	"rayinit.cal"
-#define  REFVNAME	"`FILE_REFCNT"
 #define  CALSUF		".cal"
 #define  LCALSUF	4
+char  REFVNAME[] = "`FILE_REFCNT";
 
 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, 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
 };
 
@@ -34,54 +30,67 @@ 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 char  rayinitcal[] = INITFILE;
 
+static double  l_erf(char *), l_erfc(char *), l_arg(char *);
 
+
+void
+initfunc()	/* initialize function evaluation */
+{
+	if (!rayinitcal[0])	/* already done? */
+		return;
+	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);
+	scompile("Px=$7;Py=$8;Pz=$9;", NULL, 0);
+	scompile("T=$10;Ts=$25;Rdot=$11;", NULL, 0);
+	scompile("S=$12;Tx=$13;Ty=$14;Tz=$15;", NULL, 0);
+	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);
+	setnoisefuncs();
+	setprismfuncs();
+	loadfunc(rayinitcal);
+	rayinitcal[0] = '\0';
+}
+
+
 MFUNC *
-getfunc(m, ff, ef, dofwd)	/* get function for this modifier */
-OBJREC  *m;
-int  ff;
-unsigned  ef;
-int  dofwd;
+getfunc(	/* get function for this modifier */
+	OBJREC  *m,
+	int  ff,
+	unsigned int  ef,
+	int  dofwd
+)
 {
-	extern EPNODE  *curfunc;
-	static char  initfile[] = INITFILE;
 	char  sbuf[MAXSTR];
-	register char  **arg;
-	register MFUNC  *f;
+	char  **arg;
+	MFUNC  *f;
 	int  ne, na;
-	register int  i;
+	int  i;
 					/* check to see if done already */
 	if ((f = (MFUNC *)m->os) != NULL)
 		return(f);
 	fobj = NULL; fray = NULL;
-	if (initfile[0]) {		/* initialize on first call */
-		setcontext("");
-		scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0);
-		scompile("Nx=$4;Ny=$5;Nz=$6;", NULL, 0);
-		scompile("Px=$7;Py=$8;Pz=$9;", NULL, 0);
-		scompile("T=$10;Ts=$25;Rdot=$11;", NULL, 0);
-		scompile("S=$12;Tx=$13;Ty=$14;Tz=$15;", NULL, 0);
-		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("erf", 1, ':', l_erf);
-		funset("erfc", 1, ':', l_erfc);
-		setnoisefuncs();
-		loadfunc(initfile);
-		initfile[0] = '\0';
-	}
+	if (rayinitcal[0])		/* initialize on first call */
+		initfunc();
 	if ((na = m->oargs.nsargs) <= ff)
 		goto toofew;
 	arg = m->oargs.sarg;
 	if ((f = (MFUNC *)calloc(1, sizeof(MFUNC))) == NULL)
 		goto memerr;
 	i = strlen(arg[ff]);			/* set up context */
-	if (i == 1 && arg[ff][0] == '.')
+	if (i == 1 && arg[ff][0] == '.') {
 		setcontext(f->ctx = "");	/* "." means no file */
-	else {
-		strcpy(sbuf,arg[ff]);	/* file name is context */
+	} else {
+		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));
@@ -108,21 +117,21 @@ int  dofwd;
 		i = ff+1;
 	while (i < na && arg[i][0] != '-')
 		i++;
-	if (i == na)			/* no transform */
-		f->f = f->b = &unitxf;
-	else {				/* get transform */
-		if ((f->b = (XF *)malloc(sizeof(XF))) == NULL)
+	if (i == na) {			/* no transform */
+		f->fxp = f->bxp = &unitxf;
+	} else {			/* get transform */
+		if ((f->bxp = (XF *)malloc(sizeof(XF))) == NULL)
 			goto memerr;
-		if (invxf(f->b, na-i, arg+i) != na-i)
+		if (invxf(f->bxp, na-i, arg+i) != na-i)
 			objerror(m, USER, "bad transform");
-		if (f->b->sca < 0.0)
-			f->b->sca = -f->b->sca;
+		if (f->bxp->sca < 0.0)
+			f->bxp->sca = -f->bxp->sca;
 		if (dofwd) {			/* do both transforms */
-			if ((f->f = (XF *)malloc(sizeof(XF))) == NULL)
+			if ((f->fxp = (XF *)malloc(sizeof(XF))) == NULL)
 				goto memerr;
-			xf(f->f, na-i, arg+i);
-			if (f->f->sca < 0.0)
-				f->f->sca = -f->f->sca;
+			xf(f->fxp, na-i, arg+i);
+			if (f->fxp->sca < 0.0)
+				f->fxp->sca = -f->fxp->sca;
 		}
 	}
 	m->os = (char *)f;
@@ -131,14 +140,17 @@ toofew:
 	objerror(m, USER, "too few string arguments");
 memerr:
 	error(SYSTEM, "out of memory in getfunc");
+	return NULL; /* pro forma return */
 }
 
 
-freefunc(m)			/* free memory associated with modifier */
-OBJREC  *m;
+void
+freefunc(			/* free memory associated with modifier */
+	OBJREC  *m
+)
 {
-	register MFUNC  *f;
-	register int  i;
+	MFUNC  *f;
+	int  i;
 
 	if ((f = (MFUNC *)m->os) == NULL)
 		return;
@@ -153,52 +165,76 @@ OBJREC  *m;
 			dcleanup(2);		/* remove definitions */
 		freestr(f->ctx);
 	}
-	if (f->b != &unitxf)
-		free((char *)f->b);
-	if (f->f != NULL && f->f != &unitxf)
-		free((char *)f->f);
-	free((char *)f);
+	if (f->bxp != &unitxf)
+		free((void *)f->bxp);
+	if ((f->fxp != NULL) & (f->fxp != &unitxf))
+		free((void *)f->fxp);
+	free((void *)f);
 	m->os = NULL;
 }
 
 
-setfunc(m, r)			/* set channels for function call */
-OBJREC  *m;
-register RAY  *r;
+int
+setfunc(			/* set channels for function call */
+	OBJREC	*m,
+	RAY	*r
+)
 {
-	static long  lastrno = -1;
-	register MFUNC  *f;
-					/* get function */
+	static RNUMBER	lastrno = ~0;
+	MFUNC		*f;
+					/* get function if any */
 	if ((f = (MFUNC *)m->os) == NULL)
-		error(m, CONSISTENCY, "setfunc called before getfunc");
-					/* set evaluator context */
-	setcontext(f->ctx);
+		objerror(m, CONSISTENCY, "setfunc called before getfunc");
+		
+	setcontext(f->ctx);		/* set evaluator context */
 					/* check to see if matrix set */
-	if (m == fobj && r->rno == lastrno)
+	if ((m == fobj) & (r->rno == lastrno))
 		return(0);
 	fobj = m;
 	fray = r;
-	if (r->rox != NULL)
-		if (f->b != &unitxf) {
-			funcxf.sca = r->rox->b.sca * f->b->sca;
-			multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
+	if (r->rox != NULL) {
+		if (f->bxp != &unitxf) {
+			funcxf.sca = r->rox->b.sca * f->bxp->sca;
+			multmat4(funcxf.xfm, r->rox->b.xfm, f->bxp->xfm);
 		} else
-			copystruct(&funcxf, &r->rox->b);
-	else
-		copystruct(&funcxf, f->b);
+			funcxf = r->rox->b;
+	} else
+		funcxf = *f->bxp;
 	lastrno = r->rno;
 	eclock++;		/* notify expression evaluator */
 	return(1);
 }
 
 
-loadfunc(fname)			/* load definition file */
-char  *fname;
+int
+worldfunc(			/* special function context sans object */
+	char	*ctx,
+	RAY	*r
+)
 {
-	extern char  *libpath;		/* library search path */
+	static RNUMBER	lastrno = ~0;
+					/* set evaluator context */
+	setcontext(ctx);
+					/* check if ray already set */
+	if ((fobj == NULL) & (r->rno == lastrno))
+		return(0);
+	fobj = NULL;
+	fray = r;
+	funcxf = unitxf;
+	lastrno = r->rno;
+	eclock++;		/* notify expression evaluator */
+	return(1);
+}
+
+
+void
+loadfunc(			/* load definition file */
+	char  *fname
+)
+{
 	char  *ffname;
 
-	if ((ffname = getpath(fname, libpath, R_OK)) == NULL) {
+	if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find function file \"%s\"", fname);
 		error(USER, errmsg);
 	}
@@ -207,13 +243,12 @@ char  *fname;
 
 
 static double
-l_arg()				/* return nth real argument */
+l_arg(char *nm)			/* return nth real argument */
 {
-	extern double  argument();
-	register int  n;
+	int  n;
 
 	if (fobj == NULL)
-		syntax("arg(n) used in constant expression");
+		error(USER, "arg(n) called without a context");
 
 	n = argument(1) + .5;		/* round to integer */
 
@@ -229,65 +264,54 @@ l_arg()				/* return nth real argument */
 
 
 static double
-l_erf()				/* error function */
+l_erf(char *nm)			/* error function */
 {
-	extern double  erf();
-
 	return(erf(argument(1)));
 }
 
 
 static double
-l_erfc()			/* cumulative error function */
+l_erfc(char *nm)		/* cumulative error function */
 {
-	extern double  erfc();
-
 	return(erfc(argument(1)));
 }
 
 
 double
-chanvalue(n)			/* return channel n to calcomp */
-register int  n;
+chanvalue(			/* return channel n to calcomp */
+	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 :
@@ -296,25 +320,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);
 }