--- ray/src/rt/ambient.c 1993/01/20 10:48:23 2.15 +++ ray/src/rt/ambient.c 1993/08/05 10:02:00 2.20 @@ -35,22 +35,28 @@ double minarad; /* minimum ambient radius */ static AMBTREE atrunk; /* our ambient trunk node */ -static char *ambfname = NULL; /* ambient file name */ static FILE *ambfp = NULL; /* ambient file pointer */ +static int nunflshed = 0; /* number of unflushed ambient values */ #define AMBFLUSH (BUFSIZ/AMBVALSIZ) #define newambval() (AMBVAL *)bmalloc(sizeof(AMBVAL)) #define newambtree() (AMBTREE *)calloc(8, sizeof(AMBTREE)) +#define freeambtree(t) free((char *)(t)) extern long ftell(), lseek(); -static int initambfile(), avsave(), avinsert(), ambsync(); +static int initambfile(), avsave(), avinsert(), loadtree(); +static AMBVAL *avstore(); +#ifdef F_SETLKW +static aflock(); +#endif setambres(ar) /* set ambient resolution */ int ar; { + ambres = ar; /* may be done already */ /* set min & max radii */ if (ar <= 0) { minarad = 0.0; @@ -66,6 +72,24 @@ int ar; } +resetambacc(newa) /* change ambient accuracy setting */ +double newa; +{ + AMBTREE oldatrunk; + + if (fabs(newa - ambacc) < 0.01) + return; /* insignificant -- don't bother */ + ambacc = newa; + if (ambacc <= FTINY) + return; /* cannot build new tree */ + /* else need to rebuild tree */ + copystruct(&oldatrunk, &atrunk); + atrunk.alist = NULL; + atrunk.kid = NULL; + loadtree(&oldatrunk); +} + + setambient(afile) /* initialize calculation */ char *afile; { @@ -73,23 +97,31 @@ char *afile; AMBVAL amb; /* init ambient limits */ setambres(ambres); + if (afile == NULL) + return; + if (ambacc <= FTINY) { + sprintf(errmsg, "zero ambient accuracy so \"%s\" not loaded", + afile); + error(WARNING, errmsg); + return; + } /* open ambient file */ - if ((ambfname = afile) != NULL) - if ((ambfp = fopen(afile, "r+")) != NULL) { - initambfile(0); - headlen = ftell(ambfp); - while (readambval(&amb, ambfp)) - avinsert(&amb, &atrunk, thescene.cuorg, - thescene.cusize); - /* 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); - error(SYSTEM, errmsg); - } + if ((ambfp = fopen(afile, "r+")) != NULL) { + initambfile(0); + headlen = ftell(ambfp); + while (readambval(&amb, ambfp)) + avinsert(avstore(&amb), &atrunk, + thescene.cuorg, thescene.cusize); + /* 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); + error(SYSTEM, errmsg); + } + nunflshed++; /* lie */ + ambsync(); } @@ -305,6 +337,9 @@ int creat; { extern char *progname, *octname, VersionID[]; +#ifdef F_SETLKW + aflock(creat ? F_WRLCK : F_RDLCK); +#endif #ifdef MSDOS setmode(fileno(ambfp), O_BINARY); #endif @@ -323,7 +358,6 @@ int creat; putambmagic(ambfp); } else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp)) error(USER, "bad ambient file"); - ambsync(); } @@ -331,44 +365,51 @@ static avsave(av) /* insert and save an ambient value */ AMBVAL *av; { - static int nunflshed = 0; - - avinsert(av, &atrunk, thescene.cuorg, thescene.cusize); + avinsert(avstore(av), &atrunk, thescene.cuorg, thescene.cusize); if (ambfp == NULL) return; if (writambval(av, ambfp) < 0) goto writerr; - if (++nunflshed >= AMBFLUSH) { + if (++nunflshed >= AMBFLUSH) if (ambsync() == EOF) goto writerr; - nunflshed = 0; - } return; writerr: error(SYSTEM, "error writing ambient file"); } +static AMBVAL * +avstore(aval) /* allocate memory and store aval */ +register AMBVAL *aval; +{ + register AMBVAL *av; + + if ((av = newambval()) == NULL) + error(SYSTEM, "out of memory in avstore"); + copystruct(av, aval); + return(av); +} + + static -avinsert(aval, at, c0, s) /* insert ambient value in a tree */ -AMBVAL *aval; +avinsert(av, at, c0, s) /* insert ambient value in a tree */ +register AMBVAL *av; register AMBTREE *at; FVECT c0; double s; { FVECT ck0; int branch; - register AMBVAL *av; register int i; - if ((av = newambval()) == NULL) - goto memerr; - copystruct(av, aval); + if (av->rad <= FTINY) + error(CONSISTENCY, "zero ambient radius in avinsert"); VCOPY(ck0, c0); while (s*(OCTSCALE/2) > av->rad*ambacc) { if (at->kid == NULL) if ((at->kid = newambtree()) == NULL) - goto memerr; + error(SYSTEM, "out of memory in avinsert"); s *= 0.5; branch = 0; for (i = 0; i < 3; i++) @@ -380,54 +421,70 @@ double s; } av->next = at->alist; at->alist = av; - return; -memerr: - error(SYSTEM, "out of memory in avinsert"); } -#ifdef NIX - static -ambsync() /* flush ambient file */ +loadtree(at) /* move tree to main store */ +register AMBTREE *at; { - return(fflush(ambfp)); + register AMBVAL *av; + register int i; + /* transfer values at this node */ + for (av = at->alist; av != NULL; av = at->alist) { + at->alist = av->next; + avinsert(av, &atrunk, thescene.cuorg, thescene.cusize); + } + for (i = 0; i < 8; i++) /* transfer and free children */ + loadtree(at->kid+i); + freeambtree(at->kid); } -#else +#ifdef F_SETLKW + static +aflock(typ) /* lock/unlock ambient file */ +int typ; +{ + static struct flock fls; /* static so initialized to zeroes */ + + fls.l_type = typ; + if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0) + error(SYSTEM, "cannot (un)lock ambient file"); +} + + +int ambsync() /* synchronize ambient file */ { static FILE *ambinp = NULL; static long lastpos = -1; - struct flock fls; long flen; AMBVAL avs; register int n; - /* gain exclusive access */ - fls.l_type = F_WRLCK; - fls.l_whence = 0; - fls.l_start = 0L; - fls.l_len = 0L; - if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0) - error(SYSTEM, "cannot lock ambient file"); - if (lastpos < 0) /* initializing */ + + if (nunflshed == 0) + return(0); + if (lastpos < 0) /* initializing (locked in initambfile) */ goto syncend; + /* gain exclusive access */ + aflock(F_WRLCK); /* see if file has grown */ if ((flen = lseek(fileno(ambfp), 0L, 2)) < 0) error(SYSTEM, "cannot seek on ambient file"); if (n = flen - lastpos) { /* file has grown */ - if (ambinp == NULL) { - ambinp = fopen(ambfname, "r"); + if (ambinp == NULL) { /* use duplicate filedes */ + ambinp = fdopen(dup(fileno(ambfp)), "r"); if (ambinp == NULL) - error(SYSTEM, "fopen failed in ambsync"); + error(SYSTEM, "fdopen failed in ambsync"); } if (fseek(ambinp, lastpos, 0) < 0) error(SYSTEM, "fseek failed in ambsync"); while (n >= AMBVALSIZ) { /* load contributed values */ readambval(&avs, ambinp); - avinsert(&avs,&atrunk,thescene.cuorg,thescene.cusize); + avinsert(avstore(&avs), &atrunk, + thescene.cuorg, thescene.cusize); n -= AMBVALSIZ; } if (n) /* alignment */ @@ -436,9 +493,20 @@ ambsync() /* synchronize ambient file */ syncend: n = fflush(ambfp); /* calls write() at last */ lastpos = lseek(fileno(ambfp), 0L, 1); - fls.l_type = F_UNLCK; /* release file */ - fcntl(fileno(ambfp), F_SETLKW, &fls); + aflock(F_UNLCK); /* release file */ + nunflshed = 0; return(n); +} + +#else + +int +ambsync() /* flush ambient file */ +{ + if (nunflshed == 0) + return(0); + nunflshed = 0; + return(fflush(ambfp)); } #endif