--- ray/src/rt/ambient.c 2014/05/11 19:03:37 2.89 +++ ray/src/rt/ambient.c 2019/02/16 00:09:53 2.107 @@ -1,6 +1,4 @@ -#ifndef lint -static const char RCSid[] = "$Id: ambient.c,v 2.89 2014/05/11 19:03:37 greg Exp $"; -#endif +static const char RCSid[] = "$Id: ambient.c,v 2.107 2019/02/16 00:09:53 greg Exp $"; /* * ambient.c - routines dealing with ambient (inter-reflected) component. * @@ -14,9 +12,11 @@ static const char RCSid[] = "$Id: ambient.c,v 2.89 201 #include "platform.h" #include "ray.h" #include "otypes.h" +#include "otspecial.h" #include "resolu.h" #include "ambient.h" #include "random.h" +#include "pmapamb.h" #ifndef OCTSCALE #define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */ @@ -77,7 +77,6 @@ static long lastpos = -1; /* last flush position */ #define AMBFLUSH (BUFSIZ/AMBVALSIZ) #define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) -#define freeav(av) free((void *)av); static void initambfile(int creat); static void avsave(AMBVAL *av); @@ -133,7 +132,7 @@ setambacc( /* set ambient accuracy */ newa *= (newa > 0); if (fabs(newa - olda) >= .05*(newa + olda)) { ambacc = newa; - if (nambvals > 0) + if (ambacc > FTINY && nambvals > 0) sortambvals(1); /* rebuild tree */ } } @@ -185,9 +184,7 @@ setambient(void) /* initialize calculation */ (flen - lastpos)/AMBVALSIZ); error(WARNING, errmsg); fseek(ambfp, lastpos, SEEK_SET); -#ifndef _WIN32 /* XXX we need a replacement for that one */ ftruncate(fileno(ambfp), (off_t)lastpos); -#endif } } else if ((ambfp = fopen(ambfile, "w+")) != NULL) { initambfile(1); /* else create new file */ @@ -197,9 +194,6 @@ setambient(void) /* initialize calculation */ sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); error(SYSTEM, errmsg); } -#ifdef getc_unlocked - flockfile(ambfp); /* application-level lock */ -#endif #ifdef F_SETLKW aflock(F_UNLCK); /* release file */ #endif @@ -220,7 +214,7 @@ ambdone(void) /* close ambient file and free memory lastpos = -1; } /* free ambient tree */ - unloadatree(&atrunk, &avfree); + unloadatree(&atrunk, avfree); /* reset state variables */ avsum = 0.; navsum = 0; @@ -263,7 +257,7 @@ ambnotify( /* record new modifier */ /************ THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD ***************/ -#ifdef NEWAMB +#ifndef OLDAMB #define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr))) @@ -271,7 +265,7 @@ static int plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, static double sumambient(COLOR acol, RAY *r, FVECT rn, int al, AMBTREE *at, FVECT c0, double s); static int makeambient(COLOR acol, RAY *r, FVECT rn, int al); -static void extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, +static int extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, FVECT uvw[3]); void @@ -282,10 +276,22 @@ multambient( /* compute ambient component & multiply ) { static int rdepth = 0; /* ambient recursion */ - COLOR acol; - int ok; + COLOR acol, caustic; + int i, ok; double d, l; + /* PMAP: Factor in ambient from photon map, if enabled and ray is + * ambient. Return as all ambient components accounted for, else + * continue. */ + if (ambPmap(aval, r, rdepth)) + return; + + /* PMAP: Factor in specular-diffuse ambient (caustics) from photon + * map, if enabled and ray is primary, else caustic is zero. Continue + * with RADIANCE ambient calculation */ + copycolor(caustic, aval); + ambPmapCaustic(caustic, r, rdepth); + if (ambdiv <= 0) /* no ambient calculation */ goto dumbamb; /* check number of bounces */ @@ -297,14 +303,31 @@ multambient( /* compute ambient component & multiply goto dumbamb; if (ambacc <= FTINY) { /* no ambient storage */ + FVECT uvd[2]; + float dgrad[2], *dgp = NULL; + + if (nrm != r->ron && DOT(nrm,r->ron) < 0.9999) + dgp = dgrad; /* compute rotational grad. */ copycolor(acol, aval); rdepth++; ok = doambient(acol, r, r->rweight, - NULL, NULL, NULL, NULL, NULL); + uvd, NULL, NULL, dgp, NULL); rdepth--; if (!ok) goto dumbamb; + if ((ok > 0) & (dgp != NULL)) { /* apply texture */ + FVECT v1; + VCROSS(v1, r->ron, nrm); + d = 1.0; + for (i = 3; i--; ) + d += v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]); + if (d >= 0.05) + scalecolor(acol, d); + } copycolor(aval, acol); + + /* PMAP: add in caustic */ + addcolor(aval, caustic); return; } @@ -314,25 +337,39 @@ multambient( /* compute ambient component & multiply setcolor(acol, 0.0, 0.0, 0.0); d = sumambient(acol, r, nrm, rdepth, &atrunk, thescene.cuorg, thescene.cusize); + if (d > FTINY) { d = 1.0/d; scalecolor(acol, d); multcolor(aval, acol); + + /* PMAP: add in caustic */ + addcolor(aval, caustic); return; } + rdepth++; /* need to cache new value */ ok = makeambient(acol, r, nrm, rdepth-1); rdepth--; + if (ok) { multcolor(aval, acol); /* computed new value */ + + /* PMAP: add in caustic */ + addcolor(aval, caustic); return; } + dumbamb: /* return global value */ if ((ambvwt <= 0) | (navsum == 0)) { multcolor(aval, ambval); + + /* PMAP: add in caustic */ + addcolor(aval, caustic); return; } - l = bright(ambval); /* average in computations */ + + l = bright(ambval); /* average in computations */ if (l > FTINY) { d = (log(l)*(double)ambvwt + avsum) / (double)(ambvwt + navsum); @@ -379,7 +416,8 @@ plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang) VSUM(rtst.rdir, vdif, anorm, t[1]); /* further dist. > plane */ rtst.rmax = normalize(rtst.rdir); /* short ray test */ while (localhit(&rtst, &thescene)) { /* check for occluder */ - if (rtst.ro->omod != OVOID && + OBJREC *m = findmaterial(rtst.ro); + if (m != NULL && !istransp(m->otype) && !isBSDFproxy(m) && (rtst.clipset == NULL || !inset(rtst.clipset, rtst.ro->omod))) return(1); /* plug light leak */ @@ -486,7 +524,8 @@ sumambient( /* get interpolated ambient value */ /* * Extrapolate value and compute final weight (hat function) */ - extambient(ct, av, r->rop, rn, uvw); + if (!extambient(ct, av, r->rop, rn, uvw)) + continue; d = tfunc(maxangle, sqrt(delta_r2), 0.0) * tfunc(ambacc, sqrt(delta_t2), 0.0); scalecolor(ct, d); @@ -537,7 +576,7 @@ makeambient( /* make a new ambient value for storage } -static void +static int extambient( /* extrapolate value at pv, nv */ COLOR cr, AMBVAL *ap, @@ -546,6 +585,7 @@ extambient( /* extrapolate value at pv, nv */ FVECT uvw[3] ) { + const double min_d = 0.05; static FVECT my_uvw[3]; FVECT v1; int i; @@ -565,12 +605,11 @@ extambient( /* extrapolate value at pv, nv */ for (i = 3; i--; ) d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]); - if (d <= 0.0) { - setcolor(cr, 0.0, 0.0, 0.0); - return; - } + if (d < min_d) /* should not use if we can avoid it */ + d = min_d; copycolor(cr, ap->val); scalecolor(cr, d); + return(d > min_d); } @@ -633,9 +672,20 @@ multambient( /* compute ambient component & multiply ) { static int rdepth = 0; /* ambient recursion */ - COLOR acol; + COLOR acol, caustic; double d, l; + /* PMAP: Factor in ambient from global photon map (if enabled) and return + * as all ambient components accounted for */ + if (ambPmap(aval, r, rdepth)) + return; + + /* PMAP: Otherwise factor in ambient from caustic photon map + * (ambPmapCaustic() returns zero if caustic photons disabled) and + * continue with RADIANCE ambient calculation */ + copycolor(caustic, aval); + ambPmapCaustic(caustic, r, rdepth); + if (ambdiv <= 0) /* no ambient calculation */ goto dumbamb; /* check number of bounces */ @@ -653,7 +703,10 @@ multambient( /* compute ambient component & multiply rdepth--; if (d <= FTINY) goto dumbamb; - copycolor(aval, acol); + copycolor(aval, acol); + + /* PMAP: add in caustic */ + addcolor(aval, caustic); return; } @@ -663,24 +716,38 @@ multambient( /* compute ambient component & multiply setcolor(acol, 0.0, 0.0, 0.0); d = sumambient(acol, r, nrm, rdepth, &atrunk, thescene.cuorg, thescene.cusize); + if (d > FTINY) { d = 1.0/d; scalecolor(acol, d); multcolor(aval, acol); + + /* PMAP: add in caustic */ + addcolor(aval, caustic); return; } + rdepth++; /* need to cache new value */ d = makeambient(acol, r, nrm, rdepth-1); rdepth--; + if (d > FTINY) { multcolor(aval, acol); /* got new value */ + + /* PMAP: add in caustic */ + addcolor(aval, caustic); return; } + dumbamb: /* return global value */ if ((ambvwt <= 0) | (navsum == 0)) { multcolor(aval, ambval); + + /* PMAP: add in caustic */ + addcolor(aval, caustic); return; } + l = bright(ambval); /* average in computations */ if (l > FTINY) { d = (log(l)*(double)ambvwt + avsum) / @@ -1020,7 +1087,7 @@ newambtree(void) /* allocate 8 ambient tree structs } atp = atfreelist; atfreelist = atp->kid; - memset((char *)atp, '\0', 8*sizeof(AMBTREE)); + memset(atp, 0, 8*sizeof(AMBTREE)); return(atp); } @@ -1046,6 +1113,7 @@ unloadatree( /* unload an ambient value tree */ /* transfer values at this node */ for (av = at->alist; av != NULL; av = at->alist) { at->alist = av->next; + av->next = NULL; (*f)(av); } if (at->kid == NULL) @@ -1123,8 +1191,8 @@ avlmemi( /* find list position from address */ { AMBVAL **avlpp; - avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2, - nambvals, sizeof(AMBVAL *), &aposcmp); + avlpp = (AMBVAL **)bsearch(&avaddr, avlist2, + nambvals, sizeof(AMBVAL *), aposcmp); if (avlpp == NULL) error(CONSISTENCY, "address not found in avlmemi"); return(avlpp - avlist2); @@ -1167,12 +1235,12 @@ sortambvals( /* resort ambient values */ } if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */ if (avlist2 != NULL) - free((void *)avlist2); + free(avlist2); if (always) { /* rebuild without sorting */ oldatrunk = atrunk; atrunk.alist = NULL; atrunk.kid = NULL; - unloadatree(&oldatrunk, &avinsert); + unloadatree(&oldatrunk, avinsert); } } else { /* sort memory by last access time */ /* @@ -1189,13 +1257,13 @@ sortambvals( /* resort ambient values */ eputs(errmsg); #endif i_avlist = 0; - unloadatree(&atrunk, &av2list); /* empty current tree */ + unloadatree(&atrunk, av2list); /* empty current tree */ #ifdef DEBUG if (i_avlist < nambvals) error(CONSISTENCY, "missing ambient values in sortambvals"); #endif - qsort((char *)avlist1, nambvals, sizeof(struct avl), &alatcmp); - qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), &aposcmp); + qsort(avlist1, nambvals, sizeof(struct avl), alatcmp); + qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp); for (i = 0; i < nambvals; i++) { if (avlist1[i].p == NULL) continue; @@ -1211,8 +1279,8 @@ sortambvals( /* resort ambient values */ avinsert(avlist2[j]); avlist1[j].p = NULL; } - free((void *)avlist1); - free((void *)avlist2); + free(avlist1); + free(avlist2); /* compute new sort interval */ sortintvl = ambclock - lastsort; if (sortintvl >= MAX_SORT_INTVL/2) @@ -1261,10 +1329,10 @@ ambsync(void) /* synchronize ambient file */ if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0) goto seekerr; if ((n = flen - lastpos) > 0) { /* file has grown */ - if (ambinp == NULL) { /* use duplicate filedes */ - ambinp = fdopen(dup(fileno(ambfp)), "r"); + if (ambinp == NULL) { /* get new file pointer */ + ambinp = fopen(ambfile, "rb"); if (ambinp == NULL) - error(SYSTEM, "fdopen failed in ambsync"); + error(SYSTEM, "fopen failed in ambsync"); } if (fseek(ambinp, lastpos, SEEK_SET) < 0) goto seekerr; @@ -1279,24 +1347,18 @@ ambsync(void) /* synchronize ambient file */ avstore(&avs); n -= AMBVALSIZ; } - lastpos = flen - n; - /*** seek always as safety measure - if (n) ***/ /* alignment */ - if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) - goto seekerr; + lastpos = flen - n; /* check alignment */ + if (n && lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) + goto seekerr; } n = fflush(ambfp); /* calls write() at last */ - if (n != EOF) - lastpos += (long)nunflshed*AMBVALSIZ; - else if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0) - goto seekerr; - + lastpos += (long)nunflshed*AMBVALSIZ; aflock(F_UNLCK); /* release file */ nunflshed = 0; return(n); seekerr: error(SYSTEM, "seek failed in ambsync"); - return -1; /* pro forma return */ + return(EOF); /* pro forma return */ } #else /* ! F_SETLKW */