7 |
|
|
8 |
|
#include "copyright.h" |
9 |
|
|
10 |
< |
#include <sys/types.h> |
10 |
> |
#include <time.h> |
11 |
|
#include <signal.h> |
12 |
|
|
13 |
|
#include "platform.h" |
27 |
|
#endif |
28 |
|
|
29 |
|
char *progname; /* argv[0] */ |
30 |
– |
|
30 |
|
char *octname; /* octree name */ |
32 |
– |
|
31 |
|
char *sigerr[NSIG]; /* signal error messages */ |
34 |
– |
|
32 |
|
char *shm_boundary = NULL; /* boundary of shared memory */ |
36 |
– |
|
33 |
|
char *errfile = NULL; /* error output file */ |
34 |
|
|
35 |
|
extern time_t time(); |
49 |
|
|
50 |
|
extern double mblur; /* motion blur parameter */ |
51 |
|
|
52 |
< |
void onsig(); |
57 |
< |
void sigdie(); |
58 |
< |
void printdefaults(); |
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); |
57 |
|
|
58 |
+ |
|
59 |
|
int |
60 |
< |
main(argc, argv) |
63 |
< |
int argc; |
64 |
< |
char *argv[]; |
60 |
> |
main(int argc, char *argv[]) |
61 |
|
{ |
62 |
|
#define check(ol,al) if (argv[i][ol] || \ |
63 |
|
badarg(argc-i-1,argv+i+1,al)) \ |
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: |
361 |
|
badopt: |
362 |
|
sprintf(errmsg, "command line error at '%s'", argv[i]); |
363 |
|
error(USER, errmsg); |
364 |
+ |
return 1; /* pro forma return */ |
365 |
|
|
366 |
|
#undef check |
367 |
|
#undef bool |
369 |
|
|
370 |
|
|
371 |
|
void |
372 |
< |
wputs(s) /* warning output function */ |
373 |
< |
char *s; |
372 |
> |
wputs( /* warning output function */ |
373 |
> |
char *s |
374 |
> |
) |
375 |
|
{ |
376 |
|
int lasterrno = errno; |
377 |
|
eputs(s); |
380 |
|
|
381 |
|
|
382 |
|
void |
383 |
< |
eputs(s) /* put string to stderr */ |
384 |
< |
register char *s; |
383 |
> |
eputs( /* put string to stderr */ |
384 |
> |
register char *s |
385 |
> |
) |
386 |
|
{ |
387 |
|
static int midline = 0; |
388 |
|
|
400 |
|
} |
401 |
|
|
402 |
|
|
403 |
< |
void |
404 |
< |
onsig(signo) /* fatal signal */ |
405 |
< |
int signo; |
403 |
> |
static void |
404 |
> |
onsig( /* fatal signal */ |
405 |
> |
int signo |
406 |
> |
) |
407 |
|
{ |
408 |
|
static int gotsig = 0; |
409 |
|
|
421 |
|
} |
422 |
|
|
423 |
|
|
424 |
< |
void |
425 |
< |
sigdie(signo, msg) /* set fatal signal */ |
426 |
< |
int signo; |
427 |
< |
char *msg; |
424 |
> |
static void |
425 |
> |
sigdie( /* set fatal signal */ |
426 |
> |
int signo, |
427 |
> |
char *msg |
428 |
> |
) |
429 |
|
{ |
430 |
|
if (signal(signo, onsig) == SIG_IGN) |
431 |
|
signal(signo, SIG_IGN); |
433 |
|
} |
434 |
|
|
435 |
|
|
436 |
< |
void |
437 |
< |
printdefaults() /* print default values to stdout */ |
436 |
> |
static void |
437 |
> |
printdefaults(void) /* print default values to stdout */ |
438 |
|
{ |
439 |
|
printf("-vt%c\t\t\t\t# view type %s\n", ourview.type, |
440 |
|
ourview.type==VT_PER ? "perspective" : |
460 |
|
printf("-pa %f\t\t\t# pixel aspect ratio\n", pixaspect); |
461 |
|
printf("-pj %f\t\t\t# pixel jitter\n", dstrpix); |
462 |
|
printf("-pm %f\t\t\t# pixel motion\n", mblur); |
463 |
+ |
printf("-pd %f\t\t\t# pixel depth-of-field\n", dblur); |
464 |
|
printf("-ps %-9d\t\t\t# pixel sample\n", psample); |
465 |
|
printf("-pt %f\t\t\t# pixel threshold\n", maxdiff); |
466 |
|
printf("-t %-9d\t\t\t# time between reports\n", ralrm); |