7 |
|
|
8 |
|
#include "copyright.h" |
9 |
|
|
10 |
< |
#include <sys/types.h> |
10 |
> |
#include <time.h> |
11 |
|
#include <signal.h> |
12 |
|
|
13 |
|
#include "platform.h" |
49 |
|
|
50 |
|
extern double mblur; /* motion blur parameter */ |
51 |
|
|
52 |
+ |
extern double dblur; /* depth-of-field blur parameter */ |
53 |
+ |
|
54 |
|
static void onsig(int signo); |
55 |
|
static void sigdie(int signo, char *msg); |
56 |
|
static void printdefaults(void); |
154 |
|
check(3,"f"); |
155 |
|
mblur = atof(argv[++i]); |
156 |
|
break; |
157 |
+ |
case 'd': /* aperture */ |
158 |
+ |
check(3,"f"); |
159 |
+ |
dblur = atof(argv[++i]); |
160 |
+ |
break; |
161 |
|
default: |
162 |
|
goto badopt; |
163 |
|
} |
226 |
|
/* initialize object types */ |
227 |
|
initotypes(); |
228 |
|
/* initialize urand */ |
229 |
< |
initurand(2048); |
229 |
> |
if (rand_samp) { |
230 |
> |
srandom((long)time(0)); |
231 |
> |
initurand(0); |
232 |
> |
} else { |
233 |
> |
srandom(0L); |
234 |
> |
initurand(2048); |
235 |
> |
} |
236 |
|
/* set up signal handling */ |
237 |
|
sigdie(SIGINT, "Interrupt"); |
238 |
|
#ifdef SIGHUP |
317 |
|
pflock(1); |
318 |
|
pfhold(); |
319 |
|
tstart = time((time_t *)NULL); |
320 |
+ |
ambsync(); /* load new values */ |
321 |
|
} |
322 |
|
if (rval < 0) |
323 |
|
error(SYSTEM, "cannot fork child for persist function"); |
324 |
< |
pfdetach(); /* parent exits */ |
324 |
> |
pfdetach(); /* parent will run then exit */ |
325 |
|
} |
326 |
|
} |
327 |
|
runagain: |
442 |
|
ourview.type==VT_HEM ? "hemispherical" : |
443 |
|
ourview.type==VT_ANG ? "angular" : |
444 |
|
ourview.type==VT_CYL ? "cylindrical" : |
445 |
+ |
ourview.type==VT_PLS ? "planisphere" : |
446 |
|
"unknown"); |
447 |
|
printf("-vp %f %f %f\t# view point\n", |
448 |
|
ourview.vp[0], ourview.vp[1], ourview.vp[2]); |
461 |
|
printf("-pa %f\t\t\t# pixel aspect ratio\n", pixaspect); |
462 |
|
printf("-pj %f\t\t\t# pixel jitter\n", dstrpix); |
463 |
|
printf("-pm %f\t\t\t# pixel motion\n", mblur); |
464 |
+ |
printf("-pd %f\t\t\t# pixel depth-of-field\n", dblur); |
465 |
|
printf("-ps %-9d\t\t\t# pixel sample\n", psample); |
466 |
|
printf("-pt %f\t\t\t# pixel threshold\n", maxdiff); |
467 |
|
printf("-t %-9d\t\t\t# time between reports\n", ralrm); |