ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rpmain.c
(Generate patch)

Comparing ray/src/rt/rpmain.c (file contents):
Revision 2.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.17 by schorsch, Sun Mar 6 01:13:18 2016 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  rpmain.c - main for rpict batch rendering program
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10 < #include  "ray.h"
10 > #include  <time.h>
11 > #include  <signal.h>
12  
13 + #include  "platform.h"
14 + #include  "rtprocess.h" /* getpid() */
15 + #include  "ray.h"
16   #include  "source.h"
68 –
17   #include  "ambient.h"
70 –
18   #include  "random.h"
72 –
19   #include  "paths.h"
74 –
75 – #include  <sys/types.h>
76 –
77 – #include  <signal.h>
78 –
20   #include  "view.h"
21 + #include  "pmapray.h"
22  
81 – #include  "paths.h"
23                                          /* persistent processes define */
24   #ifdef  F_SETLKW
25   #define  PERSIST        1               /* normal persist */
# Line 87 | Line 28 | static const char      RCSid[] = "$Id$";
28   #endif
29  
30   char  *progname;                        /* argv[0] */
90 –
31   char  *octname;                         /* octree name */
92 –
32   char  *sigerr[NSIG];                    /* signal error messages */
94 –
33   char  *shm_boundary = NULL;             /* boundary of shared memory */
96 –
34   char  *errfile = NULL;                  /* error output file */
35  
36   extern time_t  time();
# Line 113 | Line 50 | extern double  dstrpix;                        /* square pixel distribution
50  
51   extern double  mblur;                   /* motion blur parameter */
52  
53 < void    onsig();
117 < void    sigdie();
118 < void    printdefaults();
53 > extern double  dblur;                   /* depth-of-field blur parameter */
54  
55 + static void onsig(int signo);
56 + static void sigdie(int  signo, char  *msg);
57 + static void printdefaults(void);
58  
59 +
60   int
61 < main(argc, argv)
123 < int  argc;
124 < char  *argv[];
61 > main(int  argc, char  *argv[])
62   {
63   #define  check(ol,al)           if (argv[i][ol] || \
64                                  badarg(argc-i-1,argv+i+1,al)) \
# Line 140 | Line 77 | char  *argv[];
77          int  loadflags = ~IO_FILES;
78          int  seqstart = 0;
79          int  persist = 0;
80 <        int  duped1;
80 >        int  duped1 = -1;
81          int  rval;
82          int  i;
83                                          /* record start time */
# Line 218 | Line 155 | char  *argv[];
155                                  check(3,"f");
156                                  mblur = atof(argv[++i]);
157                                  break;
158 +                        case 'd':                               /* aperture */
159 +                                check(3,"f");
160 +                                dblur = atof(argv[++i]);
161 +                                break;
162                          default:
163                                  goto badopt;
164                          }
# Line 286 | Line 227 | char  *argv[];
227                                          /* initialize object types */
228          initotypes();
229                                          /* initialize urand */
230 <        initurand(2048);
230 >        if (rand_samp) {
231 >                srandom((long)time(0));
232 >                initurand(0);
233 >        } else {
234 >                srandom(0L);
235 >                initurand(2048);
236 >        }
237                                          /* set up signal handling */
238          sigdie(SIGINT, "Interrupt");
239 + #ifdef SIGHUP
240          sigdie(SIGHUP, "Hangup");
241 + #endif
242          sigdie(SIGTERM, "Terminate");
243 + #ifdef SIGPIPE
244          sigdie(SIGPIPE, "Broken pipe");
245 + #endif
246 + #ifdef SIGALRM
247          sigdie(SIGALRM, "Alarm clock");
248 + #endif
249   #ifdef  SIGXCPU
250          sigdie(SIGXCPU, "CPU limit exceeded");
251          sigdie(SIGXFSZ, "File size exceeded");
# Line 333 | Line 286 | char  *argv[];
286   #endif
287          if (outfile != NULL)
288                  openheader();
289 < #ifdef  MSDOS
290 <        setmode(fileno(stdout), O_BINARY);
289 > #if defined(_WIN32) || defined(_WIN64)
290 >        SET_FILE_BINARY(stdout);
291          if (octname == NULL)
292 <                setmode(fileno(stdin), O_BINARY);
292 >                SET_FILE_BINARY(stdin);
293   #endif
294          readoct(octname, loadflags, &thescene, NULL);
295          nsceneobjs = nobjects;
# Line 344 | Line 297 | char  *argv[];
297          if (loadflags & IO_INFO) {      /* print header */
298                  printargs(i, argv, stdout);
299                  printf("SOFTWARE= %s\n", VersionID);
347 –                fputnow(stdout);
300          }
301 +                  
302 +        ray_init_pmap();     /* PMAP: set up & load photon maps */
303  
304          marksources();                  /* find and mark sources */
305  
306          setambient();                   /* initialize ambient calculation */
307 <
307 >        
308   #ifdef  PERSIST
309          if (persist) {
310                  fflush(stdout);
# Line 366 | Line 320 | char  *argv[];
320                                  pflock(1);
321                                  pfhold();
322                                  tstart = time((time_t *)NULL);
323 +                                ambsync();              /* load new values */
324                          }
325                          if (rval < 0)
326                                  error(SYSTEM, "cannot fork child for persist function");
327 <                        pfdetach();             /* parent exits */
327 >                        pfdetach();             /* parent will run then exit */
328                  }
329          }
330   runagain:
331 <        if (persist)
331 >        if (persist) {
332                  if (outfile == NULL)                    /* if out to stdout */
333                          dupheader();                    /* send header */
334                  else                                    /* if out to file */
335                          duped1 = dup(fileno(stdout));   /* hang onto pipe */
336 +        }
337   #endif
338                                          /* batch render picture(s) */
339          rpict(seqstart, outfile, zfile, recover);
# Line 403 | Line 359 | runagain:
359                  goto runagain;
360          }
361   #endif
362 +
363 +
364 +        ray_done_pmap();           /* PMAP: free photon maps */
365 +        
366          quit(0);
367  
368   badopt:
369          sprintf(errmsg, "command line error at '%s'", argv[i]);
370          error(USER, errmsg);
371 +        return 1; /* pro forma return */
372  
373   #undef  check
374   #undef  bool
# Line 415 | Line 376 | badopt:
376  
377  
378   void
379 < wputs(s)                                /* warning output function */
380 < char    *s;
379 > wputs(                          /* warning output function */
380 >        char    *s
381 > )
382   {
383          int  lasterrno = errno;
384          eputs(s);
# Line 425 | Line 387 | char   *s;
387  
388  
389   void
390 < eputs(s)                                /* put string to stderr */
391 < register char  *s;
390 > eputs(                          /* put string to stderr */
391 >        register char  *s
392 > )
393   {
394          static int  midline = 0;
395  
# Line 444 | Line 407 | register char  *s;
407   }
408  
409  
410 < void
411 < onsig(signo)                            /* fatal signal */
412 < int  signo;
410 > static void
411 > onsig(                          /* fatal signal */
412 >        int  signo
413 > )
414   {
415          static int  gotsig = 0;
416  
417          if (gotsig++)                   /* two signals and we're gone! */
418                  _exit(signo);
419  
420 + #ifdef SIGALRM /* XXX how critical is this? */
421          alarm(15);                      /* allow 15 seconds to clean up */
422          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
423 + #endif
424          eputs("signal - ");
425          eputs(sigerr[signo]);
426          eputs("\n");
# Line 462 | Line 428 | int  signo;
428   }
429  
430  
431 < void
432 < sigdie(signo, msg)                      /* set fatal signal */
433 < int  signo;
434 < char  *msg;
431 > static void
432 > sigdie(                 /* set fatal signal */
433 >        int  signo,
434 >        char  *msg
435 > )
436   {
437          if (signal(signo, onsig) == SIG_IGN)
438                  signal(signo, SIG_IGN);
# Line 473 | Line 440 | char  *msg;
440   }
441  
442  
443 < void
444 < printdefaults()                 /* print default values to stdout */
443 > static void
444 > printdefaults(void)                     /* print default values to stdout */
445   {
479 –        register char  *cp;
480 –
446          printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,
447                          ourview.type==VT_PER ? "perspective" :
448                          ourview.type==VT_PAR ? "parallel" :
449                          ourview.type==VT_HEM ? "hemispherical" :
450                          ourview.type==VT_ANG ? "angular" :
451                          ourview.type==VT_CYL ? "cylindrical" :
452 +                        ourview.type==VT_PLS ? "planisphere" :
453                          "unknown");
454          printf("-vp %f %f %f\t# view point\n",
455                          ourview.vp[0], ourview.vp[1], ourview.vp[2]);
# Line 502 | Line 468 | printdefaults()                        /* print default values to stdout */
468          printf("-pa %f\t\t\t# pixel aspect ratio\n", pixaspect);
469          printf("-pj %f\t\t\t# pixel jitter\n", dstrpix);
470          printf("-pm %f\t\t\t# pixel motion\n", mblur);
471 +        printf("-pd %f\t\t\t# pixel depth-of-field\n", dblur);
472          printf("-ps %-9d\t\t\t# pixel sample\n", psample);
473          printf("-pt %f\t\t\t# pixel threshold\n", maxdiff);
474          printf("-t  %-9d\t\t\t# time between reports\n", ralrm);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines