--- ray/src/rt/rv2.c	1990/01/08 13:38:05	1.14
+++ ray/src/rt/rv2.c	1991/07/18 15:49:06	1.23
@@ -63,13 +63,14 @@ char  *s;
 		}
 		fputs(progname, fp);
 		fprintview(&ourview, fp);
+		fputs(sskip(s), fp);
 		fputs("\n", fp);
 		fclose(fp);
 		return;
 	}
 	sprintf(buf, "view type (%c): ", ourview.type);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (buf[0] && buf[0] != ourview.type) {
 		nv.type = buf[0];
@@ -79,7 +80,7 @@ char  *s;
 	sprintf(buf, "view point (%.6g %.6g %.6g): ",
 			ourview.vp[0], ourview.vp[1], ourview.vp[2]);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3)
 		change++;
@@ -88,7 +89,7 @@ char  *s;
 	sprintf(buf, "view direction (%.6g %.6g %.6g): ",
 			ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3)
 		change++;
@@ -97,7 +98,7 @@ char  *s;
 	sprintf(buf, "view up (%.6g %.6g %.6g): ",
 			ourview.vup[0], ourview.vup[1], ourview.vup[2]);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3)
 		change++;
@@ -106,7 +107,7 @@ char  *s;
 	sprintf(buf, "view horiz and vert size (%.6g %.6g): ",
 			ourview.horiz, ourview.vert);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
 		change++;
@@ -116,7 +117,7 @@ char  *s;
 	sprintf(buf, "view shift and lift (%.6g %.6g): ",
 			ourview.hoff, ourview.voff);
 	(*dev->comout)(buf);
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL(C)) return;
 	if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
 		change++;
@@ -137,9 +138,9 @@ char  *s;
 	VIEW  nv;
 
 	if (sscanf(s, "%s", buf) == 1) {	/* get parameters from a file */
-		copyview(&nv, &stdview);
+		copystruct(&nv, &stdview);
 		if ((fname = getpath(buf, NULL, 0)) == NULL ||
-				(success = viewfile(fname, &nv)) == -1) {
+				(success = viewfile(fname, &nv, 0, 0)) == -1) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
 			error(COMMAND, errmsg);
 			return;
@@ -150,13 +151,13 @@ char  *s;
 			newview(&nv);
 		return;
 	}
-	if (oldview.horiz == 0) {	/* no old view! */
+	if (oldview.type == 0) {	/* no old view! */
 		error(COMMAND, "no previous view");
 		return;
 	}
-	copyview(&nv, &ourview);
-	copyview(&ourview, &oldview);
-	copyview(&oldview, &nv);
+	copystruct(&nv, &ourview);
+	copystruct(&ourview, &oldview);
+	copystruct(&oldview, &nv);
 	newimage();
 }
 
@@ -170,18 +171,12 @@ char  *s;
 
 	if (getinterest(s, 1, nv.vdir, &zfact) < 0)
 		return;
+	nv.type = ourview.type;
 	VCOPY(nv.vp, ourview.vp);
 	VCOPY(nv.vup, ourview.vup);
 	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
-	if ((nv.type = ourview.type) == VT_PAR) {
-		nv.horiz = ourview.horiz / zfact;
-		nv.vert = ourview.vert / zfact;
-	} else {
-		nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) /
-				(PI/180./2.);
-		nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) /
-				(PI/180./2.);
-	}
+	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
+	zoomview(&nv, zfact);
 	newview(&nv);
 }
 
@@ -211,6 +206,7 @@ char  *s;
 		error(COMMAND, "missing angle");
 		return;
 	}
+	nv.type = ourview.type;
 	VCOPY(nv.vp, ourview.vp);
 	VCOPY(nv.vup, ourview.vup);
 	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
@@ -220,15 +216,8 @@ char  *s;
 		normalize(v1);
 		spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
 	}
-	if ((nv.type = ourview.type) == VT_PAR) {
-		nv.horiz = ourview.horiz / zfact;
-		nv.vert = ourview.vert / zfact;
-	} else {
-		nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) /
-				(PI/180./2.);
-		nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) /
-				(PI/180./2.);
-	}
+	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
+	zoomview(&nv, zfact);
 	newview(&nv);
 }
 
@@ -282,7 +271,7 @@ char  *s;
 			if (*cp == '\0') {	/* interactive */
 				sprintf(buf, "exposure (%lf): ", exposure);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				for (cp = buf; isspace(*cp); cp++)
 					;
 				if (*cp == '\0')
@@ -329,13 +318,16 @@ register char  *s;
 	extern int  ambdiv;
 	extern int  ambssamp;
 	extern int  ambounce;
+	extern int  directinvis;
+	extern int  do_irrad;
 	int  i0;
 	double  d0, d1, d2;
-	char  buf[128];
+	char  buf[128], ans[4];
 	
 	if (s[0] == '\0') {
-		(*dev->comout)("aa ab ad ar as av dc dj dt lr lw sp st: ");
-		(*dev->comin)(buf);
+		(*dev->comout)(
+			"aa ab ad ar as av b dc dj di dt i lr lw sp st: ");
+		(*dev->comin)(buf, NULL);
 		s = buf;
 	}
 	switch (s[0]) {
@@ -346,7 +338,7 @@ register char  *s;
 				sprintf(buf, "limit weight (%.6g): ",
 						minweight);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -357,7 +349,7 @@ register char  *s;
 				sprintf(buf, "limit reflection (%d): ",
 						maxdepth);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -374,7 +366,7 @@ register char  *s;
 				sprintf(buf, "direct jitter (%.6g): ",
 						dstrsrc);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -385,7 +377,7 @@ register char  *s;
 				sprintf(buf, "direct certainty (%.6g): ",
 						shadcert);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -396,16 +388,49 @@ register char  *s;
 				sprintf(buf, "direct threshold (%.6g): ",
 						shadthresh);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
 			shadthresh = d0;
 			break;
+		case 'i':			/* invisibility */
+			if (sscanf(s+2, "%1s", ans) != 1) {
+				sprintf(buf, "direct invisibility (%c): ",
+						directinvis ? 'y' : 'n');
+				(*dev->comout)(buf);
+				(*dev->comin)(buf, NULL);
+				if (sscanf(buf, "%1s", ans) != 1)
+					break;
+			}
+			directinvis = tolower(ans[0]) == 'y';
+			break;
 		default:
 			goto badparam;
 		}
 		break;
+	case 'b':			/* black and white */
+		if (sscanf(s+1, "%1s", ans) != 1) {
+			sprintf(buf, "black and white (%c): ",
+					greyscale ? 'y' : 'n');
+			(*dev->comout)(buf);
+			(*dev->comin)(buf, NULL);
+			if (sscanf(buf, "%1s", ans) != 1)
+				break;
+		}
+		greyscale = tolower(ans[0]) == 'y';
+		break;
+	case 'i':			/* irradiance */
+		if (sscanf(s+1, "%1s", ans) != 1) {
+			sprintf(buf, "irradiance (%c): ",
+					do_irrad ? 'y' : 'n');
+			(*dev->comout)(buf);
+			(*dev->comin)(buf, NULL);
+			if (sscanf(buf, "%1s", ans) != 1)
+				break;
+		}
+		do_irrad = tolower(ans[0]) == 'y';
+		break;
 	case 'a':			/* ambient */
 		switch (s[1]) {
 		case 'v':			/* value */
@@ -416,7 +441,7 @@ register char  *s;
 						colval(ambval,GRN),
 						colval(ambval,BLU));
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf %lf %lf",
 						&d0, &d1, &d2) != 3)
 					break;
@@ -428,7 +453,7 @@ register char  *s;
 				sprintf(buf, "ambient accuracy (%.6g): ",
 						ambacc);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -439,7 +464,7 @@ register char  *s;
 				sprintf(buf, "ambient divisions (%d): ",
 						ambdiv);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -450,7 +475,7 @@ register char  *s;
 				sprintf(buf, "ambient super-samples (%d): ",
 						ambssamp);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -461,7 +486,7 @@ register char  *s;
 				sprintf(buf, "ambient bounces (%d): ",
 						ambounce);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -472,7 +497,7 @@ register char  *s;
 				sprintf(buf, "ambient resolution (%d): ",
 						ambres);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -489,7 +514,7 @@ register char  *s;
 			if (sscanf(s+2, "%d", &i0) != 1) {
 				sprintf(buf, "sample pixel (%d): ", psample);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%d", &i0) != 1)
 					break;
 			}
@@ -501,7 +526,7 @@ register char  *s;
 				sprintf(buf, "sample threshold (%.6g): ",
 						maxdiff);
 				(*dev->comout)(buf);
-				(*dev->comin)(buf);
+				(*dev->comin)(buf, NULL);
 				if (sscanf(buf, "%lf", &d0) != 1)
 					break;
 			}
@@ -540,9 +565,12 @@ char  *s;
 		if ((*dev->getcur)(&x, &y) == ABORT)
 			return;
 
-		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;
+		}
+
 	} else if (normalize(thisray.rdir) == 0.0) {
 		error(COMMAND, "zero ray direction");
 		return;
@@ -560,7 +588,7 @@ char  *s;
 				ofun[thisray.ro->otype].funame,
 				thisray.ro->oname);
 		(*dev->comout)(buf);
-		(*dev->comin)(buf);
+		(*dev->comin)(buf, NULL);
 		if (thisray.rot >= FHUGE)
 			(*dev->comout)("at infinity");
 		else {
@@ -568,14 +596,14 @@ char  *s;
 					thisray.rop[1], thisray.rop[2]);
 			(*dev->comout)(buf);
 		}
-		(*dev->comin)(buf);
+		(*dev->comin)(buf, NULL);
 		sprintf(buf, "with value (%.6g %.6g %.6g)",
 				colval(thisray.rcol,RED),
 				colval(thisray.rcol,GRN),
 				colval(thisray.rcol,BLU));
 		(*dev->comout)(buf);
 	}
-	(*dev->comin)(buf);
+	(*dev->comin)(buf, NULL);
 }
 
 
@@ -607,6 +635,9 @@ char  *s;
 	putc('\n', fp);
 	if (exposure != 1.0)
 		fputexpos(exposure, fp);
+	if (dev->pixaspect != 1.0)
+		fputaspect(dev->pixaspect, fp);
+	fputformat(COLRFMT, fp);
 	putc('\n', fp);
 	fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp);