--- ray/src/rt/rv2.c	1991/12/23 23:18:31	2.4
+++ ray/src/rt/rv2.c	1992/02/18 16:38:51	2.7
@@ -24,6 +24,13 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #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;
@@ -86,7 +93,7 @@ char  *s;
 	(*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 (sscanvec(buf, nv.vp))
 		change++;
 	else
 		VCOPY(nv.vp, ourview.vp);
@@ -95,7 +102,7 @@ char  *s;
 	(*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 (sscanvec(buf, nv.vdir))
 		change++;
 	else
 		VCOPY(nv.vdir, ourview.vdir);
@@ -104,7 +111,7 @@ char  *s;
 	(*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 (sscanvec(buf, nv.vup))
 		change++;
 	else
 		VCOPY(nv.vup, ourview.vup);
@@ -290,7 +297,7 @@ char  *s;
 			e *= atof(cp);
 	}
 	if (p != NULL) {		/* relative setting */
-		if (bright(p->v) <= FTINY) {
+		if (bright(p->v) < 1e-25) {
 			error(COMMAND, "cannot normalize to zero");
 			return;
 		}
@@ -387,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;
 	}
@@ -462,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:;
@@ -495,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;