52 |
|
static void sigdie(int signo, const char *msg); |
53 |
|
static void printdefaults(void); |
54 |
|
|
55 |
< |
#define RXTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \ |
55 |
> |
#define RXTRACE_FEATURES "IrradianceCalc\nMultiprocessing\nDistanceLimiting\n" \ |
56 |
|
"HessianAmbientCache\nAmbientAveraging\n" \ |
57 |
|
"AmbientValueSharing\nAdaptiveShadowTesting\n" \ |
58 |
|
"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \ |
142 |
|
break; |
143 |
|
case 'I': /* immed. irradiance */ |
144 |
|
rval = myRTmanager.rtFlags & RTimmIrrad; |
145 |
< |
check_bool(3,rval); |
145 |
> |
check_bool(2,rval); |
146 |
|
if (rval) myRTmanager.rtFlags |= RTimmIrrad; |
147 |
|
else myRTmanager.rtFlags &= ~RTimmIrrad; |
148 |
|
break; |
303 |
|
rval = setspectrsamp(CNDX, WLPART); |
304 |
|
if (rval < 0) |
305 |
|
error(USER, "unsupported spectral sampling"); |
306 |
< |
if (out_prims != NULL) { |
306 |
> |
if (sens_curve != NULL) |
307 |
> |
out_prims = NULL; |
308 |
> |
else if (out_prims != NULL) { |
309 |
|
if (!rval) |
310 |
|
error(WARNING, "spectral range incompatible with color output"); |
311 |
|
} else if (NCSAMP == 3) |
354 |
|
SET_FILE_BINARY(stdout); |
355 |
|
if (doheader) { /* print header? */ |
356 |
|
newheader("RADIANCE", stdout); |
357 |
< |
fputs(myRTmanager.GetHeader(), stdout); |
357 |
> |
fputs(myRTmanager.GetHeadStr(), stdout); |
358 |
|
printargs(i, argv, stdout); |
359 |
|
printf("SOFTWARE= %s\n", VersionID); |
360 |
|
fputnow(stdout); |
361 |
|
if (rval > 0) /* saved from setrtoutput() call */ |
362 |
< |
printf("NCOMP=%d\n", rval); |
362 |
> |
fputncomp(rval, stdout); |
363 |
> |
if (NCSAMP > 3) |
364 |
> |
fputwlsplit(WLPART, stdout); |
365 |
> |
if ((out_prims != stdprims) & (out_prims != NULL)) |
366 |
> |
fputprims(out_prims, stdout); |
367 |
|
if ((outform == 'f') | (outform == 'd')) |
368 |
|
fputendian(stdout); |
369 |
|
fputformat(formstr(outform), stdout); |