--- ray/src/rt/rv2.c	1992/03/04 16:52:10	2.8
+++ ray/src/rt/rv2.c	1993/09/09 14:57:53	2.21
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1993 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -30,7 +30,12 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  sscanvec(s,v)	(sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
 #endif
 
+extern char  *atos();
 
+extern FILE  *popen();
+
+extern char  rifname[128];		/* rad input file name */
+
 extern char  VersionID[];
 extern char  *progname;
 extern char  *octname;
@@ -65,6 +70,16 @@ char  *s;
 	int  change = 0;
 	VIEW  nv;
 
+	while (isspace(*s))
+		s++;
+	if (*s == '-') {			/* command line parameters */
+		copystruct(&nv, &ourview);
+		if (sscanview(&nv, s))
+			newview(&nv);
+		else
+			error(COMMAND, "bad view option(s)");
+		return;
+	}
 	if (sscanf(s, "%s", buf) == 1) {	/* write parameters to a file */
 		if ((fname = getpath(buf, NULL, 0)) == NULL ||
 				(fp = fopen(fname, "a")) == NULL) {
@@ -75,7 +90,7 @@ char  *s;
 		fputs(progname, fp);
 		fprintview(&ourview, fp);
 		fputs(sskip(s), fp);
-		fputs("\n", fp);
+		putc('\n', fp);
 		fclose(fp);
 		return;
 	}
@@ -150,7 +165,7 @@ char  *s;
 
 	if (sscanf(s, "%s", buf) == 1) {	/* get parameters from a file */
 		copystruct(&nv, &stdview);
-		if ((fname = getpath(buf, NULL, 0)) == NULL ||
+		if ((fname = getpath(buf, "", R_OK)) == NULL ||
 				(success = viewfile(fname, &nv, NULL)) == -1) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
 			error(COMMAND, errmsg);
@@ -173,10 +188,86 @@ char  *s;
 }
 
 
+saveview(s)				/* save view to rad file */
+char  *s;
+{
+	char  view[64];
+	char  *fname;
+	FILE  *fp;
+
+	if (*atos(view, sizeof(view), s)) {
+		if (isint(view)) {
+			error(COMMAND, "cannot write view by number");
+			return;
+		}
+		s = sskip(s);
+	}
+	while (isspace(*s))
+		s++;
+	if (*s)
+		atos(rifname, sizeof(rifname), s);
+	else if (rifname[0] == '\0') {
+		error(COMMAND, "no previous rad file");
+		return;
+	}
+	if ((fname = getpath(rifname, NULL, 0)) == NULL ||
+			(fp = fopen(fname, "a")) == NULL) {
+		sprintf(errmsg, "cannot open \"%s\"", rifname);
+		error(COMMAND, errmsg);
+		return;
+	}
+	fputs("view= ", fp);
+	fputs(view, fp);
+	fprintview(&ourview, fp);
+	putc('\n', fp);
+	fclose(fp);
+}
+
+
+loadview(s)				/* load view from rad file */
+char  *s;
+{
+	char  buf[512];
+	char  *fname;
+	FILE  *fp;
+	VIEW  nv;
+
+	strcpy(buf, "rad -n -s -V -v ");
+	if (sscanf(s, "%s", buf+strlen(buf)) == 1)
+		s = sskip(s);
+	else
+		strcat(buf, "1");
+	if (*s)
+		atos(rifname, sizeof(rifname), s);
+	else if (rifname[0] == '\0') {
+		error(COMMAND, "no previous rad file");
+		return;
+	}
+	if ((fname = getpath(rifname, "", R_OK)) == NULL) {
+		sprintf(errmsg, "cannot access \"%s\"", rifname);
+		error(COMMAND, errmsg);
+		return;
+	}
+	sprintf(buf+strlen(buf), " %s", fname);
+	if ((fp = popen(buf, "r")) == NULL) {
+		error(COMMAND, "cannot run rad");
+		return;
+	}
+	buf[0] = '\0';
+	fgets(buf, sizeof(buf), fp);
+	pclose(fp);
+	copystruct(&nv, &stdview);
+	if (!sscanview(&nv, buf)) {
+		error(COMMAND, "rad error -- no such view?");
+		return;
+	}
+	newview(&nv);
+}
+
+
 getaim(s)				/* aim camera */
 char  *s;
 {
-	extern double  tan(), atan();
 	double  zfact;
 	VIEW  nv;
 
@@ -207,7 +298,6 @@ char  *s;
 getrotate(s)				/* rotate camera */
 char  *s;
 {
-	extern double  normalize(), tan(), atan();
 	VIEW  nv;
 	FVECT  v1;
 	double  angle, elev, zfact;
@@ -255,13 +345,18 @@ char  *s;
 {
 	char  buf[128];
 	register char  *cp;
-	register PNODE  *p;
 	RECT  r;
 	int  x, y;
-	double  e;
-
+	register PNODE  *p = &ptrunk;
+	int  adapt = 0;
+	double  e = 1.0;
+start:
 	for (cp = s; isspace(*cp); cp++)
 		;
+	if (*cp == '@') {
+		adapt++;
+		goto start;
+	}
 	if (*cp == '\0') {		/* normalize to point */
 		if (dev->getcur == NULL)
 			return;
@@ -271,7 +366,6 @@ char  *s;
 		r.l = r.d = 0;
 		r.r = hresolu; r.u = vresolu;
 		p = findrect(x, y, &ptrunk, &r, -1);
-		e = 1.0;
 	} else {
 		if (*cp == '=') {	/* absolute setting */
 			p = NULL;
@@ -279,7 +373,7 @@ char  *s;
 			for (cp++; isspace(*cp); cp++)
 				;
 			if (*cp == '\0') {	/* interactive */
-				sprintf(buf, "exposure (%lf): ", exposure);
+				sprintf(buf, "exposure (%f): ", exposure);
 				(*dev->comout)(buf);
 				(*dev->comin)(buf, NULL);
 				for (cp = buf; isspace(*cp); cp++)
@@ -287,9 +381,6 @@ char  *s;
 				if (*cp == '\0')
 					return;
 			}
-		} else {		/* normalize to average */
-			p = &ptrunk;
-			e = 1.0;
 		}
 		if (*cp == '+' || *cp == '-')	/* f-stops */
 			e *= pow(2.0, atof(cp));
@@ -297,11 +388,14 @@ char  *s;
 			e *= atof(cp);
 	}
 	if (p != NULL) {		/* relative setting */
-		if (bright(p->v) < 1e-25) {
+		if (bright(p->v) < 1e-15) {
 			error(COMMAND, "cannot normalize to zero");
 			return;
 		}
-		e *= 0.5 / bright(p->v);
+		if (adapt)
+			e *= 106./pow(1.219+pow(luminance(p->v)/exposure,.4),2.5)/exposure;
+		else
+			e *= 0.5 / bright(p->v);
 	}
 	if (e <= FTINY || fabs(1.0 - e) <= FTINY)
 		return;
@@ -390,7 +484,7 @@ register char  *s;
 	extern int  ambdiv;
 	extern int  ambssamp;
 	extern int  ambounce;
-	extern int  directinvis;
+	extern int  directvis;
 	extern double  srcsizerat;
 	extern int  do_irrad;
 	extern double  specjitter;
@@ -427,9 +521,9 @@ register char  *s;
 		case 't':			/* threshold */
 			getparam(s+2, "direct threshold", 'r', &shadthresh);
 			break;
-		case 'i':			/* invisibility */
-			getparam(s+2, "direct invisibility",
-					'b', &directinvis);
+		case 'v':			/* visibility */
+			getparam(s+2, "direct visibility",
+					'b', &directvis);
 			break;
 		case 's':			/* sampling */
 			getparam(s+2, "direct sampling", 'r', &srcsizerat);
@@ -447,10 +541,11 @@ register char  *s;
 	case 'a':			/* ambient */
 		switch (s[1]) {
 		case 'v':			/* value */
-			getparam(s+2, "ambient value", 'C', ambval);
+			getparam(s+2, "ambient value", 'C', (COLOR *)ambval);
 			break;
 		case 'a':			/* accuracy */
-			getparam(s+2, "ambient accuracy", 'r', &ambacc);
+			if (getparam(s+2, "ambient accuracy", 'r', &ambacc))
+				setambacc(ambacc);
 			break;
 		case 'd':			/* divisions */
 			getparam(s+2, "ambient divisions", 'i', &ambdiv);
@@ -575,7 +670,11 @@ char  *s;
 	COLR  *scanline;
 	int  y;
 
-	if (sscanf(s, "%s", buf) != 1 && buf[0] == '\0') {
+	while (isspace(*s))
+		s++;
+	if (*s)
+		atos(buf, sizeof(buf), s);
+	else if (buf[0] == '\0') {
 		error(COMMAND, "no file");
 		return;
 	}
@@ -585,6 +684,9 @@ char  *s;
 		error(COMMAND, errmsg);
 		return;
 	}
+#ifdef MSDOS
+	setmode(fileno(fp), O_BINARY);
+#endif
 	(*dev->comout)("writing \"");
 	(*dev->comout)(fname);
 	(*dev->comout)("\"...\n");