| 61 |
|
/* rpict additional features */ |
| 62 |
|
#ifdef PERSIST |
| 63 |
|
#define RPICT_FEATURES "Persist\nParallelPersist\n" \ |
| 64 |
< |
"Hyperspectral\nParticipatingMedia=Mist\n" \ |
| 64 |
> |
"ParticipatingMedia=Mist\n" \ |
| 65 |
|
"Recovery\nIrradianceCalc\nViewTypes=v,l,a,h,s,c\n" \ |
| 66 |
|
"HessianAmbientCache\nAmbientAveraging\nAmbientValueSharing\n" \ |
| 67 |
|
"PixelJitter\nPixelSampling\nPixelMotion\nPixelDepthOfField\n" \ |
| 68 |
|
"SmallSourceDrawing\nViewSequence\nProgressReporting\n" \ |
| 69 |
< |
"AdaptiveShadowTesting\nOutputs=v,l\n" |
| 69 |
> |
"AdaptiveShadowTesting\nOutputs=v,l\n" \ |
| 70 |
> |
"OutputCS=RGB,XYZ,prims\n" |
| 71 |
|
#else |
| 72 |
|
#define RPICT_FEATURES "Recovery\nIrradianceCalc\nViewTypes=v,l,a,h,s,c\n" \ |
| 73 |
< |
"Hyperspectral\nParticipatingMedia=Mist\n" \ |
| 73 |
> |
"ParticipatingMedia=Mist\n" \ |
| 74 |
|
"HessianAmbientCache\nAmbientAveraging\nAmbientValueSharing\n" \ |
| 75 |
|
"PixelJitter\nPixelSampling\nPixelMotion\nPixelDepthOfField\n" \ |
| 76 |
|
"SmallSourceDrawing\nViewSequence\nProgressReporting\n" \ |
| 77 |
< |
"AdaptiveShadowTesting\nOutputs=v,l\n" |
| 77 |
> |
"AdaptiveShadowTesting\nOutputs=v,l\n" \ |
| 78 |
> |
"OutputCS=RGB,XYZ,prims\n" |
| 79 |
|
#endif |
| 80 |
|
|
| 81 |
|
|
| 246 |
|
check(2,"i"); |
| 247 |
|
ralrm = atoi(argv[++i]); |
| 248 |
|
break; |
| 247 |
– |
#if MAXCSAMP>3 |
| 248 |
– |
case 'c': /* spectral sampling */ |
| 249 |
– |
switch (argv[i][2]) { |
| 250 |
– |
case 's': /* spectral bin count */ |
| 251 |
– |
check(3,"i"); |
| 252 |
– |
NCSAMP = atoi(argv[++i]); |
| 253 |
– |
break; |
| 254 |
– |
case 'w': /* wavelength extrema */ |
| 255 |
– |
check(3,"ff"); |
| 256 |
– |
WLPART[0] = atof(argv[++i]); |
| 257 |
– |
WLPART[3] = atof(argv[++i]); |
| 258 |
– |
break; |
| 259 |
– |
#if 0 |
| 260 |
– |
case 'o': /* output spectral results */ |
| 261 |
– |
rval = (out_prims == NULL); |
| 262 |
– |
check_bool(3,rval); |
| 263 |
– |
if (rval) out_prims = NULL; |
| 264 |
– |
else if (out_prims == NULL) out_prims = stdprims; |
| 265 |
– |
break; |
| 266 |
– |
#endif |
| 267 |
– |
default: |
| 268 |
– |
goto badopt; |
| 269 |
– |
} |
| 270 |
– |
break; |
| 271 |
– |
#endif |
| 249 |
|
#ifdef PERSIST |
| 250 |
|
case 'P': /* persist file */ |
| 251 |
|
if (argv[i][2] == 'P') { |
| 272 |
|
goto badopt; |
| 273 |
|
} |
| 274 |
|
} |
| 275 |
+ |
/* set/check spectral sampling */ |
| 276 |
+ |
if (setspectrsamp(CNDX, WLPART) <= 0) |
| 277 |
+ |
error(USER, "unsupported spectral sampling"); |
| 278 |
+ |
|
| 279 |
|
err = setview(&ourview); /* set viewing parameters */ |
| 280 |
|
if (err != NULL) |
| 281 |
|
error(USER, err); |
| 519 |
|
printf("-vl %f\t\t\t# view lift\n", ourview.voff); |
| 520 |
|
printf("-x %-9d\t\t\t# x resolution\n", hresolu); |
| 521 |
|
printf("-y %-9d\t\t\t# y resolution\n", vresolu); |
| 541 |
– |
if (NCSAMP > 3) { |
| 542 |
– |
printf("-cs %-2d\t\t\t\t# number of spectral bins\n", NCSAMP); |
| 543 |
– |
printf("-cw %3.0f %3.0f\t\t\t# wavelength limits (nm)\n", |
| 544 |
– |
WLPART[3], WLPART[0]); |
| 545 |
– |
/* printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" : |
| 546 |
– |
"-co+\t\t\t\t# output spectral values\n"); |
| 547 |
– |
*/ } |
| 522 |
|
if (out_prims == stdprims) |
| 523 |
|
printf("-pRGB\t\t\t\t# standard RGB color output\n"); |
| 524 |
|
else if (out_prims == xyzprims) |
