--- ray/src/rt/ambient.c 1998/06/17 13:29:55 2.44 +++ ray/src/rt/ambient.c 2003/10/20 16:01:55 2.55 @@ -1,34 +1,26 @@ -/* Copyright (c) 1996 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ambient.c,v 2.55 2003/10/20 16:01:55 greg Exp $"; #endif - /* * ambient.c - routines dealing with ambient (inter-reflected) component. + * + * Declarations of external symbols in ambient.h */ -#include "ray.h" +#include "copyright.h" -#include "octree.h" +#include +#include "platform.h" +#include "ray.h" #include "otypes.h" - #include "ambient.h" - #include "random.h" #ifndef OCTSCALE #define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */ #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 */ @@ -43,10 +35,10 @@ 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 @@ -63,6 +55,8 @@ static unsigned int nambshare = 0; /* number of value 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 */ /* @@ -78,15 +72,18 @@ static long sortintvl = SORT_INTVL; /* time until nex #define AMBFLUSH (BUFSIZ/AMBVALSIZ) -#define newambval() (AMBVAL *)bmalloc(sizeof(AMBVAL)) +#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) +#define freeav(av) free((void *)av); -static int initambfile(), avsave(), avinsert(), sortambvals(), avlmemi(); +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; { @@ -108,6 +105,7 @@ int ar; } +void setambacc(newa) /* set ambient accuracy */ double newa; { @@ -121,44 +119,60 @@ double newa; } -setambient(afile) /* initialize calculation */ -char *afile; +void +setambient() /* initialize calculation */ { + 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); + 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 */ + 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), 0L, 2); + flen = lseek(fileno(ambfp), (off_t)0, SEEK_END); 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), pos); +#ifndef _WIN32 /* XXX we need a replacement for that one */ + ftruncate(fileno(ambfp), (off_t)pos); +#endif } - nambshare = nambvals; - } else if ((ambfp = fopen(afile, "w+")) != NULL) - initambfile(1); - else { - sprintf(errmsg, "cannot open ambient file \"%s\"", afile); + } 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 */ @@ -166,13 +180,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++) @@ -188,6 +235,7 @@ OBJECT obj; } +void ambient(acol, r, nrm) /* compute ambient component for ray */ COLOR acol; register RAY *r; @@ -232,7 +280,7 @@ FVECT nrm; return; dumbamb: /* return global value */ copycolor(acol, ambval); - if (ambvwt <= 0 | navsum == 0) + if ((ambvwt <= 0) | (navsum == 0)) return; l = bright(ambval); /* average in computations */ if (l > FTINY) { @@ -267,6 +315,7 @@ 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; /* @@ -289,9 +338,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; @@ -307,9 +366,18 @@ 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 @@ -372,12 +440,13 @@ int al; } +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; @@ -386,9 +455,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; @@ -398,29 +466,34 @@ 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); #endif -#ifdef MSDOS - setmode(fileno(ambfp), O_BINARY); -#endif - setbuf(ambfp, bmalloc(BUFSIZ+8)); + SET_FILE_BINARY(ambfp); + 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 -aw %d -ab %d -aa %g ", progname, colval(ambval,RED), colval(ambval,GRN), colval(ambval,BLU), ambvwt, ambounce, ambacc); - fprintf(ambfp, "-ad %d -as %d -ar %d %s\n", - ambdiv, ambssamp, ambres, - octname==NULL ? "" : octname); + 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); @@ -429,7 +502,7 @@ int creat; } -static +static void avsave(av) /* insert and save an ambient value */ AMBVAL *av; { @@ -443,7 +516,7 @@ AMBVAL *av; goto writerr; return; writerr: - error(SYSTEM, "error writing ambient file"); + error(SYSTEM, "error writing to ambient file"); } @@ -456,7 +529,7 @@ register AMBVAL *aval; if ((av = newambval()) == NULL) error(SYSTEM, "out of memory in avstore"); - copystruct(av, aval); + *av = *aval; av->latick = ambclock; av->next = NULL; nambvals++; @@ -474,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 */ @@ -492,12 +564,12 @@ newambtree() /* allocate 8 ambient tree structs */ } atp = atfreelist; atfreelist = atp->kid; - bzero((char *)atp, 8*sizeof(AMBTREE)); + memset((char *)atp, '\0', 8*sizeof(AMBTREE)); return(atp); } -static +static void freeambtree(atp) /* free 8 ambient tree structs */ AMBTREE *atp; { @@ -506,7 +578,7 @@ AMBTREE *atp; } -static +static void avinsert(av) /* insert ambient value in our tree */ register AMBVAL *av; { @@ -546,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; @@ -575,7 +647,7 @@ static AMBVAL **avlist2; /* memory positions for sort static int i_avlist; /* index for lists */ -static +static int av2list(av) register AMBVAL *av; { @@ -597,14 +669,22 @@ struct avl *av1, *av2; } +/* 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); } - #if 1 static int avlmemi(avaddr) /* find list position from address */ @@ -624,7 +704,7 @@ AMBVAL *avaddr; #endif -static +static void sortambvals(always) /* resort ambient values */ int always; { @@ -659,9 +739,9 @@ int always; } if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */ if (avlist2 != NULL) - free((char *)avlist2); + free((void *)avlist2); if (always) { /* rebuild without sorting */ - copystruct(&oldatrunk, &atrunk); + oldatrunk = atrunk; atrunk.alist = NULL; atrunk.kid = NULL; unloadatree(&oldatrunk, avinsert); @@ -692,19 +772,19 @@ int always; if (avlist1[i].p == NULL) continue; tap = avlist2[i]; - copystruct(&tav, tap); + tav = *tap; for (j = i; (pnext = avlist1[j].p) != tap; j = avlmemi(pnext)) { - copystruct(avlist2[j], pnext); + *(avlist2[j]) = *pnext; avinsert(avlist2[j]); avlist1[j].p = NULL; } - copystruct(avlist2[j], &tav); + *(avlist2[j]) = tav; avinsert(avlist2[j]); 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) @@ -723,7 +803,7 @@ int always; #ifdef F_SETLKW -static +static void aflock(typ) /* lock/unlock ambient file */ int typ; { @@ -738,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; @@ -751,9 +829,9 @@ 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)0, SEEK_END)) < 0) goto seekerr; - if (n = flen - lastpos) { /* file has grown */ + if ( (n = flen - lastpos) ) { /* file has grown */ if (ambinp == NULL) { /* use duplicate filedes */ ambinp = fdopen(dup(fileno(ambfp)), "r"); if (ambinp == NULL) @@ -764,8 +842,8 @@ ambsync() /* synchronize ambient file */ while (n >= AMBVALSIZ) { /* load contributed values */ if (!readambval(&avs, ambinp)) { sprintf(errmsg, - "ambient file corrupted near character %ld", - flen - n); + "ambient file \"%s\" corrupted near character %ld", + ambfile, flen - n); error(WARNING, errmsg); break; } @@ -774,7 +852,7 @@ ambsync() /* synchronize ambient file */ } /*** seek always as safety measure if (n) ***/ /* alignment */ - if (lseek(fileno(ambfp), flen-n, 0) < 0) + if (lseek(fileno(ambfp), (off_t)(flen-n), SEEK_SET) < 0) goto seekerr; } #ifdef DEBUG @@ -787,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)0, SEEK_CUR)) < 0) goto seekerr; aflock(F_UNLCK); /* release file */ nunflshed = 0;