--- ray/src/rt/renderopts.c	2004/08/20 20:03:00	2.7
+++ ray/src/rt/renderopts.c	2015/02/24 19:39:27	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: renderopts.c,v 2.7 2004/08/20 20:03:00 greg Exp $";
+static const char	RCSid[] = "$Id: renderopts.c,v 2.16 2015/02/24 19:39:27 greg Exp $";
 #endif
 /*
  *  renderopts.c - process common rendering options
@@ -11,9 +11,10 @@ static const char	RCSid[] = "$Id: renderopts.c,v 2.7 2
 
 #include  "ray.h"
 #include  "paths.h"
+#include  "pmapopt.h"
 
 
-extern int
+int
 getrenderopt(		/* get next render option */
 	int  ac,
 	char  *av[]
@@ -36,6 +37,9 @@ getrenderopt(		/* get next render option */
 		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);
@@ -79,7 +83,7 @@ getrenderopt(		/* get next render option */
 			check(3,"f");
 			specthresh = atof(av[1]);
 			return(1);
-		case 'j':				/* jitter */
+		case 's':				/* sampling */
 			check(3,"f");
 			specjitter = atof(av[1]);
 			return(1);
@@ -205,18 +209,24 @@ getrenderopt(		/* get next render option */
 		}
 		break;
 	}
-	return(-1);		/* unknown option */
+	
+	/* PMAP: Parse photon mapping options */
+	return(getPmapRenderOpt(ac, av));
+	
+/*	return(-1); */		/* unknown option */
 
 #undef	check
 #undef	bool
 }
 
 
-extern void
+void
 print_rdefaults(void)		/* print default render values to stdout */
 {
 	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);
@@ -227,7 +237,7 @@ print_rdefaults(void)		/* print default render values 
 	printf("-dp %-9d\t\t\t# direct pretest density\n", vspretest);
 	printf(directvis ? "-dv+\t\t\t\t# direct visibility on\n" :
 			"-dv-\t\t\t\t# direct visibility off\n");
-	printf("-sj %f\t\t\t# specular jitter\n", specjitter);
+	printf("-ss %f\t\t\t# specular sampling\n", specjitter);
 	printf("-st %f\t\t\t# specular threshold\n", specthresh);
 	printf("-av %f %f %f\t# ambient value\n", colval(ambval,RED),
 			colval(ambval,GRN), colval(ambval, BLU));
@@ -245,6 +255,10 @@ print_rdefaults(void)		/* print default render values 
 			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);
+	
+	/* PMAP: output photon map defaults */
+	printPmapDefaults();
 }