--- ray/src/util/rad.c	1993/05/27 17:41:46	2.10
+++ ray/src/util/rad.c	1993/07/22 12:39:51	2.16
@@ -105,6 +105,7 @@ extern long	fdate(), time();
 
 long	scenedate;		/* date of latest scene or object file */
 long	octreedate;		/* date of octree */
+long	matdate;		/* date of latest material file */
 
 int	explicate = 0;		/* explicate variables */
 int	silent = 0;		/* do work silently */
@@ -423,6 +424,9 @@ checkfiles()			/* check for existence and modified tim
 				vnam(OCTREE), vnam(SCENE));
 		exit(1);
 	}
+	matdate = -1;
+	if (vdef(MATERIAL))
+		matdate = checklast(vval(MATERIAL));
 }	
 
 
@@ -561,11 +565,12 @@ checkambfile()			/* check date on ambient file */
 {
 	long	afdate;
 
-	if (vdef(AMBFILE)) {
-		afdate = fdate(vval(AMBFILE));
-		if (afdate >= 0 & octreedate > afdate)
-			rmfile(vval(AMBFILE));
-	}
+	if (!vdef(AMBFILE))
+		return;
+	if ((afdate = fdate(vval(AMBFILE))) < 0)
+		return;
+	if (octreedate > afdate | matdate > afdate)
+		rmfile(vval(AMBFILE));
 }
 
 
@@ -629,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");
@@ -697,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();
@@ -762,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();
@@ -799,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) {
@@ -818,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));
 }
@@ -1015,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 */
@@ -1045,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) {
@@ -1052,11 +1066,11 @@ 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);
-		if (fdate(rawfile) > octreedate)	/* recover */
+		if (fdate(rawfile) >= octreedate)	/* recover */
 			sprintf(combuf, "rpict%s%s -ro %s %s",
 					rep, opts, rawfile, vval(OCTREE));
 		else {