--- ray/src/util/rad.c	2010/10/10 09:25:45	2.102
+++ ray/src/util/rad.c	2013/08/12 21:01:00	2.108
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rad.c,v 2.102 2010/10/10 09:25:45 greg Exp $";
+static const char	RCSid[] = "$Id: rad.c,v 2.108 2013/08/12 21:01:00 greg Exp $";
 #endif
 /*
  * Executive program for oconv, rpict and pfilt
@@ -558,6 +558,7 @@ oconv(void)				/* run oconv and mkillum if necessary *
 			unlink(illumtmp);
 			quit(1);
 		}
+		rmfile(oct0name);
 						/* make octree1 (frozen) */
 		if (octreedate)
 			sprintf(combuf, "%s%s -f -i %s %s > %s", c_oconv,
@@ -772,7 +773,7 @@ lowqopts(			/* low quality rendering options */
 	d = ambval();
 	sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
 	op += strlen(op);
-	op = addarg(op, "-lr 6 -lw .01");
+	op = addarg(op, "-lr 6 -lw .003");
 }
 
 
@@ -850,7 +851,7 @@ medqopts(			/* medium quality rendering options */
 	d = ambval();
 	sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
 	op += strlen(op);
-	op = addarg(op, "-lr 8 -lw .002");
+	op = addarg(op, "-lr 8 -lw 1e-4");
 }
 
 
@@ -926,7 +927,7 @@ hiqopts(				/* high quality rendering options */
 	d = ambval();
 	sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
 	op += strlen(op);
-	op = addarg(op, "-lr 12 -lw .0005");
+	op = addarg(op, "-lr 12 -lw 1e-5");
 }
 
 
@@ -1254,6 +1255,32 @@ rvu(				/* run rvu with first view */
 }
 
 
+static int
+syncf_done(			/* check if an rpiece sync file is complete */
+	char *sfname
+)
+{
+	FILE	*fp = fopen(sfname, "r");
+	int	todo = 1;
+	int	x, y;
+
+	if (fp == NULL)
+		return(0);
+	if (fscanf(fp, "%d %d", &x, &y) != 2)
+		goto checked;
+	todo = x*y;		/* total number of tiles */
+	if (fscanf(fp, "%d %d", &x, &y) != 2 || (x != 0) | (y != 0))
+		goto checked;
+				/* XXX assume no redundant tiles */
+	while (fscanf(fp, "%d %d", &x, &y) == 2)
+		if (!--todo)
+			break;
+checked:
+	fclose(fp);
+	return(!todo);
+}
+
+
 static void
 rpict(				/* run rpict and pfilt for each view */
 	char	*opts,
@@ -1270,6 +1297,9 @@ rpict(				/* run rpict and pfilt for each view */
 	int	vn, mult;
 	FILE	*fp;
 	time_t	rfdt, pfdt;
+	int	xres, yres;
+	double	aspect;
+	int	n;
 					/* get pfilt options */
 	pfiltopts(pfopts);
 					/* get resolution, reporting */
@@ -1284,24 +1314,19 @@ rpict(				/* run rpict and pfilt for each view */
 		mult = 3;
 		break;
 	}
-	{
-		int	xres, yres;
-		double	aspect;
-		int	n;
-		n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
-		if (n == 3)
-			sprintf(res, "-x %d -y %d -pa %.3f",
-					mult*xres, mult*yres, aspect);
-		else if (n) {
-			if (n == 1) yres = xres;
-			sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
-		} else
-			badvalue(RESOLUTION);
-	}
+	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
+	if (n == 3)
+		sprintf(res, "-x %d -y %d -pa %.3f",
+				mult*xres, mult*yres, aspect);
+	else if (n) {
+		aspect = 1.;
+		if (n == 1) yres = xres;
+		sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
+	} else
+		badvalue(RESOLUTION);
 	rep[0] = '\0';
 	if (vdef(REPORT)) {
 		double	minutes;
-		int	n;
 		n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile);
 		if (n == 2)
 			sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile);
@@ -1363,10 +1388,13 @@ rpict(				/* run rpict and pfilt for each view */
 				int	xdiv = 8+nprocs/3, ydiv = 8+nprocs/3;
 				if (rfdt >= oct1date) {
 					fprintf(stderr,
-		"%s: partial output not created with rpiece\n", rawfile);
+		"%s: partial output not created with %s\n", rawfile, c_rpiece);
 					quit(1);
 				}
-				rfdt = 0;		/* start fresh */
+				if (rfdt) {	/* start fresh */
+					rmfile(rawfile);
+					rfdt = 0;
+				}
 				if (!silent)
 					printf("\techo %d %d > %s\n",
 							xdiv, ydiv, sfile);
@@ -1449,11 +1477,21 @@ rpict(				/* run rpict and pfilt for each view */
 		if (do_rpiece) {		/* need to finish raw, first */
 			finish_process();
 			wait_process(1);
-			/* XXX should check sync file to see if really done? */
+			if (!syncf_done(sfile)) {
+				fprintf(stderr,
+			"%s: %s did not complete rendering of view %s\n",
+						progname, c_rpiece, vs);
+				quit(1);
+			}
 		}
 		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
 						/* build pfilt command */
-			if (mult > 1)
+			if (do_rpiece)
+				sprintf(combuf,
+					"%s%s -x %d -y %d -p %.3f %s > %s",
+					c_pfilt, pfopts, xres, yres, aspect,
+					rawfile, picfile);
+			else if (mult > 1)
 				sprintf(combuf, "%s%s -x /%d -y /%d %s > %s",
 					c_pfilt, pfopts, mult, mult,
 					rawfile, picfile);