--- ray/src/rt/rv2.c	1991/10/29 12:06:44	1.32
+++ ray/src/rt/rv2.c	1992/01/17 09:27:17	2.6
@@ -18,10 +18,19 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "rpaint.h"
 
+#include  "resolu.h"
+
 #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;
@@ -73,7 +82,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++;
@@ -83,8 +92,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);
@@ -92,8 +101,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);
@@ -101,8 +110,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);
@@ -110,7 +119,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 {
@@ -120,7 +129,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 {
@@ -142,7 +151,7 @@ char  *s;
 	if (sscanf(s, "%s", buf) == 1) {	/* get parameters from a file */
 		copystruct(&nv, &stdview);
 		if ((fname = getpath(buf, NULL, 0)) == NULL ||
-				(success = viewfile(fname, &nv, 0, 0)) == -1) {
+				(success = viewfile(fname, &nv, NULL)) == -1) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
 			error(COMMAND, errmsg);
 			return;
@@ -244,7 +253,6 @@ register char  *s;
 getexposure(s)				/* get new exposure */
 char  *s;
 {
-	double  atof(), pow(), fabs();
 	char  buf[128];
 	register char  *cp;
 	register PNODE  *p;
@@ -339,7 +347,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' ||
@@ -386,11 +394,13 @@ register char  *s;
 	extern int  directinvis;
 	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;
 	}
@@ -461,20 +471,32 @@ register char  *s;
 			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:;
@@ -494,9 +516,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;
@@ -583,7 +604,7 @@ char  *s;
 		fputaspect(dev->pixaspect, fp);
 	fputformat(COLRFMT, fp);
 	putc('\n', fp);
-	fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp);
+	fprtresolu(hresolu, vresolu, fp);
 
 	scanline = (COLR *)malloc(hresolu*sizeof(COLR));
 	if (scanline == NULL) {