--- ray/src/util/rad.c	1995/08/28 10:12:40	2.45
+++ ray/src/util/rad.c	1995/12/08 19:55:50	2.47
@@ -1,4 +1,4 @@
-/* Copyright (c) 1994 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -563,7 +563,7 @@ double	org[3], *sizp;
 	extern FILE	*popen();
 	static double	oorg[3], osiz = 0.;
 	double	min[3], max[3];
-	char	buf[512];
+	char	buf[1024];
 	FILE	*fp;
 	register int	i;
 
@@ -689,7 +689,7 @@ printvals()			/* print variable values */
 oconv()				/* run oconv and mkillum if necessary */
 {
 	static char	illumtmp[] = "ilXXXXXX";
-	char	combuf[512], ocopts[64], mkopts[64];
+	char	combuf[1024], ocopts[64], mkopts[64];
 
 	oconvopts(ocopts);		/* get options */
 	if (octreedate < scenedate) {	/* check date on original octree */
@@ -777,6 +777,7 @@ oconv()				/* run oconv and mkillum if necessary */
 				"%s: error generating octree\n\t%s removed\n",
 					progname, oct1name);
 			unlink(oct1name);
+			unlink(illumtmp);
 			exit(1);
 		}
 		rmfile(illumtmp);
@@ -941,7 +942,7 @@ medqopts(op, po)			/* medium quality rendering options
 register char	*op;
 char	*po;
 {
-	double	d, org[3], siz[3];
+	double	d, org[3], siz[3], asz;
 
 	*op = '\0';
 	*po = '\0';
@@ -952,25 +953,32 @@ char	*po;
 	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
 		badvalue(ZONE);
 	getoctcube(org, &d);
-	d *= 3./(siz[0]+siz[1]+siz[2]);
+	asz = (siz[0]+siz[1]+siz[2])/3.;
+	d /= asz;
 	switch (vscale(DETAIL)) {
 	case LOW:
 		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
 		op = addarg(op, "-dp 256");
 		sprintf(op, " -ar %d", (int)(8*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/20.);
+		op += strlen(op);
 		break;
 	case MEDIUM:
 		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
 		op = addarg(op, "-dp 512");
 		sprintf(op, " -ar %d", (int)(16*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/40.);
+		op += strlen(op);
 		break;
 	case HIGH:
 		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
 		op = addarg(op, "-dp 1024");
 		sprintf(op, " -ar %d", (int)(32*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/80.);
+		op += strlen(op);
 		break;
 	}
 	po = addarg(po, "-pt .08");
@@ -1012,7 +1020,7 @@ hiqopts(op, po)				/* high quality rendering options *
 register char	*op;
 char	*po;
 {
-	double	d, org[3], siz[3];
+	double	d, org[3], siz[3], asz;
 
 	*op = '\0';
 	*po = '\0';
@@ -1023,24 +1031,31 @@ char	*po;
 	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
 		badvalue(ZONE);
 	getoctcube(org, &d);
-	d *= 3./(siz[0]+siz[1]+siz[2]);
+	asz = (siz[0]+siz[1]+siz[2])/3.;
+	d /= asz;
 	switch (vscale(DETAIL)) {
 	case LOW:
 		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
 		op = addarg(op, "-dp 1024");
 		sprintf(op, " -ar %d", (int)(16*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/40.);
+		op += strlen(op);
 		break;
 	case MEDIUM:
 		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
 		op = addarg(op, "-dp 2048");
 		sprintf(op, " -ar %d", (int)(32*d));
 		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/80.);
+		op += strlen(op);
 		break;
 	case HIGH:
 		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
 		op = addarg(op, "-dp 4096");
 		sprintf(op, " -ar %d", (int)(64*d));
+		op += strlen(op);
+		sprintf(op, " -ms %.2g", asz/160.);
 		op += strlen(op);
 		break;
 	}