--- ray/src/rt/rpict.c 1994/12/21 09:51:56 2.40 +++ ray/src/rt/rpict.c 1996/06/08 21:16:06 2.47 @@ -1,4 +1,4 @@ -/* Copyright (c) 1994 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" @@ -20,7 +18,6 @@ static char SCCSid[] = "$SunId$ LBL"; #include #else #include -#include #include #endif #endif @@ -64,6 +61,11 @@ int vspretest = 512; /* virtual source pretest dens int directvis = 1; /* sources visible? */ double srcsizerat = .25; /* maximum ratio source size/dist. */ +COLOR cextinction = BLKCOLOR; /* global extinction coefficient */ +COLOR salbedo = BLKCOLOR; /* global scattering albedo */ +double seccg = 0.; /* global scattering eccentricity */ +double ssampdist = 0.; /* scatter sampling distance */ + double specthresh = .15; /* specular sampling threshold */ double specjitter = 1.; /* specular sampling jitter */ @@ -73,6 +75,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 */ @@ -99,7 +102,7 @@ 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 */ extern char *mktemp(); @@ -135,15 +138,13 @@ int code; #ifndef NIX 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); @@ -154,7 +155,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 @@ -164,17 +164,15 @@ 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 @@ -393,6 +391,8 @@ char *zfile, *oldfile; fprtresolu(hres, vres, stdout); /* recover file and compute first */ i = salvage(oldfile); + if (i >= vres) + goto alldone; if (zfd != -1 && i > 0 && lseek(zfd, (long)i*hres*sizeof(float), 0) == -1) error(SYSTEM, "z-file seek error in render"); @@ -403,7 +403,8 @@ char *zfile, *oldfile; else #endif signal(SIGCONT, report); - ypos = vres-1 - i; + ypos = vres-1 - i; /* initialize sampling */ + init_drawsources(psample); fillscanline(scanbar[0], zbar[0], sampdens, hres, ypos, hstep); /* compute scanlines */ for (ypos -= ystep; ypos > -ystep; ypos -= ystep) { @@ -423,6 +424,8 @@ char *zfile, *oldfile; hres, ypos, hstep); /* fill bar */ fillscanbar(scanbar, zbar, hres, ypos, ystep); + /* add bitty sources */ + drawsources(scanbar, zbar, 0, hres, ypos, ystep); /* write it out */ #ifndef BSD signal(SIGCONT, SIG_IGN); /* don't interrupt writes */ @@ -448,18 +451,19 @@ char *zfile, *oldfile; } /* clean up */ signal(SIGCONT, SIG_IGN); - if (zfd != -1) { - if (write(zfd, (char *)zbar[0], hres*sizeof(float)) + if (zfd != -1 && write(zfd, (char *)zbar[0], hres*sizeof(float)) < hres*sizeof(float)) - goto writerr; + goto writerr; + fwritescan(scanbar[0], hres, stdout); + if (fflush(stdout) == EOF) + goto writerr; +alldone: + if (zfd != -1) { if (close(zfd) == -1) goto writerr; for (i = 0; i <= psample; i++) free((char *)zbar[i]); } - fwritescan(scanbar[0], hres, stdout); - if (fflush(stdout) == EOF) - goto writerr; for (i = 0; i <= psample; i++) free((char *)scanbar[i]); if (sampdens != NULL) @@ -486,7 +490,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 */ @@ -520,19 +524,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]) @@ -555,25 +557,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); @@ -587,7 +587,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), @@ -617,7 +617,7 @@ int x, y; /* pixel position */ rayvalue(&thisray); /* trace ray */ copycolor(col, thisray.rcol); /* return color */ - + return(thisray.rt); /* return distance */ }