--- ray/src/rt/rpict.c 2004/09/28 17:54:19 2.70 +++ ray/src/rt/rpict.c 2014/05/09 23:28:57 2.88 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rpict.c,v 2.70 2004/09/28 17:54:19 greg Exp $"; +static const char RCSid[] = "$Id: rpict.c,v 2.88 2014/05/09 23:28:57 greg Exp $"; #endif /* * rpict.c - routines and variables for picture generation. @@ -9,27 +9,31 @@ static const char RCSid[] = "$Id: rpict.c,v 2.70 2004/ #include -#ifndef NON_POSIX -#ifdef BSD -#include -#include +#include "platform.h" +#ifdef NON_POSIX + #ifdef MINGW + #include + #endif #else -#include -#include + #ifdef BSD + #include + #include + #else + #include + #include + #endif #endif -#endif #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() */ +#include "hilbert.h" #define RFTEMPLATE "rfXXXXXX" @@ -47,7 +51,6 @@ int dimlist[MAXDIM]; /* sampling dimensions */ int ndims = 0; /* number of sampling dimensions */ int samplendx; /* sample index number */ -//extern void ambnotify(); void (*addobjnotify[])() = {ambnotify, NULL}; VIEW ourview = STDVIEW; /* view parameters */ @@ -61,10 +64,14 @@ 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? */ +int rand_samp = 0; /* pure Monte Carlo sampling? */ + double dstrsrc = 0.0; /* square source distribution */ double shadthresh = .05; /* shadow threshold */ double shadcert = .5; /* shadow certainty */ @@ -84,7 +91,7 @@ double specjitter = 1.; /* specular sampling jitter * int backvis = 1; /* back face visibility */ int maxdepth = 7; /* maximum recursion depth */ -double minweight = 4e-3; /* minimum ray weight */ +double minweight = 1e-3; /* minimum ray weight */ char *ambfile = NULL; /* ambient file name */ COLOR ambval = BLKCOLOR; /* ambient value */ @@ -94,7 +101,7 @@ 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 */ @@ -111,10 +118,6 @@ int hres, vres; /* resolution for this frame */ static VIEW lastview; /* the previous view input */ -//extern char *mktemp(); /* XXX should be in stdlib.h or unistd.h */ - -//double pixvalue(); - static void report(int); static int nextview(FILE *fp); static void render(char *zfile, char *oldfile); @@ -164,37 +167,35 @@ int code; static void report(int dummy) /* report progress */ { - double u, s; + double u, s; #ifdef BSD - struct rusage rubuf; + struct rusage rubuf; #else - struct tms tbuf; - double period; + double period = 1.0 / 60.0; + struct tms tbuf; #endif tlastrept = time((time_t *)NULL); #ifdef BSD getrusage(RUSAGE_SELF, &rubuf); - u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; - s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; + u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec*1e-6; + s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec*1e-6; getrusage(RUSAGE_CHILDREN, &rubuf); - u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; - s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; + u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec*1e-6; + s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec*1e-6; #else times(&tbuf); #ifdef _SC_CLK_TCK period = 1.0 / sysconf(_SC_CLK_TCK); -#else - period = 1.0 / 60.0; #endif u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period; s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period; #endif sprintf(errmsg, - "%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", - nrays, pctdone, u/3600., s/3600., - (tlastrept-tstart)/3600., myhostname()); + "%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s (PID %d)\n", + nrays, pctdone, u*(1./3600.), s*(1./3600.), + (tlastrept-tstart)*(1./3600.), myhostname(), getpid()); eputs(errmsg); #ifdef SIGCONT signal(SIGCONT, report); @@ -202,7 +203,7 @@ report(int dummy) /* report progress */ } #else static void -report(int) /* report progress */ +report(int dummy) /* report progress */ { tlastrept = time((time_t *)NULL); sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", @@ -212,7 +213,7 @@ report(int) /* report progress */ #endif -extern void +void rpict( /* generate image(s) */ int seq, char *pout, @@ -233,7 +234,7 @@ rpict( /* generate image(s) */ { char fbuf[128], fbuf2[128]; int npicts; - register char *cp; + char *cp; RESOLU rs; double pa; /* check sampling */ @@ -249,7 +250,7 @@ rpict( /* generate image(s) */ if (seq <= 0) seq = 0; else if (prvr != NULL && isint(prvr)) { - register int rn; /* skip to specified view */ + int rn; /* skip to specified view */ if ((rn = atoi(prvr)) < seq) error(USER, "recover frame less than start frame"); if (pout == NULL) @@ -338,7 +339,7 @@ rpict( /* generate image(s) */ fputs(VIEWSTR, stdout); fprintview(&ourview, stdout); putchar('\n'); - if (pa < .99 || pa > 1.01) + if ((pa < .99) | (pa > 1.01)) fputaspect(pa, stdout); fputnow(stdout); fputformat(COLRFMT, stdout); @@ -387,9 +388,9 @@ render( /* render the scene */ int zfd; COLOR *colptr; float *zptr; - register int i; + int i; /* check for empty image */ - if (hres <= 0 || vres <= 0) { + if ((hres <= 0) | (vres <= 0)) { error(WARNING, "empty output picture"); fprtresolu(0, 0, stdout); return; @@ -433,7 +434,7 @@ render( /* render the scene */ i = salvage(oldfile); if (i >= vres) goto alldone; - if (zfd != -1 && i > 0 && + if ((zfd != -1) & (i > 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; @@ -527,9 +528,9 @@ memerr: static void fillscanline( /* fill scan at y */ - register COLOR *scanline, - register float *zline, - register char *sd, + COLOR *scanline, + float *zline, + char *sd, int xres, int y, int xstep @@ -538,7 +539,7 @@ fillscanline( /* fill scan at y */ static int nc = 0; /* number of calls */ int bl = xstep, b = xstep; double z; - register int i; + int i; z = pixvalue(scanline[0], 0, y); if (zline) zline[0] = z; @@ -566,8 +567,8 @@ fillscanline( /* fill scan at y */ static void fillscanbar( /* fill interior */ - register COLOR *scanbar[], - register float *zbar[], + COLOR *scanbar[], + float *zbar[], int xres, int y, int ysize @@ -576,7 +577,7 @@ fillscanbar( /* fill interior */ COLOR vline[MAXDIV+1]; float zline[MAXDIV+1]; int b = ysize; - register int i, j; + int i, j; for (i = 0; i < xres; i++) { copycolor(vline[0], scanbar[0][i]); @@ -599,8 +600,8 @@ fillscanbar( /* fill interior */ static int fillsample( /* fill interior points */ - register COLOR *colline, - register float *zline, + COLOR *colline, + float *zline, int x, int y, int xlen, @@ -612,7 +613,7 @@ fillsample( /* fill interior points */ double z; COLOR ctmp; int ncut; - register int len; + int len; if (xlen > 0) /* x or y length is zero */ len = xlen; @@ -660,25 +661,26 @@ pixvalue( /* compute pixel value */ int y ) { + extern void SDsquare2disk(double ds[2], double seedx, double seedy); RAY thisray; FVECT lorg, ldir; - double hpos, vpos, lmax; + double hpos, vpos, vdist, lmax; + int i; /* compute view ray */ + setcolor(col, 0.0, 0.0, 0.0); hpos = (x+pixjitter())/hres; vpos = (y+pixjitter())/vres; if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, - &ourview, hpos, vpos)) < -FTINY) { - setcolor(col, 0.0, 0.0, 0.0); + &ourview, hpos, vpos)) < -FTINY) return(0.0); - } - samplendx = pixnumber(x,y,hres,vres); /* set pixel index */ - + vdist = ourview.vdist; + /* set pixel index */ + samplendx = pixnumber(x,y,hres,vres); /* 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)); + double d = mblur*(.5-urand(281+samplendx)); thisray.rmax = (1.-d)*thisray.rmax + d*lmax; for (i = 3; i--; ) { @@ -687,9 +689,47 @@ pixvalue( /* compute pixel value */ } if (normalize(thisray.rdir) == 0.0) return(0.0); + vdist = (1.-d)*vdist + d*lastview.vdist; } + /* optional depth-of-field */ + if (dblur > FTINY) { + double vc, df[2]; + /* random point on disk */ + SDsquare2disk(df, frandom(), frandom()); + df[0] *= .5*dblur; + df[1] *= .5*dblur; + if ((ourview.type == VT_PER) | (ourview.type == VT_PAR)) { + double adj = 1.0; + if (ourview.type == VT_PER) + adj /= DOT(thisray.rdir, ourview.vdir); + df[0] /= sqrt(ourview.hn2); + df[1] /= sqrt(ourview.vn2); + for (i = 3; i--; ) { + vc = ourview.vp[i] + adj*vdist*thisray.rdir[i]; + thisray.rorg[i] += df[0]*ourview.hvec[i] + + df[1]*ourview.vvec[i] ; + thisray.rdir[i] = vc - thisray.rorg[i]; + } + } else { /* non-standard view case */ + double dfd = PI/4.*dblur*(.5 - frandom()); + if ((ourview.type != VT_ANG) & (ourview.type != VT_PLS)) { + if (ourview.type != VT_CYL) + df[0] /= sqrt(ourview.hn2); + df[1] /= sqrt(ourview.vn2); + } + for (i = 3; i--; ) { + vc = ourview.vp[i] + vdist*thisray.rdir[i]; + thisray.rorg[i] += df[0]*ourview.hvec[i] + + df[1]*ourview.vvec[i] + + dfd*ourview.vdir[i] ; + thisray.rdir[i] = vc - thisray.rorg[i]; + } + } + if (normalize(thisray.rdir) == 0.0) + return(0.0); + } - rayorigin(&thisray, NULL, PRIMARY, 1.0); + rayorigin(&thisray, PRIMARY, NULL, NULL); rayvalue(&thisray); /* trace ray */ @@ -728,7 +768,7 @@ salvage( /* salvage scanlines from killed program */ goto gotzip; } - if (x != hres || y != vres) { + if ((x != hres) | (y != vres)) { sprintf(errmsg, "resolution mismatch in recover file \"%s\"", oldfile); error(USER, errmsg); @@ -759,17 +799,22 @@ writerr: return -1; /* pro forma return */ } - static int -pixnumber( /* compute pixel index (brushed) */ - register int x, - register int y, +pixnumber( /* compute pixel index (screen door) */ + int x, + int y, int xres, int yres ) { - x -= y; - while (x < 0) - x += xres; - return((((x>>2)*yres + y) << 2) + (x & 3)); + unsigned nbits = 0; + bitmask_t coord[2]; + + if (xres < yres) xres = yres; + while (xres > 0) { + xres >>= 1; + ++nbits; + } + coord[0] = x; coord[1] = y; + return ((int)hilbert_c2i(2, nbits, coord)); }