--- ray/src/rt/rpict.c 1996/01/23 16:27:31 2.42 +++ ray/src/rt/rpict.c 2003/03/10 17:26:26 2.54 @@ -1,15 +1,12 @@ -/* Copyright (c) 1995 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id"; #endif - /* * rpict.c - routines and variables for picture generation. - * - * 8/14/85 */ +#include "copyright.h" + #include "ray.h" #include @@ -20,7 +17,6 @@ static char SCCSid[] = "$SunId$ LBL"; #include #else #include -#include #include #endif #endif @@ -31,8 +27,6 @@ extern time_t time(); #include "view.h" -#include "resolu.h" - #include "random.h" #include "paths.h" @@ -43,10 +37,16 @@ extern time_t time(); #define SIGCONT SIGIO #endif +CUBE thescene; /* our scene */ +OBJECT nsceneobjs; /* number of objects in our scene */ + 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 */ int hresolu = 512; /* horizontal resolution */ int vresolu = 512; /* vertical resolution */ @@ -56,6 +56,12 @@ 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 */ + +void (*trace)() = NULL; /* trace call */ + +int do_irrad = 0; /* compute irradiance? */ + double dstrsrc = 0.0; /* square source distribution */ double shadthresh = .05; /* shadow threshold */ double shadcert = .5; /* shadow certainty */ @@ -65,7 +71,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,7 +83,9 @@ int backvis = 1; /* back face visibility */ int maxdepth = 6; /* maximum recursion depth */ double minweight = 5e-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 */ @@ -86,28 +94,24 @@ int ambounce = 0; /* ambient bounces */ char *amblist[128]; /* ambient include/exclude list */ int ambincl = -1; /* include == 1, exclude == 0 */ -#ifdef MSDOS -int ralrm = 60; /* seconds between reports */ -#else int ralrm = 0; /* seconds between reports */ -#endif double pctdone = 0.0; /* percentage done */ - time_t tlastrept = 0L; /* time at last report */ +time_t tstart; /* starting time */ -extern time_t tstart; /* starting time */ - -extern unsigned long nrays; /* number of rays traced */ - #define MAXDIV 16 /* maximum sample size */ #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(); +void report(); + double pixvalue(); #ifdef NIX @@ -126,29 +130,31 @@ char *fname; #endif +void quit(code) /* quit program */ int code; { if (code) /* report status */ report(); +#ifndef NIX headclean(); /* delete header file */ pfclean(); /* clean up persist files */ +#endif exit(code); } #ifndef NIX +void report() /* report progress */ { + extern char *myhostname(); double u, s; #ifdef BSD - char hostname[257]; struct rusage rubuf; #else struct tms tbuf; - struct utsname nambuf; double period; -#define hostname nambuf.nodename #endif tlastrept = time((time_t *)NULL); @@ -159,7 +165,6 @@ report() /* report progress */ 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; - gethostname(hostname, sizeof(hostname)); #else times(&tbuf); #ifdef _SC_CLK_TCK @@ -169,20 +174,19 @@ report() /* report progress */ #endif u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period; s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period; - uname(&nambuf); #endif sprintf(errmsg, "%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", nrays, pctdone, u/3600., s/3600., - (tlastrept-tstart)/3600., hostname); + (tlastrept-tstart)/3600., myhostname()); eputs(errmsg); #ifndef BSD signal(SIGCONT, report); -#undef hostname #endif } #else +void report() /* report progress */ { tlastrept = time((time_t *)NULL); @@ -193,6 +197,7 @@ report() /* report progress */ #endif +void rpict(seq, pout, zout, prvr) /* generate image(s) */ int seq; char *pout, *zout, *prvr; @@ -208,7 +213,6 @@ char *pout, *zout, *prvr; * sequenced file naming. */ { - extern char *rindex(), *strncpy(), *strcat(), *strcpy(); char fbuf[128], fbuf2[128]; int npicts; register char *cp; @@ -235,6 +239,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) { @@ -276,6 +281,7 @@ char *pout, *zout, *prvr; fbuf); error(USER, errmsg); } + setview(&ourview); continue; /* don't clobber */ } if (freopen(fbuf, "w", stdout) == NULL) { @@ -291,7 +297,7 @@ char *pout, *zout, *prvr; hres = hresolu; vres = vresolu; pa = pixaspect; if (prvr != NULL) if (viewfile(prvr, &ourview, &rs) <= 0 - || rs.or != PIXSTANDARD) { + || rs.rt != PIXSTANDARD) { sprintf(errmsg, "cannot recover view parameters from \"%s\"", prvr); error(WARNING, errmsg); @@ -338,6 +344,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); @@ -348,7 +355,6 @@ FILE *fp; render(zfile, oldfile) /* render the scene */ char *zfile, *oldfile; { - extern long lseek(); COLOR *scanbar[MAXDIV+1]; /* scanline arrays of pixel values */ float *zbar[MAXDIV+1]; /* z values */ char *sampdens; /* previous sample density */ @@ -359,6 +365,12 @@ char *zfile, *oldfile; COLOR *colptr; float *zptr; register int i; + /* check for empty image */ + if (hres <= 0 || vres <= 0) { + error(WARNING, "empty output picture"); + fprtresolu(0, 0, stdout); + return; + } /* allocate scanlines */ for (i = 0; i <= psample; i++) { scanbar[i] = (COLOR *)malloc(hres*sizeof(COLOR)); @@ -369,7 +381,7 @@ char *zfile, *oldfile; ystep = (psample*99+70)/140; if (hstep > 2) { i = hres/hstep + 2; - if ((sampdens = malloc(i)) == NULL) + if ((sampdens = (char *)malloc(i)) == NULL) goto memerr; while (i--) sampdens[i] = hstep; @@ -401,7 +413,7 @@ char *zfile, *oldfile; if (i >= vres) goto alldone; if (zfd != -1 && i > 0 && - lseek(zfd, (long)i*hres*sizeof(float), 0) == -1) + lseek(zfd, (off_t)i*hres*sizeof(float), 0) < 0) error(SYSTEM, "z-file seek error in render"); pctdone = 100.0*i/vres; if (ralrm > 0) /* report init stats */ @@ -410,7 +422,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) { @@ -430,6 +444,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 */ @@ -466,10 +482,10 @@ alldone: if (close(zfd) == -1) goto writerr; for (i = 0; i <= psample; i++) - free((char *)zbar[i]); + free((void *)zbar[i]); } for (i = 0; i <= psample; i++) - free((char *)scanbar[i]); + free((void *)scanbar[i]); if (sampdens != NULL) free(sampdens); pctdone = 100.0; @@ -494,7 +510,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 */ @@ -528,19 +544,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]) @@ -563,25 +577,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); @@ -595,7 +607,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), @@ -610,22 +622,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 */ } @@ -677,7 +708,7 @@ char *oldfile; } if (fflush(stdout) == EOF) goto writerr; - free((char *)scanline); + free((void *)scanline); fclose(fp); unlink(oldfile); return(y);