--- ray/src/rt/rv3.c	1993/08/05 13:05:01	2.5
+++ ray/src/rt/rv3.c	1994/12/22 11:46:19	2.7
@@ -1,4 +1,4 @@
-/* Copyright (c) 1987 Regents of the University of California */
+/* Copyright (c) 1994 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -103,8 +103,8 @@ double  *mp;
 		(*dev->comout)("Pick view center\n");
 		if ((*dev->getcur)(&x, &y) == ABORT)
 			return(-1);
-		if (viewray(thisray.rorg, thisray.rdir, &ourview,
-				(x+.5)/hresolu, (y+.5)/vresolu) < 0) {
+		if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
+			&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
 			error(COMMAND, "not on image");
 			return(-1);
 		}
@@ -162,8 +162,8 @@ int  xmin, ymin, xmax, ymax;
 	h = xmin + (xmax-xmin)*frandom();
 	v = ymin + (ymax-ymin)*frandom();
 	
-	if (viewray(thisray.rorg, thisray.rdir, &ourview,
-			h/hresolu, v/vresolu) < 0) {
+	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, &ourview,
+			h/hresolu, v/vresolu)) < -FTINY) {
 		setcolor(thisray.rcol, 0.0, 0.0, 0.0);
 	} else {
 		rayorigin(&thisray, NULL, PRIMARY, 1.0);
@@ -404,10 +404,16 @@ FVECT  vc;
 		d = 0.0;			/* don't move closer */
 		for (i = 0; i < 3; i++)
 			d += (vc[i] - ourview.vp[i])*ourview.vdir[i];
+		nv.vfore = ourview.vfore;
+		nv.vaft = ourview.vaft;
 	} else {
 		nv.horiz = ourview.horiz;
 		nv.vert = ourview.vert;
 		d = sqrt(dist2(ourview.vp, vc)) / mag;
+		nv.vfore = ourview.vfore + d - d*mag;
+		if (nv.vfore < 0.0) nv.vfore = 0.0;
+		nv.vaft = ourview.vaft + d - d*mag;
+		if (nv.vaft < nv.vfore) nv.vaft = 0.0;
 	}
 	for (i = 0; i < 3; i++)
 		nv.vp[i] = vc[i] - d*nv.vdir[i];