17 |
|
#include "ambient.h" |
18 |
|
#include "random.h" |
19 |
|
#include "paths.h" |
20 |
+ |
#include "pmapray.h" |
21 |
|
|
22 |
|
extern char *progname; /* global argv[0] */ |
23 |
|
|
69 |
|
#define check(ol,al) if (argv[i][ol] || \ |
70 |
|
badarg(argc-i-1,argv+i+1,al)) \ |
71 |
|
goto badopt |
72 |
< |
#define bool(olen,var) switch (argv[i][olen]) { \ |
72 |
> |
#define check_bool(olen,var) switch (argv[i][olen]) { \ |
73 |
|
case '\0': var = !var; break; \ |
74 |
|
case 'y': case 'Y': case 't': case 'T': \ |
75 |
|
case '+': case '1': var = 1; break; \ |
76 |
|
case 'n': case 'N': case 'f': case 'F': \ |
77 |
|
case '-': case '0': var = 0; break; \ |
78 |
|
default: goto badopt; } |
79 |
+ |
extern char *octname; |
80 |
|
int persist = 0; |
81 |
|
char *octnm = NULL; |
82 |
< |
char **tralp; |
83 |
< |
int duped1; |
82 |
> |
char **tralp = NULL; |
83 |
> |
int duped1 = -1; |
84 |
|
int rval; |
85 |
|
int i; |
86 |
|
/* global program name */ |
89 |
|
for (i = 0; addobjnotify[i] != NULL; i++) |
90 |
|
; |
91 |
|
addobjnotify[i] = tranotify; |
90 |
– |
/* set our defaults */ |
91 |
– |
maxdepth = -10; |
92 |
– |
minweight = 2e-3; |
92 |
|
/* option city */ |
93 |
|
for (i = 1; i < argc; i++) { |
94 |
|
/* expand arguments */ |
131 |
|
break; |
132 |
|
case 'w': /* warnings */ |
133 |
|
rval = erract[WARNING].pf != NULL; |
134 |
< |
bool(2,rval); |
134 |
> |
check_bool(2,rval); |
135 |
|
if (rval) erract[WARNING].pf = wputs; |
136 |
|
else erract[WARNING].pf = NULL; |
137 |
|
break; |
142 |
|
case 'l': /* limit distance */ |
143 |
|
if (argv[i][2] != 'd') |
144 |
|
goto badopt; |
145 |
< |
bool(3,lim_dist); |
145 |
> |
check_bool(3,lim_dist); |
146 |
|
break; |
147 |
|
case 'I': /* immed. irradiance */ |
148 |
< |
bool(2,imm_irrad); |
148 |
> |
check_bool(2,imm_irrad); |
149 |
|
break; |
150 |
|
case 'f': /* format i/o */ |
151 |
|
switch (argv[i][2]) { |
177 |
|
break; |
178 |
|
case 'h': /* header output */ |
179 |
|
rval = loadflags & IO_INFO; |
180 |
< |
bool(2,rval); |
180 |
> |
check_bool(2,rval); |
181 |
|
loadflags = rval ? loadflags | IO_INFO : |
182 |
|
loadflags & ~IO_INFO; |
183 |
|
break; |
191 |
|
tralp = tralist; |
192 |
|
} |
193 |
|
if (argv[i][2] == 'I') { /* file */ |
194 |
< |
rval = wordfile(tralp, |
194 |
> |
rval = wordfile(tralp, MAXMODLIST-(tralp-tralist), |
195 |
|
getpath(argv[++i],getrlibpath(),R_OK)); |
196 |
|
if (rval < 0) { |
197 |
|
sprintf(errmsg, |
213 |
|
tralp = tralist; |
214 |
|
} |
215 |
|
if (argv[i][2] == 'E') { /* file */ |
216 |
< |
rval = wordfile(tralp, |
216 |
> |
rval = wordfile(tralp, MAXMODLIST-(tralp-tralist), |
217 |
|
getpath(argv[++i],getrlibpath(),R_OK)); |
218 |
|
if (rval < 0) { |
219 |
|
sprintf(errmsg, |
250 |
|
if (nproc > 1) { |
251 |
|
if (persist) |
252 |
|
error(USER, "multiprocessing incompatible with persist file"); |
253 |
< |
if (hresolu > 0 && hresolu < nproc) |
253 |
> |
if (!vresolu && hresolu > 0 && hresolu < nproc) |
254 |
|
error(WARNING, "number of cores should not exceed horizontal resolution"); |
255 |
|
if (trace != NULL) |
256 |
|
error(WARNING, "multiprocessing does not work properly with trace mode"); |
312 |
|
#endif |
313 |
|
if (outform != 'a') |
314 |
|
SET_FILE_BINARY(stdout); |
315 |
< |
readoct(octnm, loadflags, &thescene, NULL); |
315 |
> |
readoct(octname = octnm, loadflags, &thescene, NULL); |
316 |
|
nsceneobjs = nobjects; |
317 |
|
|
318 |
|
if (loadflags & IO_INFO) { /* print header */ |
322 |
|
fputformat(formstr(outform), stdout); |
323 |
|
putchar('\n'); |
324 |
|
} |
325 |
< |
|
325 |
> |
|
326 |
> |
ray_init_pmap(); /* PMAP: set up & load photon maps */ |
327 |
> |
|
328 |
|
marksources(); /* find and mark sources */ |
329 |
|
|
330 |
|
setambient(); /* initialize ambient calculation */ |
331 |
< |
|
331 |
> |
|
332 |
|
#ifdef PERSIST |
333 |
|
if (persist) { |
334 |
|
fflush(stdout); |
374 |
|
goto runagain; |
375 |
|
} |
376 |
|
#endif |
377 |
+ |
|
378 |
+ |
ray_done_pmap(); /* PMAP: free photon maps */ |
379 |
+ |
|
380 |
|
quit(0); |
381 |
|
|
382 |
|
badopt: |
385 |
|
return 1; /* pro forma return */ |
386 |
|
|
387 |
|
#undef check |
388 |
< |
#undef bool |
388 |
> |
#undef check_bool |
389 |
|
} |
390 |
|
|
391 |
|
|
462 |
|
if (imm_irrad) |
463 |
|
printf("-I+\t\t\t\t# immediate irradiance on\n"); |
464 |
|
printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); |
465 |
< |
printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu); |
465 |
> |
printf("-x %-9d\t\t\t# %s\n", hresolu, |
466 |
> |
vresolu && hresolu ? "x resolution" : "flush interval"); |
467 |
|
printf("-y %-9d\t\t\t# y resolution\n", vresolu); |
468 |
|
printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" : |
469 |
|
"-ld-\t\t\t\t# limit distance off\n"); |
477 |
|
case 't': case 'T': printf(" trace"); break; |
478 |
|
case 'o': printf(" origin"); break; |
479 |
|
case 'd': printf(" direction"); break; |
480 |
+ |
case 'r': printf(" reflect_contrib"); break; |
481 |
+ |
case 'R': printf(" reflect_length"); break; |
482 |
+ |
case 'x': printf(" unreflect_contrib"); break; |
483 |
+ |
case 'X': printf(" unreflect_length"); break; |
484 |
|
case 'v': printf(" value"); break; |
485 |
|
case 'V': printf(" contribution"); break; |
486 |
|
case 'l': printf(" length"); break; |