--- ray/src/rt/rv3.c	1990/01/09 11:38:19	1.11
+++ ray/src/rt/rv3.c	1990/10/14 11:06:27	1.17
@@ -18,7 +18,11 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "random.h"
 
+#ifndef WFLUSH
+#define WFLUSH		30		/* flush after this many rays */
+#endif
 
+
 getrect(s, r)				/* get a box */
 char  *s;
 register RECT  *r;
@@ -89,8 +93,11 @@ double  *mp;
 		(*dev->comout)("Pick view center\n");
 		if ((*dev->getcur)(&x, &y) == ABORT)
 			return(-1);
-		viewray(thisray.rorg, thisray.rdir, &ourview,
-				(x+.5)/hresolu, (y+.5)/vresolu);
+		if (viewray(thisray.rorg, thisray.rdir, &ourview,
+				(x+.5)/hresolu, (y+.5)/vresolu) < 0) {
+			error(COMMAND, "not on image");
+			return(-1);
+		}
 		if (!direc || ourview.type == VT_PAR) {
 			rayorigin(&thisray, NULL, PRIMARY, 1.0);
 			if (!localhit(&thisray, &thescene)) {
@@ -130,9 +137,10 @@ paint(p, xmin, ymin, xmax, ymax)	/* compute and paint 
 register PNODE  *p;
 int  xmin, ymin, xmax, ymax;
 {
+	extern long  nrays;
+	static long  lastflush = 0;
 	static RAY  thisray;
 	double  h, v;
-	register int  i;
 
 	if (xmax - xmin <= 0 || ymax - ymin <= 0) {	/* empty */
 		p->x = xmin;
@@ -141,22 +149,28 @@ int  xmin, ymin, xmax, ymax;
 		return;
 	}
 						/* jitter ray direction */
-	p->x = h = xmin + (xmax-xmin)*frandom();
-	h /= hresolu;
-	p->y = v = ymin + (ymax-ymin)*frandom();
-	v /= vresolu;
+	h = xmin + (xmax-xmin)*frandom();
+	v = ymin + (ymax-ymin)*frandom();
 	
-	viewray(thisray.rorg, thisray.rdir, &ourview, h, v);
+	if (viewray(thisray.rorg, thisray.rdir, &ourview,
+			h/hresolu, v/vresolu) < 0) {
+		setcolor(thisray.rcol, 0.0, 0.0, 0.0);
+	} else {
+		rayorigin(&thisray, NULL, PRIMARY, 1.0);
+		rayvalue(&thisray);
+	}
 
-	rayorigin(&thisray, NULL, PRIMARY, 1.0);
-	
-	rayvalue(&thisray);
-
+	p->x = h;
+	p->y = v;
 	copycolor(p->v, thisray.rcol);
-
 	scalecolor(p->v, exposure);
 
 	(*dev->paintr)(greyscale?greyof(p->v):p->v, xmin, ymin, xmax, ymax);
+
+	if (dev->flush != NULL && nrays - lastflush >= WFLUSH) {
+		lastflush = nrays;
+		(*dev->flush)();
+	}
 }
 
 
@@ -346,10 +360,10 @@ register VIEW  *vp;
 	if ((err = setview(vp)) != NULL) {
 		sprintf(errmsg, "view not set - %s", err);
 		error(COMMAND, errmsg);
-	} else if (bcmp(vp, &ourview, sizeof(VIEW))) {
-		copyview(&oldview, &ourview);
-		copyview(&ourview, vp);
-		newimage();		/* newimage() calls with vp=&ourview! */
+	} else if (bcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
+		copystruct(&oldview, &ourview);
+		copystruct(&ourview, vp);
+		newimage();
 	}
 }
 
@@ -386,6 +400,38 @@ FVECT  vc;
 	for (i = 0; i < 3; i++)
 		nv.vp[i] = vc[i] - d*nv.vdir[i];
 	newview(&nv);
+}
+
+
+zoomview(vp, zf)			/* zoom in our out */
+register VIEW  *vp;
+double  zf;
+{
+	switch (vp->type) {
+	case VT_PAR:				/* parallel view */
+	case VT_ANG:				/* angular fisheye */
+		vp->horiz /= zf;
+		vp->vert /= zf;
+		return;
+	case VT_PER:				/* perspective view */
+		vp->horiz = atan(tan(vp->horiz*(PI/180./2.))/zf) /
+				(PI/180./2.);
+		vp->vert = atan(tan(vp->vert*(PI/180./2.))/zf) /
+				(PI/180./2.);
+		return;
+	case VT_HEM:				/* hemispherical fisheye */
+		vp->horiz = sin(vp->horiz*(PI/180./2.))/zf;
+		if (vp->horiz >= 1.0-FTINY)
+			vp->horiz = 180.;
+		else
+			vp->horiz = asin(vp->horiz) / (PI/180./2.);
+		vp->vert = sin(vp->vert*(PI/180./2.))/zf;
+		if (vp->vert >= 1.0-FTINY)
+			vp->vert = 180.;
+		else
+			vp->vert = asin(vp->vert) / (PI/180./2.);
+		return;
+	}
 }