--- ray/src/rt/rvmain.c 2003/02/25 02:47:23 2.2 +++ ray/src/rt/rvmain.c 2011/10/05 17:20:55 2.11 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rvmain.c,v 2.2 2003/02/25 02:47:23 greg Exp $"; +static const char RCSid[] = "$Id: rvmain.c,v 2.11 2011/10/05 17:20:55 greg Exp $"; #endif /* * rvmain.c - main for rview interactive viewer @@ -7,53 +7,56 @@ static const char RCSid[] = "$Id: rvmain.c,v 2.2 2003/ #include "copyright.h" -#include "ray.h" +#include +#include +#include "platform.h" +#include "ray.h" #include "source.h" - #include "ambient.h" - +#include "rpaint.h" #include "random.h" - #include "paths.h" +#include "view.h" -#include +extern char *progname; /* global argv[0] */ -#include "view.h" +VIEW ourview = STDVIEW; /* viewing parameters */ +int hresolu, vresolu; /* image resolution */ -char *progname; /* argv[0] */ +int psample = 8; /* pixel sample size */ +double maxdiff = .15; /* max. sample difference */ -char *octname; /* octree name */ +int greyscale = 0; /* map colors to brightness? */ +char *dvcname = dev_default; /* output device name */ -char *sigerr[NSIG]; /* signal error messages */ +double exposure = 1.0; /* exposure for scene */ -char *shm_boundary = NULL; /* boundary of shared memory */ +int newparam = 1; /* parameter setting changed */ + +struct driver *dev = NULL; /* driver functions */ -char *errfile = NULL; /* error output file */ +char rifname[128]; /* rad input file name */ -extern int greyscale; /* map colors to brightness? */ -extern char *dvcname; /* output device name */ -extern double exposure; /* exposure compensation */ +VIEW oldview; /* previous view parameters */ -extern VIEW ourview; /* viewing parameters */ +PNODE ptrunk; /* the base of our image */ +RECT pframe; /* current frame boundaries */ +int pdepth; /* image depth in current frame */ -extern char rifname[]; /* rad input file name */ +char *errfile = NULL; /* error output file */ -extern int hresolu; /* horizontal resolution */ -extern int vresolu; /* vertical resolution */ +int nproc = 1; /* number of processes */ -extern int psample; /* pixel sample size */ -extern double maxdiff; /* max. sample difference */ +char *sigerr[NSIG]; /* signal error messages */ -void onsig(); -void sigdie(); -void printdefaults(); +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)) \ @@ -65,11 +68,26 @@ char *argv[]; case 'n': case 'N': case 'f': case 'F': \ case '-': case '0': var = 0; break; \ default: goto badopt; } + char *octnm = NULL; char *err; int rval; int i; /* global program name */ progname = argv[0] = fixargv0(argv[0]); + /* set our defaults */ + shadthresh = .1; + shadcert = .25; + directrelay = 0; + vspretest = 128; + srcsizerat = 0.; + specthresh = .3; + specjitter = 1.; + maxdepth = 6; + minweight = 1e-2; + ambacc = 0.3; + ambres = 32; + ambdiv = 256; + ambssamp = 64; /* option city */ for (i = 1; i < argc; i++) { /* expand arguments */ @@ -105,6 +123,12 @@ char *argv[]; continue; } switch (argv[i][1]) { + case 'n': /* # processes */ + check(2,"i"); + nproc = atoi(argv[++i]); + if (nproc <= 0) + error(USER, "bad number of processes"); + break; case 'v': /* view file */ if (argv[i][2] != 'f') goto badopt; @@ -170,19 +194,13 @@ char *argv[]; err = setview(&ourview); /* set viewing parameters */ if (err != NULL) error(USER, err); - /* initialize object types */ - initotypes(); - /* initialize urand */ - initurand(2048); - /* set up signal handling */ + /* set up signal handling */ sigdie(SIGINT, "Interrupt"); - sigdie(SIGHUP, "Hangup"); sigdie(SIGTERM, "Terminate"); +#ifndef _WIN32 + sigdie(SIGHUP, "Hangup"); sigdie(SIGPIPE, "Broken pipe"); sigdie(SIGALRM, "Alarm clock"); -#ifdef SIGXCPU - sigdie(SIGXCPU, "CPU limit exceeded"); - sigdie(SIGXFSZ, "File size exceeded"); #endif /* open error file */ if (errfile != NULL) { @@ -199,33 +217,28 @@ char *argv[]; #endif /* get octree */ if (i == argc) - octname = NULL; + octnm = NULL; else if (i == argc-1) - octname = argv[i]; + octnm = argv[i]; else goto badopt; - if (octname == NULL) + if (octnm == NULL) error(USER, "missing octree argument"); - /* set up output */ -#ifdef MSDOS - setmode(fileno(stdout), O_BINARY); -#endif - readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL); - nsceneobjs = nobjects; + /* set up output & start process(es) */ + SET_FILE_BINARY(stdout); + + ray_init(octnm); - marksources(); /* find and mark sources */ - - setambient(); /* initialize ambient calculation */ - rview(); /* run interactive viewer */ - ambsync(); /* flush ambient file */ + devclose(); /* close output device */ quit(0); badopt: sprintf(errmsg, "command line error at '%s'", argv[i]); error(USER, errmsg); + return 1; /* pro forma return */ #undef check #undef bool @@ -233,8 +246,9 @@ badopt: void -wputs(s) /* warning output function */ -char *s; +wputs( /* warning output function */ + char *s +) { int lasterrno = errno; eputs(s); @@ -243,8 +257,9 @@ char *s; void -eputs(s) /* put string to stderr */ -register char *s; +eputs( /* put string to stderr */ + char *s +) { static int midline = 0; @@ -262,28 +277,33 @@ 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); +#ifndef _WIN32 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"); + devclose(); quit(3); } -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); @@ -291,11 +311,10 @@ char *msg; } -void -printdefaults() /* print default values to stdout */ +static void +printdefaults(void) /* print default values to stdout */ { - register char *cp; - + printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); printf(greyscale ? "-b+\t\t\t\t# greyscale on\n" : "-b-\t\t\t\t# greyscale off\n"); printf("-vt%c\t\t\t\t# view type %s\n", ourview.type, @@ -304,6 +323,7 @@ printdefaults() /* print default values to stdout */ 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]);