--- ray/src/rt/rpmain.c 2003/02/22 02:07:29 2.1
+++ ray/src/rt/rpmain.c 2019/03/21 16:52:40 2.19
@@ -1,84 +1,25 @@
#ifndef lint
-static const char RCSid[] = "$Id: rpmain.c,v 2.1 2003/02/22 02:07:29 greg Exp $";
+static const char RCSid[] = "$Id: rpmain.c,v 2.19 2019/03/21 16:52:40 greg Exp $";
#endif
/*
* rpmain.c - main for rpict batch rendering program
*/
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes Radiance software
- * (http://radsite.lbl.gov/)
- * developed by the Lawrence Berkeley National Laboratory
- * (http://www.lbl.gov/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- * and "The Regents of the University of California" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- * nor may "Radiance" appear in their name, without prior written
- * permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory. For more
- * information on Lawrence Berkeley National Laboratory, please see
- * .
- */
+#include "copyright.h"
-#include "ray.h"
+#include
+#include
+#include "platform.h"
+#include "rtprocess.h" /* getpid() */
+#include "ray.h"
#include "source.h"
-
#include "ambient.h"
-
#include "random.h"
-
#include "paths.h"
-
-#include
-
-#include
-
#include "view.h"
+#include "pmapray.h"
-#include "paths.h"
/* persistent processes define */
#ifdef F_SETLKW
#define PERSIST 1 /* normal persist */
@@ -87,13 +28,9 @@ static const char RCSid[] = "$Id: rpmain.c,v 2.1 2003/
#endif
char *progname; /* argv[0] */
-
char *octname; /* octree name */
-
char *sigerr[NSIG]; /* signal error messages */
-
char *shm_boundary = NULL; /* boundary of shared memory */
-
char *errfile = NULL; /* error output file */
extern time_t time();
@@ -113,20 +50,20 @@ extern double dstrpix; /* square pixel distribution
extern double mblur; /* motion blur parameter */
-void onsig();
-void sigdie();
-void printdefaults();
+extern double dblur; /* depth-of-field blur parameter */
+static void onsig(int signo);
+static void sigdie(int signo, char *msg);
+static void printdefaults(void);
+
int
-main(argc, argv)
-int argc;
-char *argv[];
+main(int argc, char *argv[])
{
#define check(ol,al) if (argv[i][ol] || \
badarg(argc-i-1,argv+i+1,al)) \
goto badopt
-#define bool(olen,var) switch (argv[i][olen]) { \
+#define check_bool(olen,var) switch (argv[i][olen]) { \
case '\0': var = !var; break; \
case 'y': case 'Y': case 't': case 'T': \
case '+': case '1': var = 1; break; \
@@ -140,7 +77,7 @@ char *argv[];
int loadflags = ~IO_FILES;
int seqstart = 0;
int persist = 0;
- int duped1;
+ int duped1 = -1;
int rval;
int i;
/* record start time */
@@ -218,6 +155,10 @@ char *argv[];
check(3,"f");
mblur = atof(argv[++i]);
break;
+ case 'd': /* aperture */
+ check(3,"f");
+ dblur = atof(argv[++i]);
+ break;
default:
goto badopt;
}
@@ -268,7 +209,7 @@ char *argv[];
#endif
case 'w': /* warnings */
rval = erract[WARNING].pf != NULL;
- bool(2,rval);
+ check_bool(2,rval);
if (rval) erract[WARNING].pf = wputs;
else erract[WARNING].pf = NULL;
break;
@@ -286,13 +227,25 @@ char *argv[];
/* initialize object types */
initotypes();
/* initialize urand */
- initurand(2048);
+ if (rand_samp) {
+ srandom((long)time(0));
+ initurand(0);
+ } else {
+ srandom(0L);
+ initurand(2048);
+ }
/* set up signal handling */
sigdie(SIGINT, "Interrupt");
+#ifdef SIGHUP
sigdie(SIGHUP, "Hangup");
+#endif
sigdie(SIGTERM, "Terminate");
+#ifdef SIGPIPE
sigdie(SIGPIPE, "Broken pipe");
+#endif
+#ifdef SIGALRM
sigdie(SIGALRM, "Alarm clock");
+#endif
#ifdef SIGXCPU
sigdie(SIGXCPU, "CPU limit exceeded");
sigdie(SIGXFSZ, "File size exceeded");
@@ -333,24 +286,23 @@ char *argv[];
#endif
if (outfile != NULL)
openheader();
-#ifdef MSDOS
- setmode(fileno(stdout), O_BINARY);
+ SET_FILE_BINARY(stdout);
if (octname == NULL)
- setmode(fileno(stdin), O_BINARY);
-#endif
+ SET_FILE_BINARY(stdin);
readoct(octname, loadflags, &thescene, NULL);
nsceneobjs = nobjects;
if (loadflags & IO_INFO) { /* print header */
printargs(i, argv, stdout);
printf("SOFTWARE= %s\n", VersionID);
- fputnow(stdout);
}
+
+ ray_init_pmap(); /* PMAP: set up & load photon maps */
marksources(); /* find and mark sources */
setambient(); /* initialize ambient calculation */
-
+
#ifdef PERSIST
if (persist) {
fflush(stdout);
@@ -366,18 +318,20 @@ char *argv[];
pflock(1);
pfhold();
tstart = time((time_t *)NULL);
+ ambsync(); /* load new values */
}
if (rval < 0)
error(SYSTEM, "cannot fork child for persist function");
- pfdetach(); /* parent exits */
+ pfdetach(); /* parent will run then exit */
}
}
runagain:
- if (persist)
+ if (persist) {
if (outfile == NULL) /* if out to stdout */
dupheader(); /* send header */
else /* if out to file */
duped1 = dup(fileno(stdout)); /* hang onto pipe */
+ }
#endif
/* batch render picture(s) */
rpict(seqstart, outfile, zfile, recover);
@@ -403,20 +357,26 @@ runagain:
goto runagain;
}
#endif
+
+
+ ray_done_pmap(); /* PMAP: free photon maps */
+
quit(0);
badopt:
sprintf(errmsg, "command line error at '%s'", argv[i]);
error(USER, errmsg);
+ return 1; /* pro forma return */
#undef check
-#undef bool
+#undef check_bool
}
void
-wputs(s) /* warning output function */
-char *s;
+wputs( /* warning output function */
+ char *s
+)
{
int lasterrno = errno;
eputs(s);
@@ -425,8 +385,9 @@ char *s;
void
-eputs(s) /* put string to stderr */
-register char *s;
+eputs( /* put string to stderr */
+ register char *s
+)
{
static int midline = 0;
@@ -444,17 +405,20 @@ register char *s;
}
-void
-onsig(signo) /* fatal signal */
-int signo;
+static void
+onsig( /* fatal signal */
+ int signo
+)
{
static int gotsig = 0;
if (gotsig++) /* two signals and we're gone! */
_exit(signo);
+#ifdef SIGALRM /* XXX how critical is this? */
alarm(15); /* allow 15 seconds to clean up */
signal(SIGALRM, SIG_DFL); /* make certain we do die */
+#endif
eputs("signal - ");
eputs(sigerr[signo]);
eputs("\n");
@@ -462,10 +426,11 @@ int signo;
}
-void
-sigdie(signo, msg) /* set fatal signal */
-int signo;
-char *msg;
+static void
+sigdie( /* set fatal signal */
+ int signo,
+ char *msg
+)
{
if (signal(signo, onsig) == SIG_IGN)
signal(signo, SIG_IGN);
@@ -473,17 +438,16 @@ char *msg;
}
-void
-printdefaults() /* print default values to stdout */
+static void
+printdefaults(void) /* print default values to stdout */
{
- register char *cp;
-
printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,
ourview.type==VT_PER ? "perspective" :
ourview.type==VT_PAR ? "parallel" :
ourview.type==VT_HEM ? "hemispherical" :
ourview.type==VT_ANG ? "angular" :
ourview.type==VT_CYL ? "cylindrical" :
+ ourview.type==VT_PLS ? "planisphere" :
"unknown");
printf("-vp %f %f %f\t# view point\n",
ourview.vp[0], ourview.vp[1], ourview.vp[2]);
@@ -502,6 +466,7 @@ printdefaults() /* print default values to stdout */
printf("-pa %f\t\t\t# pixel aspect ratio\n", pixaspect);
printf("-pj %f\t\t\t# pixel jitter\n", dstrpix);
printf("-pm %f\t\t\t# pixel motion\n", mblur);
+ printf("-pd %f\t\t\t# pixel depth-of-field\n", dblur);
printf("-ps %-9d\t\t\t# pixel sample\n", psample);
printf("-pt %f\t\t\t# pixel threshold\n", maxdiff);
printf("-t %-9d\t\t\t# time between reports\n", ralrm);