--- ray/src/rt/rayinit.cal	1993/06/02 10:23:20	2.7
+++ ray/src/rt/rayinit.cal	1996/02/29 11:13:34	2.10
@@ -24,6 +24,10 @@
  	RdotP				- perturbed ray dot product
  	CrP, CgP, CbP			- perturbed material color
 
+	For prism1 and prism2 types, the following are available:
+
+	DxA, DyA, DzA			- direction to target light source
+
 	Library functions:
 
 	if(a, b, c)			- if a positive, return b, else c
@@ -67,6 +71,7 @@ noise3d(i,x,y,z) = select(i, noise3a(x,y,z), noise3b(x
 bound(a,x,b) : if(a-x, a, if(x-b, b, x));
 Acos(x) : acos(bound(-1,x,1));
 Asin(x) : asin(bound(-1,x,1));
+Atan2(y,x) : if(x*x+y*y, atan2(y,x), 0);
 Exp(x) : if(-x-100, 0, exp(x));
 Sqrt(x) : if(x, sqrt(x), 0);
 
@@ -96,7 +101,7 @@ noneg(v) = if(v,v,0);
 red(r,g,b) = if(r,r,0);
 green(r,g,b) = if(g,g,0);
 blue(r,g,b) = if(b,b,0);
-grey(r,g,b) = noneg(.263*r + .655*g + .082*b);
+grey(r,g,b) = noneg(.265074126*r + .670114631*g + .064811243*b);
 clip_r(r,g,b) = bound(0,r,1);
 clip_g(r,g,b) = bound(0,g,1);
 clip_b(r,g,b) = bound(0,b,1);