--- ray/src/rt/ambient.c 1995/10/24 13:33:23 2.33 +++ ray/src/rt/ambient.c 2003/05/15 05:13:35 2.49 @@ -1,17 +1,16 @@ -/* Copyright (c) 1995 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ambient.c,v 2.49 2003/05/15 05:13:35 greg Exp $"; #endif - /* * ambient.c - routines dealing with ambient (inter-reflected) component. + * + * Declarations of external symbols in ambient.h */ +#include "copyright.h" + #include "ray.h" -#include "octree.h" - #include "otypes.h" #include "ambient.h" @@ -21,17 +20,7 @@ static char SCCSid[] = "$SunId$ LBL"; #ifndef OCTSCALE #define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */ #endif -#ifndef AMBVWT -#define AMBVWT 250 /* relative ambient value weight (# calcs) */ -#endif -typedef struct ambtree { - AMBVAL *alist; /* ambient value list */ - struct ambtree *kid; /* 8 child nodes */ -} AMBTREE; /* ambient octree */ - -extern CUBE thescene; /* contains space boundaries */ - extern char *shm_boundary; /* memory sharing boundary */ #define MAXASET 511 /* maximum number of elements in ambient set */ @@ -46,45 +35,55 @@ static FILE *ambfp = NULL; /* ambient file pointer */ static int nunflshed = 0; /* number of unflushed ambient values */ #ifndef SORT_THRESH -#ifdef BIGMEM -#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL)) -#else +#ifdef SMLMEM #define SORT_THRESH ((3L<<20)/sizeof(AMBVAL)) +#else +#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL)) #endif #endif #ifndef SORT_INTVL -#define SORT_INTVL (SORT_THRESH*256) +#define SORT_INTVL (SORT_THRESH<<1) #endif #ifndef MAX_SORT_INTVL -#define MAX_SORT_INTVL (SORT_INTVL<<4) +#define MAX_SORT_INTVL (SORT_INTVL<<6) #endif -static COLOR avsum = BLKCOLOR; /* computed ambient value sum */ -static unsigned int nambvals = 0; /* number of computed ambient values */ +static double avsum = 0.; /* computed ambient value sum (log) */ +static unsigned int navsum = 0; /* number of values in avsum */ +static unsigned int nambvals = 0; /* total number of indirect values */ +static unsigned int nambshare = 0; /* number of values from file */ static unsigned long ambclock = 0; /* ambient access clock */ static unsigned long lastsort = 0; /* time of last value sort */ static long sortintvl = SORT_INTVL; /* time until next sort */ +static FILE *ambinp = NULL; /* auxiliary file for input */ +static long lastpos = -1; /* last flush position */ #define MAXACLOCK (1L<<30) /* clock turnover value */ /* * Track access times unless we are sharing ambient values * through memory on a multiprocessor, when we want to avoid - * claiming our own memory (copy on write). + * claiming our own memory (copy on write). Go ahead anyway + * if more than two thirds of our values are unshared. + * Compile with -Dtracktime=0 to turn this code off. */ -#define tracktime (shm_boundary == NULL || ambfp == NULL) +#ifndef tracktime +#define tracktime (shm_boundary == NULL || nambvals > 3*nambshare) +#endif #define AMBFLUSH (BUFSIZ/AMBVALSIZ) -#define newambval() (AMBVAL *)bmalloc(sizeof(AMBVAL)) +#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) +#define freeav(av) free((void *)av); -extern long ftell(), lseek(); -static int initambfile(), avsave(), avinsert(), sortambvals(); +static void initambfile(), avsave(), avinsert(), sortambvals(), unloadatree(); +static int avlmemi(); static AMBVAL *avstore(); #ifdef F_SETLKW -static aflock(); +static void aflock(); #endif +void setambres(ar) /* set ambient resolution */ int ar; { @@ -106,6 +105,7 @@ int ar; } +void setambacc(newa) /* set ambient accuracy */ double newa; { @@ -119,34 +119,58 @@ double newa; } -setambient(afile) /* initialize calculation */ -char *afile; +void +setambient() /* initialize calculation */ { - long headlen; + int readonly = 0; + long pos, flen; AMBVAL amb; + /* make sure we're fresh */ + ambdone(); /* init ambient limits */ setambres(ambres); setambacc(ambacc); - if (afile == NULL) + if (ambfile == NULL || !ambfile[0]) return; if (ambacc <= FTINY) { sprintf(errmsg, "zero ambient accuracy so \"%s\" not opened", - afile); + ambfile); error(WARNING, errmsg); return; } /* open ambient file */ - if ((ambfp = fopen(afile, "r+")) != NULL) { - initambfile(0); - headlen = ftell(ambfp); + if ((ambfp = fopen(ambfile, "r+")) == NULL) + readonly = (ambfp = fopen(ambfile, "r")) != NULL; + if (ambfp != NULL) { + initambfile(0); /* file exists */ + pos = ftell(ambfp); while (readambval(&amb, ambfp)) avinsert(avstore(&amb)); - /* align */ - fseek(ambfp, -((ftell(ambfp)-headlen)%AMBVALSIZ), 1); - } else if ((ambfp = fopen(afile, "w+")) != NULL) - initambfile(1); - else { - sprintf(errmsg, "cannot open ambient file \"%s\"", afile); + nambshare = nambvals; /* share loaded values */ + if (readonly) { + sprintf(errmsg, + "loaded %u values from read-only ambient file", + nambvals); + error(WARNING, errmsg); + fclose(ambfp); /* close file so no writes */ + ambfp = NULL; + return; /* avoid ambsync() */ + } + /* align file pointer */ + pos += (long)nambvals*AMBVALSIZ; + flen = lseek(fileno(ambfp), (off_t)0L, 2); + if (flen != pos) { + sprintf(errmsg, + "ignoring last %ld values in ambient file (corrupted)", + (flen - pos)/AMBVALSIZ); + error(WARNING, errmsg); + fseek(ambfp, pos, 0); + ftruncate(fileno(ambfp), (off_t)pos); + } + } else if ((ambfp = fopen(ambfile, "w+")) != NULL) { + initambfile(1); /* else create new file */ + } else { + sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); error(SYSTEM, errmsg); } nunflshed++; /* lie */ @@ -154,13 +178,46 @@ char *afile; } +void +ambdone() /* close ambient file and free memory */ +{ + if (ambfp != NULL) { /* close ambient file */ + ambsync(); + fclose(ambfp); + ambfp = NULL; + if (ambinp != NULL) { + fclose(ambinp); + ambinp = NULL; + } + lastpos = -1; + } + /* free ambient tree */ + unloadatree(&atrunk, free); + /* reset state variables */ + avsum = 0.; + navsum = 0; + nambvals = 0; + nambshare = 0; + ambclock = 0; + lastsort = 0; + sortintvl = SORT_INTVL; +} + + +void ambnotify(obj) /* record new modifier */ OBJECT obj; { static int hitlimit = 0; - register OBJREC *o = objptr(obj); + register OBJREC *o; register char **amblp; + if (obj == OVOID) { /* starting over */ + ambset[0] = 0; + hitlimit = 0; + return; + } + o = objptr(obj); if (hitlimit || !ismodifier(o->otype)) return; for (amblp = amblist; *amblp != NULL; amblp++) @@ -176,12 +233,14 @@ OBJECT obj; } -ambient(acol, r) /* compute ambient component for ray */ +void +ambient(acol, r, nrm) /* compute ambient component for ray */ COLOR acol; register RAY *r; +FVECT nrm; { static int rdepth = 0; /* ambient recursion */ - double d; + double d, l; if (ambdiv <= 0) /* no ambient calculation */ goto dumbamb; @@ -201,38 +260,44 @@ register RAY *r; goto dumbamb; return; } - /* resort memory? */ - sortambvals(0); + + if (tracktime) /* sort to minimize thrashing */ + sortambvals(0); /* get ambient value */ setcolor(acol, 0.0, 0.0, 0.0); - d = sumambient(acol, r, rdepth, + d = sumambient(acol, r, nrm, rdepth, &atrunk, thescene.cuorg, thescene.cusize); if (d > FTINY) { scalecolor(acol, 1.0/d); return; } rdepth++; /* need to cache new value */ - d = makeambient(acol, r, rdepth-1); + d = makeambient(acol, r, nrm, rdepth-1); rdepth--; if (d > FTINY) return; dumbamb: /* return global value */ copycolor(acol, ambval); -#if AMBVWT - if (nambvals == 0) + if (ambvwt <= 0 | navsum == 0) return; - scalecolor(acol, (double)AMBVWT); - addcolor(acol, avsum); /* average in computations */ - d = 1.0/(AMBVWT+nambvals); - scalecolor(acol, d); -#endif + l = bright(ambval); /* average in computations */ + if (l > FTINY) { + d = (log(l)*(double)ambvwt + avsum) / + (double)(ambvwt + navsum); + d = exp(d) / l; + scalecolor(acol, d); /* apply color of ambval */ + } else { + d = exp( avsum / (double)navsum ); + setcolor(acol, d, d, d); /* neutral color */ + } } double -sumambient(acol, r, al, at, c0, s) /* get interpolated ambient value */ +sumambient(acol, r, rn, al, at, c0, s) /* get interpolated ambient value */ COLOR acol; register RAY *r; +FVECT rn; int al; AMBTREE *at; FVECT c0; @@ -248,8 +313,9 @@ double s; wsum = 0.0; /* do this node */ for (av = at->alist; av != NULL; av = av->next) { + double rn_dot = -2.0; if (tracktime) - av->latick = ambclock++; + av->latick = ambclock; /* * Ambient level test. */ @@ -270,9 +336,19 @@ double s; if (e1 > ambacc*ambacc*1.21) continue; /* - * Normal direction test. + * Direction test using closest normal. */ - e2 = (1.0 - DOT(av->dir, r->ron)) * r->rweight; + d = DOT(av->dir, r->ron); + if (rn != r->ron) { + rn_dot = DOT(av->dir, rn); + if (rn_dot > 1.0-FTINY) + rn_dot = 1.0-FTINY; + if (rn_dot >= d-FTINY) { + d = rn_dot; + rn_dot = -2.0; + } + } + e2 = (1.0 - d) * r->rweight; if (e2 < 0.0) e2 = 0.0; if (e1 + e2 > ambacc*ambacc*1.21) continue; @@ -288,15 +364,24 @@ double s; /* * Jittering final test reduces image artifacts. */ - wt = sqrt(e1) + sqrt(e2); + e1 = sqrt(e1); + e2 = sqrt(e2); + wt = e1 + e2; if (wt > ambacc*(.9+.2*urand(9015+samplendx))) continue; + /* + * Recompute directional error using perturbed normal + */ + if (rn_dot > 0.0) { + e2 = sqrt((1.0 - rn_dot)*r->rweight); + wt = e1 + e2; + } if (wt <= 1e-3) wt = 1e3; else wt = 1.0 / wt; wsum += wt; - extambient(ct, av, r->rop, r->ron); + extambient(ct, av, r->rop, rn); scalecolor(ct, wt); addcolor(acol, ct); } @@ -315,16 +400,17 @@ double s; break; } if (j == 3) - wsum += sumambient(acol, r, al, at->kid+i, ck0, s); + wsum += sumambient(acol, r, rn, al, at->kid+i, ck0, s); } return(wsum); } double -makeambient(acol, r, al) /* make a new ambient value */ +makeambient(acol, r, rn, al) /* make a new ambient value */ COLOR acol; register RAY *r; +FVECT rn; int al; { AMBVAL amb; @@ -346,16 +432,19 @@ int al; VCOPY(amb.gdir, gd); /* insert into tree */ avsave(&amb); /* and save to file */ + if (rn != r->ron) + extambient(acol, &amb, r->rop, rn); /* texture */ return(amb.rad); } +void extambient(cr, ap, pv, nv) /* extrapolate value at pv, nv */ COLOR cr; register AMBVAL *ap; FVECT pv, nv; { - FVECT v1, v2; + FVECT v1; register int i; double d; @@ -364,9 +453,8 @@ FVECT pv, nv; for (i = 0; i < 3; i++) d += ap->gpos[i]*(pv[i]-ap->pos[i]); /* gradient due to rotation */ - VCOPY(v1, ap->dir); - fcross(v2, v1, nv); - d += DOT(ap->gdir, v2); + VCROSS(v1, ap->dir, nv); + d += DOT(ap->gdir, v1); if (d <= 0.0) { setcolor(cr, 0.0, 0.0, 0.0); return; @@ -376,11 +464,12 @@ FVECT pv, nv; } -static +static void initambfile(creat) /* initialize ambient file */ int creat; { - extern char *progname, *octname, VersionID[]; + extern char *progname, *octname; + static char *mybuf = NULL; #ifdef F_SETLKW aflock(creat ? F_WRLCK : F_RDLCK); @@ -388,17 +477,23 @@ int creat; #ifdef MSDOS setmode(fileno(ambfp), O_BINARY); #endif - setbuf(ambfp, bmalloc(BUFSIZ+8)); + if (mybuf == NULL) + mybuf = (char *)bmalloc(BUFSIZ+8); + setbuf(ambfp, mybuf); if (creat) { /* new file */ newheader("RADIANCE", ambfp); - fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ", + fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ", progname, colval(ambval,RED), colval(ambval,GRN), colval(ambval,BLU), - ambounce, ambacc); - fprintf(ambfp, "-ad %d -as %d -ar %d %s\n", - ambdiv, ambssamp, ambres, - octname==NULL ? "" : octname); + ambvwt, ambounce, ambacc); + fprintf(ambfp, "-ad %d -as %d -ar %d ", + ambdiv, ambssamp, ambres); + if (octname != NULL) + printargs(1, &octname, ambfp); + else + fputc('\n', ambfp); fprintf(ambfp, "SOFTWARE= %s\n", VersionID); + fputnow(ambfp); fputformat(AMBFMT, ambfp); putc('\n', ambfp); putambmagic(ambfp); @@ -407,7 +502,7 @@ int creat; } -static +static void avsave(av) /* insert and save an ambient value */ AMBVAL *av; { @@ -421,7 +516,7 @@ AMBVAL *av; goto writerr; return; writerr: - error(SYSTEM, "error writing ambient file"); + error(SYSTEM, "error writing to ambient file"); } @@ -430,14 +525,19 @@ avstore(aval) /* allocate memory and store aval */ register AMBVAL *aval; { register AMBVAL *av; + double d; if ((av = newambval()) == NULL) error(SYSTEM, "out of memory in avstore"); copystruct(av, aval); av->latick = ambclock; av->next = NULL; - addcolor(avsum, av->val); /* add to sum for averaging */ nambvals++; + d = bright(av->val); + if (d > FTINY) { /* add to log sum for averaging */ + avsum += log(d); + navsum++; + } return(av); } @@ -447,14 +547,13 @@ register AMBVAL *aval; static AMBTREE *atfreelist = NULL; /* free ambient tree structures */ -static -AMBTREE * +static AMBTREE * newambtree() /* allocate 8 ambient tree structs */ { register AMBTREE *atp, *upperlim; if (atfreelist == NULL) { /* get more nodes */ - atfreelist = (AMBTREE *)bmalloc(ATALLOCSZ*8*sizeof(AMBTREE)); + atfreelist = (AMBTREE *)malloc(ATALLOCSZ*8*sizeof(AMBTREE)); if (atfreelist == NULL) return(NULL); /* link new free list */ @@ -470,7 +569,7 @@ newambtree() /* allocate 8 ambient tree structs */ } -static +static void freeambtree(atp) /* free 8 ambient tree structs */ AMBTREE *atp; { @@ -479,7 +578,7 @@ AMBTREE *atp; } -static +static void avinsert(av) /* insert ambient value in our tree */ register AMBVAL *av; { @@ -519,10 +618,10 @@ register AMBVAL *av; } -static +static void unloadatree(at, f) /* unload an ambient value tree */ register AMBTREE *at; -int (*f)(); +void (*f)(); { register AMBVAL *av; register int i; @@ -540,40 +639,53 @@ int (*f)(); } -static AMBVAL **avlist1, **avlist2; /* ambient value lists for sorting */ +static struct avl { + AMBVAL *p; + unsigned long t; +} *avlist1; /* ambient value list with ticks */ +static AMBVAL **avlist2; /* memory positions for sorting */ static int i_avlist; /* index for lists */ -static +static int av2list(av) -AMBVAL *av; +register AMBVAL *av; { #ifdef DEBUG if (i_avlist >= nambvals) error(CONSISTENCY, "too many ambient values in av2list1"); #endif - avlist1[i_avlist] = avlist2[i_avlist] = av; - i_avlist++; + avlist1[i_avlist].p = avlist2[i_avlist] = av; + avlist1[i_avlist++].t = av->latick; } static int -alatcmp(avp1, avp2) /* compare ambient values for MRA */ -AMBVAL **avp1, **avp2; +alatcmp(av1, av2) /* compare ambient values for MRA */ +struct avl *av1, *av2; { - return((**avp2).latick - (**avp1).latick); + register long lc = av2->t - av1->t; + return(lc<0 ? -1 : lc>0 ? 1 : 0); } +/* GW NOTE 2002/10/3: + * I used to compare AMBVAL pointers, but found that this was the + * cause of a serious consistency error with gcc, since the optimizer + * uses some dangerous trick in pointer subtraction that + * assumes pointers differ by exact struct size increments. + */ static int aposcmp(avp1, avp2) /* compare ambient value positions */ -AMBVAL **avp1, **avp2; +const void *avp1, *avp2; { - return(*avp1 - *avp2); + register long diff = *(char * const *)avp1 - *(char * const *)avp2; + if (diff < 0) + return(-1); + return(diff > 0); } - -#ifdef DEBUG +#if 1 static int avlmemi(avaddr) /* find list position from address */ AMBVAL *avaddr; @@ -592,7 +704,7 @@ AMBVAL *avaddr; #endif -static +static void sortambvals(always) /* resort ambient values */ int always; { @@ -600,7 +712,7 @@ int always; AMBVAL tav, *tap, *pnext; register int i, j; /* see if it's time yet */ - if (!always && (ambclock < lastsort+sortintvl || + if (!always && (ambclock++ < lastsort+sortintvl || nambvals < SORT_THRESH)) return; /* @@ -619,13 +731,15 @@ int always; * tree will be rebuilt with the new accuracy parameter. */ if (tracktime) { /* allocate pointer arrays to sort */ - avlist1 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); - } else - avlist1 = avlist2 = NULL; - if (avlist2 == NULL) { /* no time tracking -- rebuild tree? */ - if (avlist1 != NULL) - free((char *)avlist1); + avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl)); + } else { + avlist2 = NULL; + avlist1 = NULL; + } + if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */ + if (avlist2 != NULL) + free((void *)avlist2); if (always) { /* rebuild without sorting */ copystruct(&oldatrunk, &atrunk); atrunk.alist = NULL; @@ -652,25 +766,25 @@ int always; if (i_avlist < nambvals) error(CONSISTENCY, "missing ambient values in sortambvals"); #endif - qsort((char *)avlist1, nambvals, sizeof(AMBVAL *), alatcmp); + qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp); qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp); for (i = 0; i < nambvals; i++) { - if (avlist1[i] == NULL) + if (avlist1[i].p == NULL) continue; tap = avlist2[i]; copystruct(&tav, tap); - for (j = i; (pnext = avlist1[j]) != tap; + for (j = i; (pnext = avlist1[j].p) != tap; j = avlmemi(pnext)) { copystruct(avlist2[j], pnext); avinsert(avlist2[j]); - avlist1[j] = NULL; + avlist1[j].p = NULL; } copystruct(avlist2[j], &tav); avinsert(avlist2[j]); - avlist1[j] = NULL; + avlist1[j].p = NULL; } - free((char *)avlist1); - free((char *)avlist2); + free((void *)avlist1); + free((void *)avlist2); /* compute new sort interval */ sortintvl = ambclock - lastsort; if (sortintvl >= MAX_SORT_INTVL/2) @@ -689,7 +803,7 @@ int always; #ifdef F_SETLKW -static +static void aflock(typ) /* lock/unlock ambient file */ int typ; { @@ -704,8 +818,6 @@ int typ; int ambsync() /* synchronize ambient file */ { - static FILE *ambinp = NULL; - static long lastpos = -1; long flen; AMBVAL avs; register int n; @@ -717,7 +829,7 @@ ambsync() /* synchronize ambient file */ /* gain exclusive access */ aflock(F_WRLCK); /* see if file has grown */ - if ((flen = lseek(fileno(ambfp), 0L, 2)) < 0) + if ((flen = lseek(fileno(ambfp), (off_t)0L, 2)) < 0) goto seekerr; if (n = flen - lastpos) { /* file has grown */ if (ambinp == NULL) { /* use duplicate filedes */ @@ -728,13 +840,19 @@ ambsync() /* synchronize ambient file */ if (fseek(ambinp, lastpos, 0) < 0) goto seekerr; while (n >= AMBVALSIZ) { /* load contributed values */ - readambval(&avs, ambinp); + if (!readambval(&avs, ambinp)) { + sprintf(errmsg, + "ambient file \"%s\" corrupted near character %ld", + ambfile, flen - n); + error(WARNING, errmsg); + break; + } avinsert(avstore(&avs)); n -= AMBVALSIZ; } /*** seek always as safety measure if (n) ***/ /* alignment */ - if (lseek(fileno(ambfp), flen-n, 0) < 0) + if (lseek(fileno(ambfp), (off_t)(flen-n), 0) < 0) goto seekerr; } #ifdef DEBUG @@ -747,7 +865,7 @@ ambsync() /* synchronize ambient file */ #endif syncend: n = fflush(ambfp); /* calls write() at last */ - if ((lastpos = lseek(fileno(ambfp), 0L, 1)) < 0) + if ((lastpos = lseek(fileno(ambfp), (off_t)0L, 1)) < 0) goto seekerr; aflock(F_UNLCK); /* release file */ nunflshed = 0;