--- ray/src/util/rad.c	1993/06/14 10:49:08	2.11
+++ ray/src/util/rad.c	1993/08/09 17:50:09	2.17
@@ -626,7 +626,7 @@ register char	*op;
 		op = addarg(op, "-ds .4");
 	else
 		op = addarg(op, "-ds 0");
-	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .7");
+	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
 	if (vdef(AMBFILE)) {
 		sprintf(op, " -af %s", vval(AMBFILE));
 		op += strlen(op);
@@ -634,13 +634,13 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .4 -ad 32");
+		op = addarg(op, "-aa .4 -ad 64");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .3 -ad 64");
+		op = addarg(op, "-aa .3 -ad 128");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .25 -ad 128");
+		op = addarg(op, "-aa .25 -ad 256");
 		break;
 	}
 	op = addarg(op, "-as 0");
@@ -690,7 +690,7 @@ register char	*op;
 		op = addarg(op, "-ds .2 -dj .35");
 	else
 		op = addarg(op, "-ds .3");
-	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .15");
+	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
 	if (overture = vint(INDIRECT)) {
 		sprintf(op, " -ab %d", overture);
 		op += strlen(op);
@@ -702,13 +702,13 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .25 -ad 128 -as 0");
+		op = addarg(op, "-aa .25 -ad 196 -as 0");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .2 -ad 300 -as 64");
+		op = addarg(op, "-aa .2 -ad 400 -as 64");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .15 -ad 500 -as 128");
+		op = addarg(op, "-aa .15 -ad 768 -as 196");
 		break;
 	}
 	d = ambval();
@@ -757,7 +757,7 @@ register char	*op;
 		op = addarg(op, "-ds .1 -dj .7");
 	else
 		op = addarg(op, "-ds .2");
-	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .03");
+	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
 	sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
 	op += strlen(op);
 	if (vdef(AMBFILE)) {
@@ -767,13 +767,13 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .15 -ad 200 -as 0");
+		op = addarg(op, "-aa .15 -ad 256 -as 0");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .125 -ad 512 -as 128");
+		op = addarg(op, "-aa .125 -ad 512 -as 256");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .08 -ad 850 -as 256");
+		op = addarg(op, "-aa .08 -ad 1024 -as 512");
 		break;
 	}
 	d = ambval();
@@ -804,7 +804,7 @@ char	*ro;
 		fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666);
 		if (fd < 0 || write(fd, ro, n) != n || close(fd) < 0)
 			syserr(vval(OPTFILE));
-		sprintf(ro, " \"^%s\"", vval(OPTFILE));
+		sprintf(ro, " @%s", vval(OPTFILE));
 	}
 #ifdef MSDOS
 	else if (n > 50) {
@@ -823,8 +823,14 @@ register char	*po;
 		po = addarg(po, "-1 -e");
 		po = addarg(po, vval(EXPOSURE));
 	}
-	if (vscale(QUALITY) == HIGH)
-		po = addarg(po, "-r .65");
+	switch (vscale(QUALITY)) {
+	case MEDIUM:
+		po = addarg(po, "-r 1");
+		break;
+	case HIGH:
+		po = addarg(po, "-m .25");
+		break;
+	}
 	if (vdef(PFILT))
 		po = addarg(po, vval(PFILT));
 }
@@ -1020,6 +1026,7 @@ char	*opts;
 	char	pfopts[128];
 	char	vs[32], *vw;
 	int	vn, mult;
+	long	lastdate;
 					/* get pfilt options */
 	pfiltopts(pfopts);
 					/* get resolution, reporting */
@@ -1050,6 +1057,8 @@ char	*opts;
 		else
 			badvalue(REPORT);
 	}
+					/* get update time */
+	lastdate = octreedate > matdate ? octreedate : matdate;
 					/* do each view */
 	vn = 0;
 	while ((vw = getview(vn++, vs)) != NULL) {
@@ -1057,7 +1066,7 @@ char	*opts;
 			sprintf(vs, "%d", vn);
 		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
 						/* check date on picture */
-		if (fdate(picfile) >= octreedate)
+		if (fdate(picfile) >= lastdate)
 			continue;
 						/* build rpict command */
 		sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);