--- ray/src/rt/ambient.c 1992/07/16 16:47:28 2.10 +++ ray/src/rt/ambient.c 1993/08/05 10:02:00 2.20 @@ -1,4 +1,4 @@ -/* Copyright (c) 1991 Regents of the University of California */ +/* Copyright (c) 1993 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -6,11 +6,6 @@ static char SCCSid[] = "$SunId$ LBL"; /* * ambient.c - routines dealing with ambient (inter-reflected) component. - * - * The macro AMBFLUSH (if defined) is the number of ambient values - * to wait before flushing to the ambient file. - * - * 5/9/86 */ #include "ray.h" @@ -23,38 +18,45 @@ static char SCCSid[] = "$SunId$ LBL"; #include "random.h" -#define OCTSCALE 0.5 /* ceil((valid rad.)/(cube size)) */ +#define OCTSCALE 0.5 /* ceil((valid rad.)/(cube size)) */ typedef struct ambtree { - AMBVAL *alist; /* ambient value list */ - struct ambtree *kid; /* 8 child nodes */ + AMBVAL *alist; /* ambient value list */ + struct ambtree *kid; /* 8 child nodes */ } AMBTREE; /* ambient octree */ extern CUBE thescene; /* contains space boundaries */ -#define MAXASET 511 /* maximum number of elements in ambient set */ -OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */ +#define MAXASET 511 /* maximum number of elements in ambient set */ +OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */ -double maxarad; /* maximum ambient radius */ -double minarad; /* minimum ambient radius */ +double maxarad; /* maximum ambient radius */ +double minarad; /* minimum ambient radius */ -static AMBTREE atrunk; /* our ambient trunk node */ +static AMBTREE atrunk; /* our ambient trunk node */ static FILE *ambfp = NULL; /* ambient file pointer */ +static int nunflshed = 0; /* number of unflushed ambient values */ -#define AMBFLUSH (BUFSIZ/AMBVALSIZ) +#define AMBFLUSH (BUFSIZ/AMBVALSIZ) -#define newambval() (AMBVAL *)bmalloc(sizeof(AMBVAL)) +#define newambval() (AMBVAL *)bmalloc(sizeof(AMBVAL)) -#define newambtree() (AMBTREE *)calloc(8, sizeof(AMBTREE)) +#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; @@ -70,38 +72,64 @@ 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; { long headlen; - AMBVAL amb; + 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 (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(); } ambnotify(obj) /* record new modifier */ -OBJECT obj; +OBJECT obj; { static int hitlimit = 0; - register OBJREC *o = objptr(obj); + register OBJREC *o = objptr(obj); register char **amblp; if (hitlimit || !ismodifier(o->otype)) @@ -124,7 +152,7 @@ COLOR acol; register RAY *r; { static int rdepth = 0; /* ambient recursion */ - double d; + double d; if (ambdiv <= 0) /* no ambient calculation */ goto dumbamb; @@ -166,17 +194,16 @@ sumambient(acol, r, al, at, c0, s) /* get interpolated COLOR acol; register RAY *r; int al; -AMBTREE *at; +AMBTREE *at; FVECT c0; -double s; +double s; { - extern double sqrt(); - double d, e1, e2, wt, wsum; + double d, e1, e2, wt, wsum; COLOR ct; FVECT ck0; int i; register int j; - register AMBVAL *av; + register AMBVAL *av; /* do this node */ wsum = 0.0; for (av = at->alist; av != NULL; av = av->next) { @@ -255,7 +282,7 @@ COLOR acol; register RAY *r; int al; { - AMBVAL amb; + AMBVAL amb; FVECT gp, gd; /* compute weight */ amb.weight = pow(AVGREFL, (double)al); @@ -280,12 +307,12 @@ int al; extambient(cr, ap, pv, nv) /* extrapolate value at pv, nv */ COLOR cr; -register AMBVAL *ap; +register AMBVAL *ap; FVECT pv, nv; { FVECT v1, v2; register int i; - double d; + double d; d = 1.0; /* zeroeth order */ /* gradient due to translation */ @@ -310,6 +337,12 @@ 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 setbuf(ambfp, bmalloc(BUFSIZ)); if (creat) { /* new file */ fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ", @@ -323,7 +356,6 @@ int creat; fputformat(AMBFMT, ambfp); putc('\n', ambfp); putambmagic(ambfp); - fflush(ambfp); } else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp)) error(USER, "bad ambient file"); } @@ -331,46 +363,53 @@ int creat; static avsave(av) /* insert and save an ambient value */ -AMBVAL *av; +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; +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++) @@ -382,61 +421,92 @@ 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 -#include -#include -#include +#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; - struct flock fls; - struct stat sts; - AMBVAL avs; - long lastpos, flen; + static long lastpos = -1; + long flen; + AMBVAL avs; register int n; + + if (nunflshed == 0) + return(0); + if (lastpos < 0) /* initializing (locked in initambfile) */ + goto syncend; /* 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"); + aflock(F_WRLCK); /* see if file has grown */ - lastpos = lseek(fileno(ambfp), 0L, 1); /* get previous position */ - if (fstat(fileno(ambfp), &sts) < 0) /* get current length */ - error(SYSTEM, "cannot stat ambient file"); - flen = sts.st_size; - if (n = (flen - lastpos)/AMBVALSIZ) { /* file has grown */ - if (ambinp == NULL) /* use duplicate file */ + 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) { /* use duplicate filedes */ ambinp = fdopen(dup(fileno(ambfp)), "r"); - while (n--) { /* load contributed values */ + if (ambinp == NULL) + 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); - } /* moves shared file pointer */ - if (n = (flen - lastpos)%AMBVALSIZ) /* alignment */ + avinsert(avstore(&avs), &atrunk, + thescene.cuorg, thescene.cusize); + n -= AMBVALSIZ; + } + if (n) /* alignment */ lseek(fileno(ambfp), flen-n, 0); } +syncend: n = fflush(ambfp); /* calls write() at last */ - fls.l_type = F_UNLCK; /* release file */ - fcntl(fileno(ambfp), F_SETLKW, &fls); + lastpos = lseek(fileno(ambfp), 0L, 1); + 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