--- ray/src/rt/renderopts.c	2003/02/25 02:47:23	2.2
+++ ray/src/rt/renderopts.c	2006/04/05 06:22:56	2.13
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: renderopts.c,v 2.2 2003/02/25 02:47:23 greg Exp $";
+static const char	RCSid[] = "$Id: renderopts.c,v 2.13 2006/04/05 06:22:56 greg Exp $";
 #endif
 /*
  *  renderopts.c - process common rendering options
@@ -10,12 +10,14 @@ static const char	RCSid[] = "$Id: renderopts.c,v 2.2 2
 #include "copyright.h"
 
 #include  "ray.h"
+#include  "paths.h"
 
 
-int
-getrenderopt(ac, av)		/* get next render option */
-int  ac;
-char  *av[];
+extern int
+getrenderopt(		/* get next render option */
+	int  ac,
+	char  *av[]
+)
 {
 #define	 check(ol,al)		if (av[0][ol] || \
 				badarg(ac-1,av+1,al)) \
@@ -34,6 +36,9 @@ char  *av[];
 		return(-1);
 					/* check if it's one we know */
 	switch (av[0][1]) {
+	case 'u':				/* uncorrelated sampling */
+		bool(2,rand_samp);
+		return(0);
 	case 'b':				/* back face vis. */
 		if (av[0][2] == 'v') {
 			bool(3,backvis);
@@ -139,15 +144,15 @@ char  *av[];
 			}
 			if (av[0][2] == 'I') {	/* file */
 				rval = wordfile(amblp,
-					getpath(av[1],getlibpath(),R_OK));
+					getpath(av[1],getrlibpath(),R_OK));
 				if (rval < 0) {
 					sprintf(errmsg,
-			"cannot open ambient include file \"%s\"", av[0]);
+			"cannot open ambient include file \"%s\"", av[1]);
 					error(SYSTEM, errmsg);
 				}
 				amblp += rval;
 			} else {
-				*amblp++ = av[1];
+				*amblp++ = savqstr(av[1]);
 				*amblp = NULL;
 			}
 			return(1);
@@ -160,21 +165,21 @@ char  *av[];
 			}
 			if (av[0][2] == 'E') {	/* file */
 				rval = wordfile(amblp,
-					getpath(av[1],getlibpath(),R_OK));
+					getpath(av[1],getrlibpath(),R_OK));
 				if (rval < 0) {
 					sprintf(errmsg,
-			"cannot open ambient exclude file \"%s\"", av[0]);
+			"cannot open ambient exclude file \"%s\"", av[1]);
 					error(SYSTEM, errmsg);
 				}
 				amblp += rval;
 			} else {
-				*amblp++ = av[1];
+				*amblp++ = savqstr(av[1]);
 				*amblp = NULL;
 			}
 			return(1);
 		case 'f':				/* file */
 			check(3,"s");
-			ambfile= av[1];
+			ambfile = savqstr(av[1]);
 			return(1);
 		}
 		break;
@@ -210,13 +215,13 @@ char  *av[];
 }
 
 
-void
-print_rdefaults()		/* print default render values to stdout */
+extern void
+print_rdefaults(void)		/* print default render values to stdout */
 {
-	register char  *cp;
-
 	printf(do_irrad ? "-i+\t\t\t\t# irradiance calculation on\n" :
 			"-i-\t\t\t\t# irradiance calculation off\n");
+	printf(rand_samp ? "-u+\t\t\t\t# uncorrelated Monte Carlo sampling\n" :
+			"-u-\t\t\t\t# correlated quasi-Monte Carlo sampling\n");
 	printf(backvis ? "-bv+\t\t\t\t# back face visibility on\n" :
 			"-bv-\t\t\t\t# back face visibility off\n");
 	printf("-dt %f\t\t\t# direct threshold\n", shadthresh);
@@ -245,6 +250,7 @@ print_rdefaults()		/* print default render values to s
 			colval(salbedo,GRN), colval(salbedo,BLU));
 	printf("-mg %f\t\t\t# mist scattering eccentricity\n", seccg);
 	printf("-ms %f\t\t\t# mist sampling distance\n", ssampdist);
-	printf("-lr %-9d\t\t\t# limit reflection\n", maxdepth);
-	printf("-lw %f\t\t\t# limit weight\n", minweight);
+	printf("-lr %-9d\t\t\t# limit reflection%s\n", maxdepth,
+			maxdepth<=0 ? " (Russian roulette)" : "");
+	printf("-lw %.2e\t\t\t# limit weight\n", minweight);
 }