--- ray/src/rt/rxtmain.cpp 2024/09/16 19:20:09 2.9 +++ ray/src/rt/rxtmain.cpp 2025/03/05 18:56:28 2.12 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rxtmain.cpp,v 2.9 2024/09/16 19:20:09 greg Exp $"; +static const char RCSid[] = "$Id: rxtmain.cpp,v 2.12 2025/03/05 18:56:28 greg Exp $"; #endif /* * rxtmain.cpp - main for per-ray calculation program @@ -52,7 +52,7 @@ static void onsig(int signo); static void sigdie(int signo, const char *msg); static void printdefaults(void); -#define RXTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \ +#define RXTRACE_FEATURES "IrradianceCalc\nMultiprocessing\nDistanceLimiting\n" \ "HessianAmbientCache\nAmbientAveraging\n" \ "AmbientValueSharing\nAdaptiveShadowTesting\n" \ "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \ @@ -142,7 +142,7 @@ main(int argc, char *argv[]) break; case 'I': /* immed. irradiance */ rval = myRTmanager.rtFlags & RTimmIrrad; - check_bool(3,rval); + check_bool(2,rval); if (rval) myRTmanager.rtFlags |= RTimmIrrad; else myRTmanager.rtFlags &= ~RTimmIrrad; break; @@ -303,7 +303,9 @@ main(int argc, char *argv[]) rval = setspectrsamp(CNDX, WLPART); if (rval < 0) error(USER, "unsupported spectral sampling"); - if (out_prims != NULL) { + if (sens_curve != NULL) + out_prims = NULL; + else if (out_prims != NULL) { if (!rval) error(WARNING, "spectral range incompatible with color output"); } else if (NCSAMP == 3) @@ -357,7 +359,11 @@ main(int argc, char *argv[]) printf("SOFTWARE= %s\n", VersionID); fputnow(stdout); if (rval > 0) /* saved from setrtoutput() call */ - printf("NCOMP=%d\n", rval); + fputncomp(rval, stdout); + if (NCSAMP > 3) + fputwlsplit(WLPART, stdout); + if ((out_prims != stdprims) & (out_prims != NULL)) + fputprims(out_prims, stdout); if ((outform == 'f') | (outform == 'd')) fputendian(stdout); fputformat(formstr(outform), stdout);