--- ray/src/rt/rv3.c	1989/02/02 10:41:39	1.1
+++ ray/src/rt/rv3.c	1989/10/27 11:48:23	1.7
@@ -12,11 +12,106 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "ray.h"
 
+#include  "octree.h"
+
 #include  "rpaint.h"
 
 #include  "random.h"
 
 
+getrect(s, r)				/* get a box */
+char  *s;
+register RECT  *r;
+{
+	int  x0, y0, x1, y1;
+
+	if (*s && !strncmp(s, "all", strlen(s))) {
+		r->l = r->d = 0;
+		r->r = ourview.hresolu;
+		r->u = ourview.vresolu;
+		return(0);
+	}
+	if (sscanf(s, "%d %d %d %d", &x0, &y0, &x1, &y1) != 4) {
+		if (dev->getcur == NULL)
+			return(-1);
+		(*dev->comout)("Pick first corner\n");
+		if ((*dev->getcur)(&x0, &y0) == ABORT)
+			return(-1);
+		(*dev->comout)("Pick second corner\n");
+		if ((*dev->getcur)(&x1, &y1) == ABORT)
+			return(-1);
+	}
+	if (x0 < x1) {
+		r->l = x0;
+		r->r = x1;
+	} else {
+		r->l = x1;
+		r->r = x0;
+	}
+	if (y0 < y1) {
+		r->d = y0;
+		r->u = y1;
+	} else {
+		r->d = y1;
+		r->u = y0;
+	}
+	if (r->l < 0) r->l = 0;
+	if (r->d < 0) r->d = 0;
+	if (r->r > ourview.hresolu) r->r = ourview.hresolu;
+	if (r->u > ourview.vresolu) r->u = ourview.vresolu;
+	if (r->l > r->r) r->l = r->r;
+	if (r->d > r->u) r->d = r->u;
+	return(0);
+}
+
+
+getinterest(s, direc, vec, mp)		/* get area of interest */
+char  *s;
+int  direc;
+FVECT  vec;
+double  *mp;
+{
+	int  x, y;
+	RAY  thisray;
+	register int  i;
+
+	if (sscanf(s, "%lf", mp) != 1)
+		*mp = 1.0;
+	else if (*mp < -FTINY)		/* negative zoom is reduction */
+		*mp = -1.0 / *mp;
+	else if (*mp <= FTINY) {	/* too small */
+		error(COMMAND, "illegal magnification");
+		return(-1);
+	}
+	if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) {
+		if (dev->getcur == NULL)
+			return(-1);
+		(*dev->comout)("Pick view center\n");
+		if ((*dev->getcur)(&x, &y) == ABORT)
+			return(-1);
+		rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5);
+		if (!direc || ourview.type == VT_PAR) {
+			rayorigin(&thisray, NULL, PRIMARY, 1.0);
+			if (!localhit(&thisray, &thescene)) {
+				error(COMMAND, "not a local object");
+				return(-1);
+			}
+		}
+		if (direc)
+			if (ourview.type == VT_PAR)
+				for (i = 0; i < 3; i++)
+					vec[i] = thisray.rop[i] - ourview.vp[i];
+			else
+				VCOPY(vec, thisray.rdir);
+		else
+			VCOPY(vec, thisray.rop);
+	} else if (direc)
+			for (i = 0; i < 3; i++)
+				vec[i] -= ourview.vp[i];
+	return(0);
+}
+
+
 float *		/* keep consistent with COLOR typedef */
 greyof(col)				/* convert color to greyscale */
 register COLOR  col;
@@ -68,7 +163,7 @@ newimage()				/* start a new image */
 	freepkids(&ptrunk);
 						/* set up frame */
 	if (ourview.hresolu > dev->xsiz || ourview.vresolu > dev->ysiz)
-		error(USER, "resolution mismatch");
+		newview(&ourview);		/* beware recursive loop! */
 	pframe.l = pframe.d = 0;
 	pframe.r = ourview.hresolu; pframe.u = ourview.vresolu;
 	pdepth = 0;
@@ -247,41 +342,56 @@ register VIEW  *vp;
 {
 	char  *err;
 
-	if (vp->hresolu > dev->xsiz || vp->vresolu > dev->ysiz) {
-		error(COMMAND, "view not set - resolution mismatch");
-	} else if ((err = setview(vp)) != NULL) {
+	if (vp->hresolu > dev->xsiz || vp->vresolu > dev->ysiz)	/* shrink */
+		if (vp->vresolu * dev->xsiz < vp->hresolu * dev->ysiz) {
+			vp->vresolu = dev->xsiz * vp->vresolu / vp->hresolu;
+			vp->hresolu = dev->xsiz;
+		} else {
+			vp->hresolu = dev->ysiz * vp->hresolu / vp->vresolu;
+			vp->vresolu = dev->ysiz;
+		}
+	if ((err = setview(vp)) != NULL) {
 		sprintf(errmsg, "view not set - %s", err);
 		error(COMMAND, errmsg);
 	} else if (bcmp(vp, &ourview, sizeof(VIEW))) {
 		bcopy(&ourview, &oldview, sizeof(VIEW));
 		bcopy(vp, &ourview, sizeof(VIEW));
-		newimage();
+		newimage();		/* newimage() calls with vp=&ourview! */
 	}
 }
 
 
-moveview(angle, mag, vc)			/* move viewpoint */
-double  angle, mag;
+moveview(angle, elev, mag, vc)			/* move viewpoint */
+double  angle, elev, mag;
 FVECT  vc;
 {
 	extern double  sqrt(), dist2();
 	double  d;
+	FVECT  v1;
 	VIEW  nv;
 	register int  i;
 
 	VCOPY(nv.vup, ourview.vup);
 	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
 	spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
-	d = sqrt(dist2(ourview.vp, vc)) / mag;
-	for (i = 0; i < 3; i++)
-		nv.vp[i] = vc[i] - d*nv.vdir[i];
+	if (elev != 0.0) {
+		fcross(v1, ourview.vup, nv.vdir);
+		normalize(v1);
+		spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
+	}
 	if ((nv.type = ourview.type) == VT_PAR) {
 		nv.horiz = ourview.horiz / mag;
 		nv.vert = ourview.vert / mag;
+		d = 0.0;			/* don't move closer */
+		for (i = 0; i < 3; i++)
+			d += (vc[i] - ourview.vp[i])*ourview.vdir[i];
 	} else {
 		nv.horiz = ourview.horiz;
 		nv.vert = ourview.vert;
+		d = sqrt(dist2(ourview.vp, vc)) / mag;
 	}
+	for (i = 0; i < 3; i++)
+		nv.vp[i] = vc[i] - d*nv.vdir[i];
 	newview(&nv);
 }