--- ray/src/rt/rpict.c 2003/03/10 17:26:26 2.54 +++ ray/src/rt/rpict.c 2005/01/18 00:33:16 2.73 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id"; +static const char RCSid[] = "$Id: rpict.c,v 2.73 2005/01/18 00:33:16 greg Exp $"; #endif /* * rpict.c - routines and variables for picture generation. @@ -7,11 +7,9 @@ static const char RCSid[] = "$Id"; #include "copyright.h" -#include "ray.h" - #include -#ifndef NIX +#ifndef NON_POSIX #ifdef BSD #include #include @@ -21,21 +19,26 @@ static const char RCSid[] = "$Id"; #endif #endif -extern time_t time(); - +#include #include +#include "platform.h" +#include "ray.h" +#include "paths.h" +#include "ambient.h" #include "view.h" - #include "random.h" - #include "paths.h" +#include "rtmisc.h" /* myhostname() */ + #define RFTEMPLATE "rfXXXXXX" #ifndef SIGCONT +#ifdef SIGIO /* XXX can we live without this? */ #define SIGCONT SIGIO #endif +#endif CUBE thescene; /* our scene */ OBJECT nsceneobjs; /* number of objects in our scene */ @@ -44,7 +47,7 @@ int dimlist[MAXDIM]; /* sampling dimensions */ int ndims = 0; /* number of sampling dimensions */ int samplendx; /* sample index number */ -extern void ambnotify(); +//extern void ambnotify(); void (*addobjnotify[])() = {ambnotify, NULL}; VIEW ourview = STDVIEW; /* view parameters */ @@ -58,6 +61,8 @@ double dstrpix = 0.67; /* square pixel distribution double mblur = 0.; /* motion blur parameter */ +double dblur = 0.; /* depth-of-field blur parameter */ + void (*trace)() = NULL; /* trace call */ int do_irrad = 0; /* compute irradiance? */ @@ -80,18 +85,18 @@ double specjitter = 1.; /* specular sampling jitter * int backvis = 1; /* back face visibility */ -int maxdepth = 6; /* maximum recursion depth */ -double minweight = 5e-3; /* minimum ray weight */ +int maxdepth = 7; /* maximum recursion depth */ +double minweight = 4e-3; /* minimum ray weight */ char *ambfile = NULL; /* ambient file name */ COLOR ambval = BLKCOLOR; /* ambient value */ int ambvwt = 0; /* initial weight for ambient value */ double ambacc = 0.2; /* ambient accuracy */ -int ambres = 32; /* ambient resolution */ -int ambdiv = 128; /* ambient divisions */ -int ambssamp = 0; /* ambient super-samples */ +int ambres = 64; /* ambient resolution */ +int ambdiv = 512; /* ambient divisions */ +int ambssamp = 128; /* ambient super-samples */ int ambounce = 0; /* ambient bounces */ -char *amblist[128]; /* ambient include/exclude list */ +char *amblist[AMBLLEN]; /* ambient include/exclude list */ int ambincl = -1; /* include == 1, exclude == 0 */ int ralrm = 0; /* seconds between reports */ @@ -108,15 +113,26 @@ int hres, vres; /* resolution for this frame */ static VIEW lastview; /* the previous view input */ -extern char *mktemp(); +//extern char *mktemp(); /* XXX should be in stdlib.h or unistd.h */ -void report(); +//double pixvalue(); -double pixvalue(); +static void report(int); +static int nextview(FILE *fp); +static void render(char *zfile, char *oldfile); +static void fillscanline(COLOR *scanline, float *zline, char *sd, int xres, + int y, int xstep); +static void fillscanbar(COLOR *scanbar[], float *zbar[], int xres, + int y, int ysize); +static int fillsample(COLOR *colline, float *zline, int x, int y, + int xlen, int ylen, int b); +static double pixvalue(COLOR col, int x, int y); +static int salvage(char *oldfile); +static int pixnumber(int x, int y, int xres, int yres); -#ifdef NIX -#define file_exists(f) (access(f,F_OK)==0) -#else + + +#ifdef RHAS_STAT #include #include int @@ -127,6 +143,8 @@ char *fname; if (stat(fname, &sbuf) < 0) return(0); return((sbuf.st_mode & S_IFREG) != 0); } +#else +#define file_exists(f) (access(f,F_OK)==0) #endif @@ -135,8 +153,8 @@ quit(code) /* quit program */ int code; { if (code) /* report status */ - report(); -#ifndef NIX + report(0); +#ifndef NON_POSIX headclean(); /* delete header file */ pfclean(); /* clean up persist files */ #endif @@ -144,11 +162,10 @@ int code; } -#ifndef NIX -void -report() /* report progress */ +#ifndef NON_POSIX +static void +report(int dummy) /* report progress */ { - extern char *myhostname(); double u, s; #ifdef BSD struct rusage rubuf; @@ -181,13 +198,13 @@ report() /* report progress */ nrays, pctdone, u/3600., s/3600., (tlastrept-tstart)/3600., myhostname()); eputs(errmsg); -#ifndef BSD +#ifdef SIGCONT signal(SIGCONT, report); #endif } #else -void -report() /* report progress */ +static void +report(int dummy) /* report progress */ { tlastrept = time((time_t *)NULL); sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", @@ -197,10 +214,13 @@ report() /* report progress */ #endif -void -rpict(seq, pout, zout, prvr) /* generate image(s) */ -int seq; -char *pout, *zout, *prvr; +extern void +rpict( /* generate image(s) */ + int seq, + char *pout, + char *zout, + char *prvr +) /* * If seq is greater than zero, then we will render a sequence of * images based on view parameter strings read from the standard input. @@ -242,7 +262,7 @@ char *pout, *zout, *prvr; setview(&ourview); prvr = fbuf; /* mark for renaming */ } - if (pout != NULL & prvr != NULL) { + if ((pout != NULL) & (prvr != NULL)) { sprintf(fbuf, pout, seq); if (!strcmp(prvr, fbuf)) { /* rename */ strcpy(fbuf2, fbuf); @@ -252,7 +272,7 @@ char *pout, *zout, *prvr; cp--; strcpy(cp, RFTEMPLATE); prvr = mktemp(fbuf2); - if (rename(fbuf, prvr) < 0) + if (rename(fbuf, prvr) < 0) { if (errno == ENOENT) { /* ghost file */ sprintf(errmsg, "new output file \"%s\"", @@ -265,6 +285,7 @@ char *pout, *zout, *prvr; fbuf, prvr); error(SYSTEM, errmsg); } + } } } npicts = 0; /* render sequence */ @@ -289,15 +310,12 @@ char *pout, *zout, *prvr; "cannot open output file \"%s\"", fbuf); error(SYSTEM, errmsg); } -#ifdef MSDOS - setmode(fileno(stdout), O_BINARY); -#endif + SET_FILE_BINARY(stdout); dupheader(); } hres = hresolu; vres = vresolu; pa = pixaspect; - if (prvr != NULL) - if (viewfile(prvr, &ourview, &rs) <= 0 - || rs.rt != PIXSTANDARD) { + if (prvr != NULL) { + if (viewfile(prvr, &ourview, &rs) <= 0) { sprintf(errmsg, "cannot recover view parameters from \"%s\"", prvr); error(WARNING, errmsg); @@ -306,6 +324,7 @@ char *pout, *zout, *prvr; hres = scanlen(&rs); vres = numscans(&rs); } + } if ((cp = setview(&ourview)) != NULL) error(USER, cp); normaspect(viewaspect(&ourview), &pa, &hres, &vres); @@ -323,6 +342,7 @@ char *pout, *zout, *prvr; putchar('\n'); if (pa < .99 || pa > 1.01) fputaspect(pa, stdout); + fputnow(stdout); fputformat(COLRFMT, stdout); putchar('\n'); if (zout != NULL) @@ -339,12 +359,14 @@ char *pout, *zout, *prvr; } -nextview(fp) /* get next view from fp */ -FILE *fp; +static int +nextview( /* get next view from fp */ + FILE *fp +) { char linebuf[256]; - copystruct(&lastview, &ourview); + lastview = ourview; while (fgets(linebuf, sizeof(linebuf), fp) != NULL) if (isview(linebuf) && sscanview(&ourview, linebuf) > 0) return(0); @@ -352,8 +374,11 @@ FILE *fp; } -render(zfile, oldfile) /* render the scene */ -char *zfile, *oldfile; +static void +render( /* render the scene */ + char *zfile, + char *oldfile +) { COLOR *scanbar[MAXDIV+1]; /* scanline arrays of pixel values */ float *zbar[MAXDIV+1]; /* z values */ @@ -393,9 +418,7 @@ char *zfile, *oldfile; sprintf(errmsg, "cannot open z-file \"%s\"", zfile); error(SYSTEM, errmsg); } -#ifdef MSDOS - setmode(zfd, O_BINARY); -#endif + SET_FD_BINARY(zfd); for (i = 0; i <= psample; i++) { zbar[i] = (float *)malloc(hres*sizeof(float)); if (zbar[i] == NULL) @@ -413,15 +436,15 @@ char *zfile, *oldfile; if (i >= vres) goto alldone; if (zfd != -1 && i > 0 && - lseek(zfd, (off_t)i*hres*sizeof(float), 0) < 0) + lseek(zfd, (off_t)i*hres*sizeof(float), SEEK_SET) < 0) error(SYSTEM, "z-file seek error in render"); pctdone = 100.0*i/vres; if (ralrm > 0) /* report init stats */ - report(); -#ifndef BSD + report(0); +#ifdef SIGCONT else -#endif signal(SIGCONT, report); +#endif ypos = vres-1 - i; /* initialize sampling */ if (directvis) init_drawsources(psample); @@ -447,7 +470,7 @@ char *zfile, *oldfile; if (directvis) /* add bitty sources */ drawsources(scanbar, zbar, 0, hres, ypos, ystep); /* write it out */ -#ifndef BSD +#ifdef SIGCONT signal(SIGCONT, SIG_IGN); /* don't interrupt writes */ #endif for (i = ystep; i > 0; i--) { @@ -463,14 +486,16 @@ char *zfile, *oldfile; /* record progress */ pctdone = 100.0*(vres-1-ypos)/vres; if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm) - report(); -#ifndef BSD + report(0); +#ifdef SIGCONT else signal(SIGCONT, report); #endif } /* clean up */ +#ifdef SIGCONT signal(SIGCONT, SIG_IGN); +#endif if (zfd != -1 && write(zfd, (char *)zbar[0], hres*sizeof(float)) < hres*sizeof(float)) goto writerr; @@ -490,8 +515,10 @@ alldone: free(sampdens); pctdone = 100.0; if (ralrm > 0) - report(); + report(0); +#ifdef SIGCONT signal(SIGCONT, SIG_DFL); +#endif return; writerr: error(SYSTEM, "write error in render"); @@ -500,11 +527,15 @@ memerr: } -fillscanline(scanline, zline, sd, xres, y, xstep) /* fill scan at y */ -register COLOR *scanline; -register float *zline; -register char *sd; -int xres, y, xstep; +static void +fillscanline( /* fill scan at y */ + register COLOR *scanline, + register float *zline, + register char *sd, + int xres, + int y, + int xstep +) { static int nc = 0; /* number of calls */ int bl = xstep, b = xstep; @@ -535,10 +566,14 @@ int xres, y, xstep; } -fillscanbar(scanbar, zbar, xres, y, ysize) /* fill interior */ -register COLOR *scanbar[]; -register float *zbar[]; -int xres, y, ysize; +static void +fillscanbar( /* fill interior */ + register COLOR *scanbar[], + register float *zbar[], + int xres, + int y, + int ysize +) { COLOR vline[MAXDIV+1]; float zline[MAXDIV+1]; @@ -564,13 +599,16 @@ int xres, y, ysize; } -int -fillsample(colline, zline, x, y, xlen, ylen, b) /* fill interior points */ -register COLOR *colline; -register float *zline; -int x, y; -int xlen, ylen; -int b; +static int +fillsample( /* fill interior points */ + register COLOR *colline, + register float *zline, + int x, + int y, + int xlen, + int ylen, + int b +) { double ratio; double z; @@ -617,14 +655,17 @@ int b; } -double -pixvalue(col, x, y) /* compute pixel value */ -COLOR col; /* returned color */ -int x, y; /* pixel position */ +static double +pixvalue( /* compute pixel value */ + COLOR col, /* returned color */ + int x, /* pixel position */ + int y +) { RAY thisray; FVECT lorg, ldir; - double hpos, vpos, lmax, d; + double hpos, vpos, vdist, lmax; + register int i; /* compute view ray */ hpos = (x+pixjitter())/hres; vpos = (y+pixjitter())/vres; @@ -633,13 +674,13 @@ int x, y; /* pixel position */ setcolor(col, 0.0, 0.0, 0.0); return(0.0); } + vdist = ourview.vdist; samplendx = pixnumber(x,y,hres,vres); /* set pixel index */ /* optional motion blur */ if (lastview.type && mblur > FTINY && (lmax = viewray(lorg, ldir, &lastview, hpos, vpos)) >= -FTINY) { - register int i; register double d = mblur*(.5-urand(281+samplendx)); thisray.rmax = (1.-d)*thisray.rmax + d*lmax; @@ -649,7 +690,22 @@ int x, y; /* pixel position */ } if (normalize(thisray.rdir) == 0.0) return(0.0); + vdist = (1.-d)*vdist + d*lastview.vdist; } + /* optional depth-of-field */ + if (dblur > FTINY && vdist > FTINY) { + double vc, df[2]; + df[0] = PI/4.*dblur*(.5 - frandom())/sqrt(ourview.hn2); + df[1] = PI/4.*dblur*(.5 - frandom())/sqrt(ourview.vn2); + for (i = 3; i--; ) { + vc = thisray.rorg[i] + vdist*thisray.rdir[i]; + thisray.rorg[i] += df[0]*ourview.hvec[i] + + df[1]*ourview.vvec[i] ; + thisray.rdir[i] = vc - thisray.rorg[i]; + } + if (normalize(thisray.rdir) == 0.0) + return(0.0); + } rayorigin(&thisray, NULL, PRIMARY, 1.0); @@ -661,9 +717,10 @@ int x, y; /* pixel position */ } -int -salvage(oldfile) /* salvage scanlines from killed program */ -char *oldfile; +static int +salvage( /* salvage scanlines from killed program */ + char *oldfile +) { COLR *scanline; FILE *fp; @@ -677,9 +734,7 @@ char *oldfile; error(WARNING, errmsg); goto gotzip; } -#ifdef MSDOS - setmode(fileno(fp), O_BINARY); -#endif + SET_FILE_BINARY(fp); /* discard header */ getheader(fp, NULL, NULL); /* get picture size */ @@ -719,13 +774,16 @@ gotzip: writerr: sprintf(errmsg, "write error during recovery of \"%s\"", oldfile); error(SYSTEM, errmsg); + return -1; /* pro forma return */ } - -int -pixnumber(x, y, xres, yres) /* compute pixel index (brushed) */ -register int x, y; -int xres, yres; +static int +pixnumber( /* compute pixel index (brushed) */ + register int x, + register int y, + int xres, + int yres +) { x -= y; while (x < 0)