88 |
|
; |
89 |
|
addobjnotify[i] = tranotify; |
90 |
|
/* set our defaults */ |
91 |
+ |
rand_samp = 1; |
92 |
|
maxdepth = -10; |
93 |
|
minweight = 2e-3; |
94 |
|
/* option city */ |
252 |
|
if (nproc > 1) { |
253 |
|
if (persist) |
254 |
|
error(USER, "multiprocessing incompatible with persist file"); |
255 |
< |
if (imm_irrad) |
255 |
< |
error(USER, "multiprocessing incompatible with immediate irradiance"); |
256 |
< |
if (hresolu > 0 && hresolu < nproc) |
255 |
> |
if (!vresolu && hresolu > 0 && hresolu < nproc) |
256 |
|
error(WARNING, "number of cores should not exceed horizontal resolution"); |
257 |
|
if (trace != NULL) |
258 |
|
error(WARNING, "multiprocessing does not work properly with trace mode"); |
353 |
|
if (persist) |
354 |
|
dupheader(); /* send header to stdout */ |
355 |
|
#endif |
357 |
– |
if (nproc > 1) /* start multiprocessing */ |
358 |
– |
ray_popen(nproc); |
356 |
|
/* trace rays */ |
357 |
< |
rtrace(NULL); |
357 |
> |
rtrace(NULL, nproc); |
358 |
|
/* flush ambient file */ |
359 |
|
ambsync(); |
360 |
|
#ifdef PERSIST |
459 |
|
if (imm_irrad) |
460 |
|
printf("-I+\t\t\t\t# immediate irradiance on\n"); |
461 |
|
printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); |
462 |
< |
printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu); |
462 |
> |
printf("-x %-9d\t\t\t# %s\n", hresolu, |
463 |
> |
vresolu && hresolu ? "x resolution" : "flush interval"); |
464 |
|
printf("-y %-9d\t\t\t# y resolution\n", vresolu); |
465 |
|
printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" : |
466 |
|
"-ld-\t\t\t\t# limit distance off\n"); |