--- ray/src/rt/renderopts.c 2005/06/14 03:34:14 2.10 +++ ray/src/rt/renderopts.c 2014/07/08 18:25:00 2.15 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: renderopts.c,v 2.10 2005/06/14 03:34:14 greg Exp $"; +static const char RCSid[] = "$Id: renderopts.c,v 2.15 2014/07/08 18:25:00 greg Exp $"; #endif /* * renderopts.c - process common rendering options @@ -13,7 +13,7 @@ static const char RCSid[] = "$Id: renderopts.c,v 2.10 #include "paths.h" -extern int +int getrenderopt( /* get next render option */ int ac, char *av[] @@ -82,7 +82,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); @@ -215,13 +215,13 @@ getrenderopt( /* get next render option */ } -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 sampling on\n" : - "-u-\t\t\t\t# uncorrelated sampling 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); @@ -232,7 +232,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)); @@ -252,5 +252,5 @@ print_rdefaults(void) /* print default render values printf("-ms %f\t\t\t# mist sampling distance\n", ssampdist); printf("-lr %-9d\t\t\t# limit reflection%s\n", maxdepth, maxdepth<=0 ? " (Russian roulette)" : ""); - printf("-lw %f\t\t\t# limit weight\n", minweight); + printf("-lw %.2e\t\t\t# limit weight\n", minweight); }