--- ray/src/rt/func.c	1991/11/25 09:51:00	2.2
+++ ray/src/rt/func.c	1992/03/03 13:58:12	2.6
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -59,7 +59,7 @@ int  dofwd;
 		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);
@@ -80,12 +80,12 @@ int  dofwd;
 	if (i == 1 && arg[ff][0] == '.')
 		setcontext(f->ctx = "");	/* "." means no file */
 	else {
-		strcpy(sbuf,m->oargs.sarg[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));
 		if (!vardefined(REFVNAME)) {	/* file loaded? */
-			loadfunc(m->oargs.sarg[ff]);
+			loadfunc(arg[ff]);
 			varset(REFVNAME, '=', 1.0);
 		} else				/* reference_count++ */
 			varset(REFVNAME, '=', varvalue(REFVNAME)+1.0);
@@ -111,14 +111,14 @@ int  dofwd;
 		f->f = f->b = &unitxf;
 	else {				/* get transform */
 		if ((f->b = (XF *)malloc(sizeof(XF))) == NULL)
-			goto memerr;;
+			goto memerr;
 		if (invxf(f->b, na-i, arg+i) != na-i)
 			objerror(m, USER, "bad transform");
 		if (f->b->sca < 0.0)
 			f->b->sca = -f->b->sca;
 		if (dofwd) {			/* do both transforms */
 			if ((f->f = (XF *)malloc(sizeof(XF))) == NULL)
-				goto memerr;;
+				goto memerr;
 			xf(f->f, na-i, arg+i);
 			if (f->f->sca < 0.0)
 				f->f->sca = -f->f->sca;
@@ -127,7 +127,7 @@ int  dofwd;
 	m->os = (char *)f;
 	return(f);
 toofew:
-	objerror(m, USER, "too few arguments");
+	objerror(m, USER, "too few string arguments");
 memerr:
 	error(SYSTEM, "out of memory in getfunc");
 }
@@ -273,14 +273,14 @@ 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 */
 		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 +300,14 @@ register int  n;
 
 	if (n < 24)			/* 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);
+	}
 badchan:
 	error(USER, "illegal channel number");
 }