--- ray/src/rt/rcmain.c 2023/04/07 15:00:11 2.30 +++ ray/src/rt/rcmain.c 2024/04/05 16:41:17 2.36 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rcmain.c,v 2.30 2023/04/07 15:00:11 greg Exp $"; +static const char RCSid[] = "$Id: rcmain.c,v 2.36 2024/04/05 16:41:17 greg Exp $"; #endif /* * rcmain.c - main for rtcontrib ray contribution tracer @@ -55,15 +55,19 @@ char RCCONTEXT[] = "RC."; /* our special evaluation c #if defined(_WIN32) || defined(_WIN64) #define RCONTRIB_FEATURES "Accumulation\nSummation\nRecovery\n" \ - "ValueContribution\nImmediateIrradiance\n" \ + "ImmediateIrradiance\n" \ "ProgressReporting\nDistanceLimiting\n" \ - "Outputs=V,W\n" + "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \ + "Outputs=V,W\n" \ + "OutputCS=RGB,spec\n" #else #define RCONTRIB_FEATURES "Multiprocessing\n" \ "Accumulation\nSummation\nRecovery\n" \ - "ValueContribution\nImmediateIrradiance\n" \ + "ImmediateIrradiance\n" \ "ProgressReporting\nDistanceLimiting\n" \ - "Outputs=V,W\n" + "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \ + "Outputs=V,W\n" \ + "OutputCS=RGB,spec\n" #endif static void @@ -80,8 +84,8 @@ printdefaults(void) /* print default values to stdou printf("-y %-9d\t\t\t# y resolution\n", yres); printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" : "-ld-\t\t\t\t# limit distance off\n"); - printf("-h%c\t\t\t\t# %s header\n", header ? '+' : '-', - header ? "output" : "no"); + printf(header ? "-h+\t\t\t\t# output header\n" : + "-h-\t\t\t\t# no header\n"); printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n", inpfmt, outfmt, formstr(inpfmt), formstr(outfmt)); printf(erract[WARNING].pf != NULL ? @@ -285,10 +289,6 @@ main(int argc, char *argv[]) check(2,"s"); curout = argv[++i]; break; - case 'c': /* input rays per output */ - check(2,"i"); - accumulate = atoi(argv[++i]); - break; case 'r': /* recover output */ check_bool(2,recover); break; @@ -299,6 +299,10 @@ main(int argc, char *argv[]) check(2,"s"); set_eparams(prms = argv[++i]); break; + case 'c': /* sample count */ + check(2,"i"); + accumulate = atoi(argv[++i]); + break; case 'b': /* bin expression/count */ if (argv[i][2] == 'n') { check(3,"s"); @@ -328,6 +332,9 @@ main(int argc, char *argv[]) error(USER, "missing required modifier argument"); /* override some option settings */ override_options(); + /* set/check spectral sampling */ + if (setspectrsamp(CNDX, WLPART) < 0) + error(USER, "unsupported spectral sampling"); /* initialize object types */ initotypes(); /* initialize urand */