7 |
|
|
8 |
|
#include "copyright.h" |
9 |
|
|
10 |
< |
#include "ray.h" |
10 |
> |
#include <signal.h> |
11 |
|
|
12 |
+ |
#include "platform.h" |
13 |
+ |
#include "rtprocess.h" /* getpid() */ |
14 |
+ |
#include "resolu.h" |
15 |
+ |
#include "ray.h" |
16 |
|
#include "source.h" |
13 |
– |
|
17 |
|
#include "ambient.h" |
15 |
– |
|
18 |
|
#include "random.h" |
17 |
– |
|
19 |
|
#include "paths.h" |
20 |
+ |
#include "pmapray.h" |
21 |
|
|
22 |
< |
#include <sys/types.h> |
22 |
> |
extern char *progname; /* global argv[0] */ |
23 |
|
|
24 |
< |
#include <signal.h> |
24 |
> |
extern char *shm_boundary; /* boundary of shared memory */ |
25 |
> |
|
26 |
|
/* persistent processes define */ |
27 |
|
#ifdef F_SETLKW |
28 |
|
#define PERSIST 1 /* normal persist */ |
30 |
|
#define PCHILD 3 /* child of normal persist */ |
31 |
|
#endif |
32 |
|
|
33 |
< |
char *progname; /* argv[0] */ |
33 |
> |
char *sigerr[NSIG]; /* signal error messages */ |
34 |
> |
char *errfile = NULL; /* error output file */ |
35 |
|
|
36 |
< |
char *octname; /* octree name */ |
36 |
> |
int nproc = 1; /* number of processes */ |
37 |
|
|
38 |
< |
char *sigerr[NSIG]; /* signal error messages */ |
38 |
> |
extern int setrtoutput(void); /* set output values */ |
39 |
|
|
40 |
< |
char *shm_boundary = NULL; /* boundary of shared memory */ |
40 |
> |
int inform = 'a'; /* input format */ |
41 |
> |
int outform = 'a'; /* output format */ |
42 |
> |
char *outvals = "v"; /* output specification */ |
43 |
|
|
44 |
< |
char *errfile = NULL; /* error output file */ |
44 |
> |
int hresolu = 0; /* horizontal (scan) size */ |
45 |
> |
int vresolu = 0; /* vertical resolution */ |
46 |
|
|
47 |
< |
extern char *formstr(); /* string from format */ |
41 |
< |
extern int inform; /* input format */ |
42 |
< |
extern int outform; /* output format */ |
43 |
< |
extern char *outvals; /* output values */ |
47 |
> |
extern int castonly; /* only doing ray-casting? */ |
48 |
|
|
49 |
< |
extern int hresolu; /* horizontal resolution */ |
50 |
< |
extern int vresolu; /* vertical resolution */ |
49 |
> |
int imm_irrad = 0; /* compute immediate irradiance? */ |
50 |
> |
int lim_dist = 0; /* limit distance? */ |
51 |
|
|
52 |
< |
extern int imm_irrad; /* compute immediate irradiance? */ |
53 |
< |
extern int lim_dist; /* limit distance? */ |
52 |
> |
#ifndef MAXMODLIST |
53 |
> |
#define MAXMODLIST 1024 /* maximum modifiers we'll track */ |
54 |
> |
#endif |
55 |
|
|
56 |
< |
extern char *tralist[]; /* list of modifers to trace (or no) */ |
57 |
< |
extern int traincl; /* include == 1, exclude == 0 */ |
56 |
> |
extern void (*addobjnotify[])(); /* object notification calls */ |
57 |
> |
extern void tranotify(OBJECT obj); |
58 |
|
|
59 |
< |
void onsig(); |
60 |
< |
void sigdie(); |
56 |
< |
void printdefaults(); |
59 |
> |
char *tralist[MAXMODLIST]; /* list of modifers to trace (or no) */ |
60 |
> |
int traincl = -1; /* include == 1, exclude == 0 */ |
61 |
|
|
62 |
+ |
double (*sens_curve)(SCOLOR scol) = NULL; /* spectral conversion for 1-channel */ |
63 |
+ |
double out_scalefactor = 1; /* output calibration scale factor */ |
64 |
+ |
RGBPRIMP out_prims = stdprims; /* output color primitives (NULL if spectral) */ |
65 |
+ |
static RGBPRIMS our_prims; /* private output color primitives */ |
66 |
|
|
67 |
+ |
static int loadflags = ~IO_FILES; /* what to load from octree */ |
68 |
+ |
|
69 |
+ |
static void onsig(int signo); |
70 |
+ |
static void sigdie(int signo, char *msg); |
71 |
+ |
static void printdefaults(void); |
72 |
+ |
|
73 |
+ |
#ifdef PERSIST |
74 |
+ |
#define RTRACE_FEATURES "Persist\nParallelPersist\nMultiprocessing\n" \ |
75 |
+ |
"IrradianceCalc\nImmediateIrradiance\nDistanceLimiting\n" \ |
76 |
+ |
"ParticipatingMedia=Mist\n" \ |
77 |
+ |
"HessianAmbientCache\nAmbientAveraging\n" \ |
78 |
+ |
"AmbientValueSharing\nAdaptiveShadowTesting\n" \ |
79 |
+ |
"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \ |
80 |
+ |
"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \ |
81 |
+ |
"OutputCS=RGB,XYZ,Y,S,M,prims,spec\n" |
82 |
+ |
#else |
83 |
+ |
#define RTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \ |
84 |
+ |
"ParticipatingMedia=Mist\n" \ |
85 |
+ |
"HessianAmbientCache\nAmbientAveraging\n" \ |
86 |
+ |
"AmbientValueSharing\nAdaptiveShadowTesting\n" \ |
87 |
+ |
"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \ |
88 |
+ |
"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" |
89 |
+ |
"OutputCS=RGB,XYZ,Y,S,M,prims,spec\n" |
90 |
+ |
#endif |
91 |
+ |
|
92 |
+ |
|
93 |
|
int |
94 |
< |
main(argc, argv) |
61 |
< |
int argc; |
62 |
< |
char *argv[]; |
94 |
> |
main(int argc, char *argv[]) |
95 |
|
{ |
96 |
|
#define check(ol,al) if (argv[i][ol] || \ |
97 |
|
badarg(argc-i-1,argv+i+1,al)) \ |
98 |
|
goto badopt |
99 |
< |
#define bool(olen,var) switch (argv[i][olen]) { \ |
99 |
> |
#define check_bool(olen,var) switch (argv[i][olen]) { \ |
100 |
|
case '\0': var = !var; break; \ |
101 |
|
case 'y': case 'Y': case 't': case 'T': \ |
102 |
|
case '+': case '1': var = 1; break; \ |
103 |
|
case 'n': case 'N': case 'f': case 'F': \ |
104 |
|
case '-': case '0': var = 0; break; \ |
105 |
|
default: goto badopt; } |
106 |
< |
int loadflags = ~IO_FILES; |
106 |
> |
extern char *octname; |
107 |
|
int persist = 0; |
108 |
< |
char **tralp; |
109 |
< |
int duped1; |
108 |
> |
char *octnm = NULL; |
109 |
> |
char **tralp = NULL; |
110 |
> |
int duped1 = -1; |
111 |
|
int rval; |
112 |
|
int i; |
113 |
|
/* global program name */ |
114 |
|
progname = argv[0] = fixargv0(argv[0]); |
115 |
+ |
/* feature check only? */ |
116 |
+ |
strcat(RFeatureList, RTRACE_FEATURES); |
117 |
+ |
if (argc > 1 && !strcmp(argv[1], "-features")) |
118 |
+ |
return feature_status(argc-2, argv+2); |
119 |
+ |
/* add trace notify function */ |
120 |
+ |
for (i = 0; addobjnotify[i] != NULL; i++) |
121 |
+ |
; |
122 |
+ |
addobjnotify[i] = tranotify; |
123 |
|
/* option city */ |
124 |
|
for (i = 1; i < argc; i++) { |
125 |
|
/* expand arguments */ |
146 |
|
continue; |
147 |
|
} |
148 |
|
switch (argv[i][1]) { |
149 |
+ |
case 'n': /* number of cores */ |
150 |
+ |
check(2,"i"); |
151 |
+ |
nproc = atoi(argv[++i]); |
152 |
+ |
if (nproc <= 0) |
153 |
+ |
error(USER, "bad number of processes"); |
154 |
+ |
break; |
155 |
|
case 'x': /* x resolution */ |
156 |
|
check(2,"i"); |
157 |
|
hresolu = atoi(argv[++i]); |
160 |
|
check(2,"i"); |
161 |
|
vresolu = atoi(argv[++i]); |
162 |
|
break; |
163 |
< |
case 'w': /* warnings */ |
163 |
> |
case 'w': /* warnings & spectral */ |
164 |
|
rval = erract[WARNING].pf != NULL; |
165 |
< |
bool(2,rval); |
165 |
> |
check_bool(2,rval); |
166 |
|
if (rval) erract[WARNING].pf = wputs; |
167 |
|
else erract[WARNING].pf = NULL; |
168 |
|
break; |
173 |
|
case 'l': /* limit distance */ |
174 |
|
if (argv[i][2] != 'd') |
175 |
|
goto badopt; |
176 |
< |
bool(3,lim_dist); |
176 |
> |
check_bool(3,lim_dist); |
177 |
|
break; |
178 |
|
case 'I': /* immed. irradiance */ |
179 |
< |
bool(2,imm_irrad); |
179 |
> |
check_bool(2,imm_irrad); |
180 |
|
break; |
181 |
|
case 'f': /* format i/o */ |
182 |
|
switch (argv[i][2]) { |
208 |
|
break; |
209 |
|
case 'h': /* header output */ |
210 |
|
rval = loadflags & IO_INFO; |
211 |
< |
bool(2,rval); |
211 |
> |
check_bool(2,rval); |
212 |
|
loadflags = rval ? loadflags | IO_INFO : |
213 |
|
loadflags & ~IO_INFO; |
214 |
|
break; |
222 |
|
tralp = tralist; |
223 |
|
} |
224 |
|
if (argv[i][2] == 'I') { /* file */ |
225 |
< |
rval = wordfile(tralp, |
225 |
> |
rval = wordfile(tralp, MAXMODLIST-(tralp-tralist), |
226 |
|
getpath(argv[++i],getrlibpath(),R_OK)); |
227 |
|
if (rval < 0) { |
228 |
|
sprintf(errmsg, |
244 |
|
tralp = tralist; |
245 |
|
} |
246 |
|
if (argv[i][2] == 'E') { /* file */ |
247 |
< |
rval = wordfile(tralp, |
247 |
> |
rval = wordfile(tralp, MAXMODLIST-(tralp-tralist), |
248 |
|
getpath(argv[++i],getrlibpath(),R_OK)); |
249 |
|
if (rval < 0) { |
250 |
|
sprintf(errmsg, |
262 |
|
goto badopt; |
263 |
|
} |
264 |
|
break; |
265 |
+ |
case 'p': /* value output */ |
266 |
+ |
switch (argv[i][2]) { |
267 |
+ |
case 'R': /* standard RGB output */ |
268 |
+ |
if (strcmp(argv[i]+2, "RGB")) |
269 |
+ |
goto badopt; |
270 |
+ |
out_prims = stdprims; |
271 |
+ |
out_scalefactor = 1; |
272 |
+ |
sens_curve = NULL; |
273 |
+ |
break; |
274 |
+ |
case 'X': /* XYZ output */ |
275 |
+ |
if (strcmp(argv[i]+2, "XYZ")) |
276 |
+ |
goto badopt; |
277 |
+ |
out_prims = xyzprims; |
278 |
+ |
out_scalefactor = WHTEFFICACY; |
279 |
+ |
sens_curve = NULL; |
280 |
+ |
break; |
281 |
+ |
case 'c': { |
282 |
+ |
int j; |
283 |
+ |
check(3,"ffffffff"); |
284 |
+ |
rval = 0; |
285 |
+ |
for (j = 0; j < 8; j++) { |
286 |
+ |
our_prims[0][j] = atof(argv[++i]); |
287 |
+ |
rval |= fabs(our_prims[0][j]-stdprims[0][j]) > .001; |
288 |
+ |
} |
289 |
+ |
if (rval) { |
290 |
+ |
if (!colorprimsOK(our_prims)) |
291 |
+ |
error(USER, "illegal primary chromaticities"); |
292 |
+ |
out_prims = our_prims; |
293 |
+ |
} else |
294 |
+ |
out_prims = stdprims; |
295 |
+ |
out_scalefactor = 1; |
296 |
+ |
sens_curve = NULL; |
297 |
+ |
} break; |
298 |
+ |
case 'Y': /* photopic response */ |
299 |
+ |
if (argv[i][3]) |
300 |
+ |
goto badopt; |
301 |
+ |
sens_curve = scolor_photopic; |
302 |
+ |
out_scalefactor = WHTEFFICACY; |
303 |
+ |
break; |
304 |
+ |
case 'S': /* scotopic response */ |
305 |
+ |
if (argv[i][3]) |
306 |
+ |
goto badopt; |
307 |
+ |
sens_curve = scolor_scotopic; |
308 |
+ |
out_scalefactor = WHTSCOTOPIC; |
309 |
+ |
break; |
310 |
+ |
case 'M': /* melanopic response */ |
311 |
+ |
if (argv[i][3]) |
312 |
+ |
goto badopt; |
313 |
+ |
sens_curve = scolor_melanopic; |
314 |
+ |
out_scalefactor = WHTMELANOPIC; |
315 |
+ |
break; |
316 |
+ |
default: |
317 |
+ |
goto badopt; |
318 |
+ |
} |
319 |
+ |
break; |
320 |
+ |
#if MAXCSAMP>3 |
321 |
+ |
case 'c': /* output spectral results */ |
322 |
+ |
if (argv[i][2] != 'o') |
323 |
+ |
goto badopt; |
324 |
+ |
rval = (out_prims == NULL) & (sens_curve == NULL); |
325 |
+ |
check_bool(3,rval); |
326 |
+ |
if (rval) { |
327 |
+ |
out_prims = NULL; |
328 |
+ |
sens_curve = NULL; |
329 |
+ |
} else if (out_prims == NULL) |
330 |
+ |
out_prims = stdprims; |
331 |
+ |
break; |
332 |
+ |
#endif |
333 |
|
#ifdef PERSIST |
334 |
|
case 'P': /* persist file */ |
335 |
|
if (argv[i][2] == 'P') { |
346 |
|
goto badopt; |
347 |
|
} |
348 |
|
} |
349 |
+ |
/* set/check spectral sampling */ |
350 |
+ |
rval = setspectrsamp(CNDX, WLPART); |
351 |
+ |
if (rval < 0) |
352 |
+ |
error(USER, "unsupported spectral sampling"); |
353 |
+ |
if (out_prims != NULL) { |
354 |
+ |
if (!rval) |
355 |
+ |
error(WARNING, "spectral range incompatible with color output"); |
356 |
+ |
} else if (NCSAMP == 3) |
357 |
+ |
out_prims = stdprims; /* 3 samples do not a spectrum make */ |
358 |
+ |
if (nproc > 1 && persist) |
359 |
+ |
error(USER, "multiprocessing incompatible with persist file"); |
360 |
|
/* initialize object types */ |
361 |
|
initotypes(); |
362 |
|
/* initialize urand */ |
363 |
< |
initurand(2048); |
363 |
> |
if (rand_samp) { |
364 |
> |
srandom((long)time(0)); |
365 |
> |
initurand(0); |
366 |
> |
} else { |
367 |
> |
srandom(0L); |
368 |
> |
initurand(2048); |
369 |
> |
} |
370 |
|
/* set up signal handling */ |
371 |
|
sigdie(SIGINT, "Interrupt"); |
372 |
+ |
#ifdef SIGHUP |
373 |
|
sigdie(SIGHUP, "Hangup"); |
374 |
+ |
#endif |
375 |
|
sigdie(SIGTERM, "Terminate"); |
376 |
+ |
#ifdef SIGPIPE |
377 |
|
sigdie(SIGPIPE, "Broken pipe"); |
378 |
+ |
#endif |
379 |
+ |
#ifdef SIGALRM |
380 |
|
sigdie(SIGALRM, "Alarm clock"); |
381 |
+ |
#endif |
382 |
|
#ifdef SIGXCPU |
383 |
|
sigdie(SIGXCPU, "CPU limit exceeded"); |
384 |
|
sigdie(SIGXFSZ, "File size exceeded"); |
398 |
|
#endif |
399 |
|
/* get octree */ |
400 |
|
if (i == argc) |
401 |
< |
octname = NULL; |
401 |
> |
octnm = NULL; |
402 |
|
else if (i == argc-1) |
403 |
< |
octname = argv[i]; |
403 |
> |
octnm = argv[i]; |
404 |
|
else |
405 |
|
goto badopt; |
406 |
< |
if (octname == NULL) |
406 |
> |
if (octnm == NULL) |
407 |
|
error(USER, "missing octree argument"); |
408 |
|
/* set up output */ |
409 |
|
#ifdef PERSIST |
412 |
|
openheader(); |
413 |
|
} |
414 |
|
#endif |
277 |
– |
#ifdef MSDOS |
415 |
|
if (outform != 'a') |
416 |
< |
setmode(fileno(stdout), O_BINARY); |
417 |
< |
if (octname == NULL) |
418 |
< |
setmode(fileno(stdin), O_BINARY); |
282 |
< |
#endif |
416 |
> |
SET_FILE_BINARY(stdout); |
417 |
> |
rval = setrtoutput(); |
418 |
> |
octname = savqstr(octnm); |
419 |
|
readoct(octname, loadflags, &thescene, NULL); |
420 |
|
nsceneobjs = nobjects; |
421 |
|
|
423 |
|
printargs(i, argv, stdout); |
424 |
|
printf("SOFTWARE= %s\n", VersionID); |
425 |
|
fputnow(stdout); |
426 |
+ |
if (rval > 0) /* saved from setrtoutput() call */ |
427 |
+ |
fputncomp(rval, stdout); |
428 |
+ |
if (NCSAMP > 3) |
429 |
+ |
fputwlsplit(WLPART, stdout); |
430 |
+ |
if ((out_prims != stdprims) & (out_prims != NULL)) |
431 |
+ |
fputprims(out_prims, stdout); |
432 |
+ |
if ((outform == 'f') | (outform == 'd')) |
433 |
+ |
fputendian(stdout); |
434 |
|
fputformat(formstr(outform), stdout); |
435 |
< |
putchar('\n'); |
435 |
> |
fputc('\n', stdout); /* end of header */ |
436 |
|
} |
437 |
|
|
438 |
< |
marksources(); /* find and mark sources */ |
438 |
> |
if (!castonly) { /* any actual ray traversal to do? */ |
439 |
|
|
440 |
< |
setambient(); /* initialize ambient calculation */ |
440 |
> |
ray_init_pmap(); /* PMAP: set up & load photon maps */ |
441 |
> |
|
442 |
> |
marksources(); /* find and mark sources */ |
443 |
|
|
444 |
+ |
setambient(); /* initialize ambient calculation */ |
445 |
+ |
} else |
446 |
+ |
distantsources(); /* else mark only distant sources */ |
447 |
+ |
|
448 |
+ |
fflush(stdout); /* in case we're duplicating header */ |
449 |
+ |
|
450 |
|
#ifdef PERSIST |
451 |
|
if (persist) { |
300 |
– |
fflush(stdout); |
452 |
|
/* reconnect stdout */ |
453 |
|
dup2(duped1, fileno(stdout)); |
454 |
|
close(duped1); |
459 |
|
while ((rval=fork()) == 0) { /* keep on forkin' */ |
460 |
|
pflock(1); |
461 |
|
pfhold(); |
462 |
+ |
ambsync(); /* load new values */ |
463 |
|
} |
464 |
|
if (rval < 0) |
465 |
|
error(SYSTEM, "cannot fork child for persist function"); |
466 |
< |
pfdetach(); /* parent exits */ |
466 |
> |
pfdetach(); /* parent will run then exit */ |
467 |
|
} |
468 |
|
} |
469 |
|
runagain: |
471 |
|
dupheader(); /* send header to stdout */ |
472 |
|
#endif |
473 |
|
/* trace rays */ |
474 |
< |
rtrace(NULL); |
474 |
> |
rtrace(NULL, nproc); |
475 |
|
/* flush ambient file */ |
476 |
|
ambsync(); |
477 |
|
#ifdef PERSIST |
486 |
|
} |
487 |
|
} |
488 |
|
if (persist == PCHILD) { /* wait for a signal then go again */ |
337 |
– |
close(duped1); /* release output handle */ |
489 |
|
pfhold(); |
490 |
|
raynum = nrays = 0; /* reinitialize */ |
491 |
|
goto runagain; |
492 |
|
} |
493 |
|
#endif |
494 |
+ |
|
495 |
+ |
ray_done_pmap(); /* PMAP: free photon maps */ |
496 |
+ |
|
497 |
|
quit(0); |
498 |
|
|
499 |
|
badopt: |
500 |
|
sprintf(errmsg, "command line error at '%s'", argv[i]); |
501 |
|
error(USER, errmsg); |
502 |
+ |
return 1; /* pro forma return */ |
503 |
|
|
504 |
|
#undef check |
505 |
< |
#undef bool |
505 |
> |
#undef check_bool |
506 |
|
} |
507 |
|
|
508 |
|
|
509 |
|
void |
510 |
< |
wputs(s) /* warning output function */ |
511 |
< |
char *s; |
510 |
> |
wputs( /* warning output function */ |
511 |
> |
const char *s |
512 |
> |
) |
513 |
|
{ |
514 |
|
int lasterrno = errno; |
515 |
|
eputs(s); |
518 |
|
|
519 |
|
|
520 |
|
void |
521 |
< |
eputs(s) /* put string to stderr */ |
522 |
< |
register char *s; |
521 |
> |
eputs( /* put string to stderr */ |
522 |
> |
const char *s |
523 |
> |
) |
524 |
|
{ |
525 |
|
static int midline = 0; |
526 |
|
|
538 |
|
} |
539 |
|
|
540 |
|
|
541 |
< |
void |
542 |
< |
onsig(signo) /* fatal signal */ |
543 |
< |
int signo; |
541 |
> |
static void |
542 |
> |
onsig( /* fatal signal */ |
543 |
> |
int signo |
544 |
> |
) |
545 |
|
{ |
546 |
|
static int gotsig = 0; |
547 |
|
|
548 |
|
if (gotsig++) /* two signals and we're gone! */ |
549 |
|
_exit(signo); |
550 |
|
|
551 |
+ |
#ifdef SIGALRM |
552 |
|
alarm(15); /* allow 15 seconds to clean up */ |
553 |
|
signal(SIGALRM, SIG_DFL); /* make certain we do die */ |
554 |
+ |
#endif |
555 |
|
eputs("signal - "); |
556 |
|
eputs(sigerr[signo]); |
557 |
|
eputs("\n"); |
559 |
|
} |
560 |
|
|
561 |
|
|
562 |
< |
void |
563 |
< |
sigdie(signo, msg) /* set fatal signal */ |
564 |
< |
int signo; |
565 |
< |
char *msg; |
562 |
> |
static void |
563 |
> |
sigdie( /* set fatal signal */ |
564 |
> |
int signo, |
565 |
> |
char *msg |
566 |
> |
) |
567 |
|
{ |
568 |
|
if (signal(signo, onsig) == SIG_IGN) |
569 |
|
signal(signo, SIG_IGN); |
571 |
|
} |
572 |
|
|
573 |
|
|
574 |
< |
void |
575 |
< |
printdefaults() /* print default values to stdout */ |
574 |
> |
static void |
575 |
> |
printdefaults(void) /* print default values to stdout */ |
576 |
|
{ |
577 |
< |
register char *cp; |
577 |
> |
char *cp; |
578 |
|
|
579 |
+ |
printf(erract[WARNING].pf != NULL ? |
580 |
+ |
"-w+\t\t\t\t# warning messages on\n" : |
581 |
+ |
"-w-\t\t\t\t# warning messages off\n"); |
582 |
|
if (imm_irrad) |
583 |
|
printf("-I+\t\t\t\t# immediate irradiance on\n"); |
584 |
< |
printf("-x %-9d\t\t\t# x resolution\n", hresolu); |
585 |
< |
printf("-y %-9d\t\t\t# y resolution\n", vresolu); |
584 |
> |
printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); |
585 |
> |
printf("-x %-9d\t\t\t# %s\n", hresolu, |
586 |
> |
vresolu && hresolu ? "x resolution" : "flush interval"); |
587 |
> |
printf("-y %-9d\t\t\t# y resolution\n", vresolu); |
588 |
|
printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" : |
589 |
|
"-ld-\t\t\t\t# limit distance off\n"); |
590 |
+ |
printf(loadflags & IO_INFO ? "-h+\t\t\t\t# output header\n" : |
591 |
+ |
"-h-\t\t\t\t# no header\n"); |
592 |
|
printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n", |
593 |
|
inform, outform, formstr(inform), formstr(outform)); |
594 |
< |
printf("-o%s\t\t\t\t# output", outvals); |
594 |
> |
printf("-o%-9s\t\t\t# output", outvals); |
595 |
|
for (cp = outvals; *cp; cp++) |
596 |
|
switch (*cp) { |
597 |
< |
case 't': printf(" trace"); break; |
597 |
> |
case 't': case 'T': printf(" trace"); break; |
598 |
|
case 'o': printf(" origin"); break; |
599 |
|
case 'd': printf(" direction"); break; |
600 |
+ |
case 'r': printf(" reflect_contrib"); break; |
601 |
+ |
case 'R': printf(" reflect_length"); break; |
602 |
+ |
case 'x': printf(" unreflect_contrib"); break; |
603 |
+ |
case 'X': printf(" unreflect_length"); break; |
604 |
|
case 'v': printf(" value"); break; |
605 |
+ |
case 'V': printf(" contribution"); break; |
606 |
|
case 'l': printf(" length"); break; |
607 |
|
case 'L': printf(" first_length"); break; |
608 |
|
case 'p': printf(" point"); break; |
610 |
|
case 'N': printf(" unperturbed_normal"); break; |
611 |
|
case 's': printf(" surface"); break; |
612 |
|
case 'w': printf(" weight"); break; |
613 |
+ |
case 'W': printf(" coefficient"); break; |
614 |
|
case 'm': printf(" modifier"); break; |
615 |
+ |
case 'M': printf(" material"); break; |
616 |
+ |
case '~': printf(" tilde"); break; |
617 |
|
} |
618 |
< |
putchar('\n'); |
619 |
< |
printf(erract[WARNING].pf != NULL ? |
620 |
< |
"-w+\t\t\t\t# warning messages on\n" : |
621 |
< |
"-w-\t\t\t\t# warning messages off\n"); |
618 |
> |
fputc('\n', stdout); |
619 |
> |
if (sens_curve == scolor_photopic) |
620 |
> |
printf("-pY\t\t\t\t# photopic output\n"); |
621 |
> |
else if (sens_curve == scolor_scotopic) |
622 |
> |
printf("-pS\t\t\t\t# scotopic output\n"); |
623 |
> |
else if (sens_curve == scolor_melanopic) |
624 |
> |
printf("-pM\t\t\t\t# melanopic output\n"); |
625 |
> |
else if (out_prims == stdprims) |
626 |
> |
printf("-pRGB\t\t\t\t# standard RGB color output\n"); |
627 |
> |
else if (out_prims == xyzprims) |
628 |
> |
printf("-pXYZ\t\t\t\t# CIE XYZ color output\n"); |
629 |
> |
else if (out_prims != NULL) |
630 |
> |
printf("-pc %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\t# output color primaries and white point\n", |
631 |
> |
out_prims[RED][0], out_prims[RED][1], |
632 |
> |
out_prims[GRN][0], out_prims[GRN][1], |
633 |
> |
out_prims[BLU][0], out_prims[BLU][1], |
634 |
> |
out_prims[WHT][0], out_prims[WHT][1]); |
635 |
> |
if (NCSAMP > 3) |
636 |
> |
printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" : |
637 |
> |
"-co+\t\t\t\t# output spectral values\n"); |
638 |
|
print_rdefaults(); |
639 |
|
} |