--- ray/src/rt/rpict.c 1996/02/07 16:35:18 2.43 +++ ray/src/rt/rpict.c 1998/04/13 14:01:08 2.50 @@ -1,4 +1,4 @@ -/* Copyright (c) 1995 Regents of the University of California */ +/* Copyright (c) 1996 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -6,8 +6,6 @@ static char SCCSid[] = "$SunId$ LBL"; /* * rpict.c - routines and variables for picture generation. - * - * 8/14/85 */ #include "ray.h" @@ -55,6 +53,8 @@ int psample = 4; /* pixel sample size */ double maxdiff = .05; /* max. difference for interpolation */ double dstrpix = 0.67; /* square pixel distribution */ +double mblur = 0.; /* motion blur parameter */ + double dstrsrc = 0.0; /* square source distribution */ double shadthresh = .05; /* shadow threshold */ double shadcert = .5; /* shadow certainty */ @@ -64,7 +64,7 @@ int directvis = 1; /* sources visible? */ double srcsizerat = .25; /* maximum ratio source size/dist. */ COLOR cextinction = BLKCOLOR; /* global extinction coefficient */ -double salbedo = 0.; /* global scattering albedo */ +COLOR salbedo = BLKCOLOR; /* global scattering albedo */ double seccg = 0.; /* global scattering eccentricity */ double ssampdist = 0.; /* scatter sampling distance */ @@ -77,6 +77,7 @@ int maxdepth = 6; /* maximum recursion depth */ double minweight = 5e-3; /* minimum ray weight */ 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 */ @@ -103,8 +104,10 @@ extern unsigned long nrays; /* number of rays traced #define pixjitter() (.5+dstrpix*(.5-frandom())) -static int hres, vres; /* resolution for this frame */ +int hres, vres; /* resolution for this frame */ +static VIEW lastview; /* the previous view input */ + extern char *mktemp(); double pixvalue(); @@ -229,6 +232,7 @@ char *pout, *zout, *prvr; for ( ; seq < rn; seq++) if (nextview(stdin) == EOF) error(USER, "unexpected EOF on view input"); + setview(&ourview); prvr = fbuf; /* mark for renaming */ } if (pout != NULL & prvr != NULL) { @@ -270,6 +274,7 @@ char *pout, *zout, *prvr; fbuf); error(USER, errmsg); } + setview(&ourview); continue; /* don't clobber */ } if (freopen(fbuf, "w", stdout) == NULL) { @@ -332,6 +337,7 @@ FILE *fp; { char linebuf[256]; + copystruct(&lastview, &ourview); while (fgets(linebuf, sizeof(linebuf), fp) != NULL) if (isview(linebuf) && sscanview(&ourview, linebuf) > 0) return(0); @@ -404,7 +410,9 @@ char *zfile, *oldfile; else #endif signal(SIGCONT, report); - ypos = vres-1 - i; + ypos = vres-1 - i; /* initialize sampling */ + if (directvis) + init_drawsources(psample); fillscanline(scanbar[0], zbar[0], sampdens, hres, ypos, hstep); /* compute scanlines */ for (ypos -= ystep; ypos > -ystep; ypos -= ystep) { @@ -424,6 +432,8 @@ char *zfile, *oldfile; hres, ypos, hstep); /* fill bar */ fillscanbar(scanbar, zbar, hres, ypos, ystep); + if (directvis) /* add bitty sources */ + drawsources(scanbar, zbar, 0, hres, ypos, ystep); /* write it out */ #ifndef BSD signal(SIGCONT, SIG_IGN); /* don't interrupt writes */ @@ -488,7 +498,7 @@ int xres, y, xstep; int bl = xstep, b = xstep; double z; register int i; - + z = pixvalue(scanline[0], 0, y); if (zline) zline[0] = z; /* zig-zag start for quincunx pattern */ @@ -522,19 +532,17 @@ int xres, y, ysize; float zline[MAXDIV+1]; int b = ysize; register int i, j; - + for (i = 0; i < xres; i++) { - copycolor(vline[0], scanbar[0][i]); copycolor(vline[ysize], scanbar[ysize][i]); if (zbar[0]) { zline[0] = zbar[0][i]; zline[ysize] = zbar[ysize][i]; } - b = fillsample(vline, zbar[0] ? zline : (float *)NULL, i, y, 0, ysize, b/2); - + for (j = 1; j < ysize; j++) copycolor(scanbar[j][i], vline[j]); if (zbar[0]) @@ -557,25 +565,23 @@ int b; COLOR ctmp; int ncut; register int len; - + if (xlen > 0) /* x or y length is zero */ len = xlen; else len = ylen; - + if (len <= 1) /* limit recursion */ return(0); - - if (b > 0 - || (zline && 2.*fabs(zline[0]-zline[len]) > maxdiff*(zline[0]+zline[len])) + + if (b > 0 || + (zline && 2.*fabs(zline[0]-zline[len]) > maxdiff*(zline[0]+zline[len])) || bigdiff(colline[0], colline[len], maxdiff)) { - + z = pixvalue(colline[len>>1], x + (xlen>>1), y + (ylen>>1)); if (zline) zline[len>>1] = z; ncut = 1; - } else { /* interpolate */ - copycolor(colline[len>>1], colline[len]); ratio = (double)(len>>1) / len; scalecolor(colline[len>>1], ratio); @@ -589,7 +595,7 @@ int b; } /* recurse */ ncut += fillsample(colline, zline, x, y, xlen>>1, ylen>>1, (b-1)/2); - + ncut += fillsample(colline+(len>>1), zline ? zline+(len>>1) : (float *)NULL, x+(xlen>>1), y+(ylen>>1), @@ -604,22 +610,41 @@ pixvalue(col, x, y) /* compute pixel value */ COLOR col; /* returned color */ int x, y; /* pixel position */ { - static RAY thisray; - - if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, &ourview, - (x+pixjitter())/hres, (y+pixjitter())/vres)) < -FTINY) { + RAY thisray; + FVECT lorg, ldir; + double hpos, vpos, lmax, d; + /* compute view ray */ + 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); return(0.0); } - rayorigin(&thisray, NULL, PRIMARY, 1.0); - 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; + for (i = 3; i--; ) { + thisray.rorg[i] = (1.-d)*thisray.rorg[i] + d*lorg[i]; + thisray.rdir[i] = (1.-d)*thisray.rdir[i] + d*ldir[i]; + } + if (normalize(thisray.rdir) == 0.0) + return(0.0); + } + + rayorigin(&thisray, NULL, PRIMARY, 1.0); + rayvalue(&thisray); /* trace ray */ copycolor(col, thisray.rcol); /* return color */ - + return(thisray.rt); /* return distance */ }