--- ray/src/rt/func.c	1992/02/05 09:23:38	2.5
+++ ray/src/rt/func.c	2003/02/22 02:07:28	2.14
@@ -1,13 +1,65 @@
-/* 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.14 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  func.c - interface to calcomp functions.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     4/7/86
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
  */
 
 #include  "ray.h"
@@ -18,15 +70,15 @@ static char SCCSid[] = "$SunId$ LBL";
 
 
 #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
 };
 
@@ -41,10 +93,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;
@@ -54,12 +105,15 @@ int  dofwd;
 					/* 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 */
+		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;Rdot=$11;", 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);
@@ -68,6 +122,7 @@ int  dofwd;
 		funset("erf", 1, ':', l_erf);
 		funset("erfc", 1, ':', l_erfc);
 		setnoisefuncs();
+		setprismfuncs();
 		loadfunc(initfile);
 		initfile[0] = '\0';
 	}
@@ -80,7 +135,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));
@@ -133,6 +188,7 @@ memerr:
 }
 
 
+void
 freefunc(m)			/* free memory associated with modifier */
 OBJREC  *m;
 {
@@ -153,23 +209,24 @@ 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;
 {
-	static long  lastrno = -1;
+	static unsigned long  lastrno = ~0;
 	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 */
@@ -191,13 +248,13 @@ register RAY  *r;
 }
 
 
+void
 loadfunc(fname)			/* load definition file */
 char  *fname;
 {
-	extern char  *libpath;		/* library search path */
 	char  *ffname;
 
-	if ((ffname = getpath(fname, libpath, R_OK)) == NULL) {
+	if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find function file \"%s\"", fname);
 		error(USER, errmsg);
 	}
@@ -208,9 +265,11 @@ char  *fname;
 static double
 l_arg()				/* return nth real argument */
 {
-	extern double  argument();
 	register int  n;
 
+	if (fobj == NULL)
+		syntax("arg(n) used in constant expression");
+
 	n = argument(1) + .5;		/* round to integer */
 
 	if (n < 1)
@@ -246,8 +305,8 @@ 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;
@@ -273,14 +332,9 @@ register int  n;
 				fray->rop[2]*funcxf.xfm[2][n-6] +
 					     funcxf.xfm[3][n-6] );
 
-	if (n == 9) {			/* distance */
+	if (n == 9)			/* total distance */
+		return(raydist(fray,PRIMARY) * funcxf.sca);
 
-		sum = fray->rot;
-		for (r = fray->parent; r != NULL; r = r->parent)
-			sum += r->rot;
-		return(sum * funcxf.sca);
-
-	}
 	if (n == 10)			/* dot product (range [-1,1]) */
 		return(	fray->rod <= -1.0 ? -1.0 :
 			fray->rod >= 1.0 ? 1.0 :
@@ -300,6 +354,9 @@ register int  n;
 
 	if (n < 24)			/* k unit vector */
 		return(funcxf.xfm[2][n-21] / funcxf.sca);
+
+	if (n == 24)			/* single ray (shadow) distance */
+		return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
 badchan:
 	error(USER, "illegal channel number");
 }