--- ray/src/rt/rv2.c	1991/11/11 17:42:19	1.33
+++ ray/src/rt/rv2.c	1993/06/02 21:04:02	2.16
@@ -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";
@@ -22,8 +22,15 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <ctype.h>
 
-#define  CTRL(c)	('c'-'@')
+#define  CTRL(c)	((c)-'@')
 
+#ifdef  SMLFLT
+#define  sscanvec(s,v)	(sscanf(s,"%f %f %f",v,v+1,v+2)==3)
+#else
+#define  sscanvec(s,v)	(sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
+#endif
+
+
 extern char  VersionID[];
 extern char  *progname;
 extern char  *octname;
@@ -58,6 +65,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 +92,7 @@ char  *s;
 	sprintf(buf, "view type (%c): ", ourview.type);
 	(*dev->comout)(buf);
 	(*dev->comin)(buf, NULL);
-	if (buf[0] == CTRL(C)) return;
+	if (buf[0] == CTRL('C')) return;
 	if (buf[0] && buf[0] != ourview.type) {
 		nv.type = buf[0];
 		change++;
@@ -85,8 +102,8 @@ char  *s;
 			ourview.vp[0], ourview.vp[1], ourview.vp[2]);
 	(*dev->comout)(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)
+	if (buf[0] == CTRL('C')) return;
+	if (sscanvec(buf, nv.vp))
 		change++;
 	else
 		VCOPY(nv.vp, ourview.vp);
@@ -94,8 +111,8 @@ char  *s;
 			ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
 	(*dev->comout)(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)
+	if (buf[0] == CTRL('C')) return;
+	if (sscanvec(buf, nv.vdir))
 		change++;
 	else
 		VCOPY(nv.vdir, ourview.vdir);
@@ -103,8 +120,8 @@ char  *s;
 			ourview.vup[0], ourview.vup[1], ourview.vup[2]);
 	(*dev->comout)(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)
+	if (buf[0] == CTRL('C')) return;
+	if (sscanvec(buf, nv.vup))
 		change++;
 	else
 		VCOPY(nv.vup, ourview.vup);
@@ -112,7 +129,7 @@ char  *s;
 			ourview.horiz, ourview.vert);
 	(*dev->comout)(buf);
 	(*dev->comin)(buf, NULL);
-	if (buf[0] == CTRL(C)) return;
+	if (buf[0] == CTRL('C')) return;
 	if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
 		change++;
 	else {
@@ -122,7 +139,7 @@ char  *s;
 			ourview.hoff, ourview.voff);
 	(*dev->comout)(buf);
 	(*dev->comin)(buf, NULL);
-	if (buf[0] == CTRL(C)) return;
+	if (buf[0] == CTRL('C')) return;
 	if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
 		change++;
 	else {
@@ -169,7 +186,6 @@ char  *s;
 getaim(s)				/* aim camera */
 char  *s;
 {
-	extern double  tan(), atan();
 	double  zfact;
 	VIEW  nv;
 
@@ -200,7 +216,6 @@ char  *s;
 getrotate(s)				/* rotate camera */
 char  *s;
 {
-	extern double  normalize(), tan(), atan();
 	VIEW  nv;
 	FVECT  v1;
 	double  angle, elev, zfact;
@@ -246,16 +261,20 @@ register char  *s;
 getexposure(s)				/* get new exposure */
 char  *s;
 {
-	double  atof(), pow(), fabs();
 	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;
@@ -265,7 +284,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;
@@ -273,7 +291,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++)
@@ -281,9 +299,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));
@@ -291,11 +306,14 @@ char  *s;
 			e *= atof(cp);
 	}
 	if (p != NULL) {		/* relative setting */
-		if (bright(p->v) <= FTINY) {
+		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;
@@ -341,7 +359,7 @@ register union {int i; double d; COLOR C;}  *ptr;
 	case 'b':			/* boolean */
 		if (sscanf(str, "%1s", buf) != 1) {
 			(*dev->comout)(dsc);
-			sprintf(buf, " (%c): ", ptr->i ? 'y' : 'n');
+			sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
 			(*dev->comout)(buf);
 			(*dev->comin)(buf, NULL);
 			if (buf[0] == '\0' ||
@@ -380,19 +398,20 @@ register char  *s;
 	extern double  shadcert;
 	extern COLOR  ambval;
 	extern double  ambacc;
-	extern double  minarad;
 	extern int  ambres;
 	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;
+	extern double  specthresh;
 	char  buf[128];
 	
 	if (s[0] == '\0') {
 		(*dev->comout)(
-			"aa ab ad ar as av b dc di dj ds dt i lr lw sp st: ");
+		"aa ab ad ar as av b dc di dj ds dt i lr lw ps pt sj st: ");
 		(*dev->comin)(buf, NULL);
 		s = buf;
 	}
@@ -420,9 +439,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);
@@ -440,7 +459,7 @@ 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);
@@ -456,27 +475,38 @@ register char  *s;
 			break;
 		case 'r':
 			if (getparam(s+2, "ambient resolution", 'i', &ambres))
-				minarad = ambres > 0 ?
-						thescene.cusize/ambres : 0.0;
+				setambres(ambres);
 			break;
 		default:
 			goto badparam;
 		}
 		break;
-	case 's':			/* sample */
+	case 'p':			/* pixel */
 		switch (s[1]) {
-		case 'p':			/* pixel */
-			if (getparam(s+2, "sample pixel", 'i', &psample))
+		case 's':			/* sample */
+			if (getparam(s+2, "pixel sample", 'i', &psample))
 				pdepth = 0;
 			break;
 		case 't':			/* threshold */
-			if (getparam(s+2, "sample threshold", 'r', &maxdiff))
+			if (getparam(s+2, "pixel threshold", 'r', &maxdiff))
 				pdepth = 0;
 			break;
 		default:
 			goto badparam;
 		}
 		break;
+	case 's':			/* specular */
+		switch (s[1]) {
+		case 'j':			/* jitter */
+			getparam(s+2, "specular jitter", 'r', &specjitter);
+			break;
+		case 't':			/* threshold */
+			getparam(s+2, "specular threshold", 'r', &specthresh);
+			break;
+		default:
+			goto badparam;
+		}
+		break;
 	case '\0':			/* nothing */
 		break;
 	default:;
@@ -496,9 +526,8 @@ char  *s;
 	int  x, y;
 	RAY  thisray;
 
-	if (sscanf(s, "%lf %lf %lf %lf %lf %lf",
-		&thisray.rorg[0], &thisray.rorg[1], &thisray.rorg[2],
-		&thisray.rdir[0], &thisray.rdir[1], &thisray.rdir[2]) != 6) {
+	if (!sscanvec(s, thisray.rorg) ||
+			!sscanvec(sskip(sskip(sskip(s))), thisray.rdir)) {
 
 		if (dev->getcur == NULL)
 			return;
@@ -568,6 +597,9 @@ char  *s;
 		error(COMMAND, errmsg);
 		return;
 	}
+#ifdef MSDOS
+	setmode(fileno(fp), O_BINARY);
+#endif
 	(*dev->comout)("writing \"");
 	(*dev->comout)(fname);
 	(*dev->comout)("\"...\n");