| 33 |
|
static AMBTREE atrunk; /* our ambient trunk node */ |
| 34 |
|
|
| 35 |
|
static FILE *ambfp = NULL; /* ambient file pointer */ |
| 36 |
< |
static int nunflshed = 0; /* number of unflushed ambient values */ |
| 36 |
> |
static int nunflshed; /* number of unflushed ambient values */ |
| 37 |
> |
static FILE *ambinp = NULL; /* input pointer for ambient i/o */ |
| 38 |
|
|
| 39 |
|
static double avsum = 0.; /* computed ambient value sum (log) */ |
| 40 |
|
static unsigned int navsum = 0; /* number of values in avsum */ |
| 41 |
|
static unsigned int nambvals = 0; /* total number of indirect values */ |
| 42 |
< |
static unsigned int nambshare = 0; /* number of values from file */ |
| 42 |
< |
static FILE *ambinp = NULL; /* auxiliary file for input */ |
| 43 |
< |
static long lastpos = -1; /* last flush position */ |
| 42 |
> |
static off_t lastpos = -1; /* last flush position */ |
| 43 |
|
|
| 44 |
|
#define AMBFLUSH (BUFSIZ/AMBVALSIZ) |
| 45 |
|
|
| 68 |
|
static int extambient(SCOLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, |
| 69 |
|
FVECT uvw[3]); |
| 70 |
|
|
| 72 |
– |
#ifdef F_SETLKW |
| 73 |
– |
static void aflock(int typ); |
| 74 |
– |
#endif |
| 71 |
|
|
| 76 |
– |
|
| 72 |
|
void |
| 73 |
|
setambres( /* set ambient resolution */ |
| 74 |
|
int ar |
| 111 |
|
void |
| 112 |
|
setambient(void) /* initialize calculation */ |
| 113 |
|
{ |
| 114 |
< |
int readonly = 0; |
| 115 |
< |
long flen; |
| 114 |
> |
int exists; |
| 115 |
> |
off_t flen; |
| 116 |
|
AMBVAL amb; |
| 117 |
|
/* make sure we're fresh */ |
| 118 |
|
ambdone(); |
| 127 |
|
error(WARNING, errmsg); |
| 128 |
|
return; |
| 129 |
|
} |
| 130 |
< |
/* open ambient file */ |
| 131 |
< |
if ((ambfp = fopen(ambfile, "r+")) == NULL) |
| 132 |
< |
readonly = (ambfp = fopen(ambfile, "r")) != NULL; |
| 133 |
< |
if (ambfp != NULL) { |
| 134 |
< |
initambfile(0); /* file exists */ |
| 130 |
> |
exists = access(ambfile, F_OK) == 0; /* check existence, first */ |
| 131 |
> |
ambfp = fopen(ambfile, "a+"); /* try read/append */ |
| 132 |
> |
if (!exists & (ambfp == NULL)) { |
| 133 |
> |
sprintf(errmsg, "cannot create ambient file \"%s\"", ambfile); |
| 134 |
> |
error(SYSTEM, errmsg); |
| 135 |
> |
} |
| 136 |
> |
if (ambfp == NULL) { /* try opening read-only? */ |
| 137 |
> |
if ((ambfp = fopen(ambfile, "r")) == NULL) { |
| 138 |
> |
sprintf(errmsg, |
| 139 |
> |
"cannot open ambient file \"%s\" for reading", |
| 140 |
> |
ambfile); |
| 141 |
> |
error(SYSTEM, errmsg); |
| 142 |
> |
} |
| 143 |
> |
exists = -1; /* flag read-only */ |
| 144 |
> |
} else if (exists) |
| 145 |
> |
rewind(ambfp); /* XXX not necessary? */ |
| 146 |
> |
|
| 147 |
> |
if (exists) { |
| 148 |
> |
initambfile(0); /* file already exists */ |
| 149 |
|
lastpos = ftell(ambfp); |
| 150 |
|
while (readambval(&amb, ambfp)) |
| 151 |
< |
avstore(&amb); |
| 152 |
< |
nambshare = nambvals; /* share loaded values */ |
| 144 |
< |
if (readonly) { |
| 151 |
> |
avstore(&amb); /* load what we can */ |
| 152 |
> |
if (exists < 0) { /* read-only? */ |
| 153 |
|
sprintf(errmsg, |
| 154 |
|
"loaded %u values from read-only ambient file", |
| 155 |
|
nambvals); |
| 156 |
|
error(WARNING, errmsg); |
| 157 |
|
fclose(ambfp); /* close file so no writes */ |
| 158 |
|
ambfp = NULL; |
| 159 |
< |
return; /* avoid ambsync() */ |
| 159 |
> |
return; |
| 160 |
|
} |
| 161 |
|
/* align file pointer */ |
| 162 |
< |
lastpos += (long)nambvals*AMBVALSIZ; |
| 163 |
< |
flen = lseek(fileno(ambfp), (off_t)0, SEEK_END); |
| 162 |
> |
lastpos += (off_t)nambvals*AMBVALSIZ; |
| 163 |
> |
flen = lseek(fileno(ambfp), 0, SEEK_END); |
| 164 |
|
if (flen != lastpos) { |
| 165 |
|
sprintf(errmsg, |
| 166 |
< |
"ignoring last %ld values in ambient file (corrupted)", |
| 167 |
< |
(flen - lastpos)/AMBVALSIZ); |
| 166 |
> |
"ignoring last %lu values in ambient file (corrupted)", |
| 167 |
> |
(unsigned long)((flen - lastpos)/AMBVALSIZ)); |
| 168 |
|
error(WARNING, errmsg); |
| 169 |
< |
fseek(ambfp, lastpos, SEEK_SET); |
| 170 |
< |
ftruncate(fileno(ambfp), (off_t)lastpos); |
| 169 |
> |
/* fseek() not needed? */ |
| 170 |
> |
fseeko(ambfp, lastpos, SEEK_SET); |
| 171 |
> |
ftruncate(fileno(ambfp), lastpos); |
| 172 |
|
} |
| 173 |
< |
} else if ((ambfp = fopen(ambfile, "w+")) != NULL) { |
| 174 |
< |
initambfile(1); /* else create new file */ |
| 173 |
> |
} else { |
| 174 |
> |
initambfile(1); /* else start new file */ |
| 175 |
|
fflush(ambfp); |
| 176 |
|
lastpos = ftell(ambfp); |
| 168 |
– |
} else { |
| 169 |
– |
sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); |
| 170 |
– |
error(SYSTEM, errmsg); |
| 177 |
|
} |
| 172 |
– |
#ifdef F_SETLKW |
| 173 |
– |
aflock(F_UNLCK); /* release file */ |
| 174 |
– |
#endif |
| 178 |
|
} |
| 179 |
|
|
| 180 |
|
|
| 182 |
|
ambdone(void) /* close ambient file and free memory */ |
| 183 |
|
{ |
| 184 |
|
if (ambfp != NULL) { /* close ambient file */ |
| 185 |
< |
ambsync(); |
| 183 |
< |
fclose(ambfp); |
| 185 |
> |
fclose(ambfp); /* don't call ambsync() */ |
| 186 |
|
ambfp = NULL; |
| 187 |
< |
if (ambinp != NULL) { |
| 187 |
> |
lastpos = -1; |
| 188 |
> |
if (ambinp != NULL) { |
| 189 |
|
fclose(ambinp); |
| 190 |
|
ambinp = NULL; |
| 191 |
|
} |
| 189 |
– |
lastpos = -1; |
| 192 |
|
} |
| 193 |
|
/* free ambient tree */ |
| 194 |
|
unloadatree(&atrunk, avfree); |
| 196 |
|
avsum = 0.; |
| 197 |
|
navsum = 0; |
| 198 |
|
nambvals = 0; |
| 197 |
– |
nambshare = 0; |
| 199 |
|
} |
| 200 |
|
|
| 201 |
|
|
| 270 |
|
ambincl != inset(ambset, r->ro->omod)) |
| 271 |
|
goto dumbamb; |
| 272 |
|
|
| 273 |
< |
if (ambacc <= FTINY) { /* no ambient storage */ |
| 274 |
< |
FVECT uvd[2]; |
| 273 |
> |
if (ambacc <= FTINY) { /* no ambient storage? */ |
| 274 |
> |
double rdot = DOT(nrm,r->ron); |
| 275 |
> |
int sgn = 1 - 2*(rdot < 0); |
| 276 |
|
float dgrad[2], *dgp = NULL; |
| 277 |
+ |
FVECT uvd[2]; |
| 278 |
|
|
| 279 |
< |
if (nrm != r->ron && DOT(nrm,r->ron) < 0.9999) |
| 279 |
> |
if (sgn*rdot < 0.9999) |
| 280 |
|
dgp = dgrad; /* compute rotational grad. */ |
| 281 |
|
copyscolor(acol, aval); |
| 282 |
|
rdepth++; |
| 283 |
< |
ok = doambient(acol, r, r->rweight, |
| 283 |
> |
ok = doambient(acol, r, r->rweight*sgn, |
| 284 |
|
uvd, NULL, NULL, dgp, NULL); |
| 285 |
|
rdepth--; |
| 286 |
|
if (!ok) |
| 290 |
|
VCROSS(v1, r->ron, nrm); |
| 291 |
|
d = 1.0; |
| 292 |
|
for (i = 3; i--; ) |
| 293 |
< |
d += v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]); |
| 293 |
> |
d += sgn*v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]); |
| 294 |
|
if (d >= 0.05) |
| 295 |
|
scalescolor(acol, d); |
| 296 |
|
} |
| 383 |
|
rtst.rmax = normalize(rtst.rdir); /* short ray test */ |
| 384 |
|
while (localhit(&rtst, &thescene)) { /* check for occluder */ |
| 385 |
|
OBJREC *m = findmaterial(rtst.ro); |
| 386 |
< |
if (m != NULL && !istransp(m->otype) && !isBSDFproxy(m) && |
| 386 |
> |
if (m != NULL && !istransp(m) && !isBSDFproxy(m) && |
| 387 |
|
(rtst.clipset == NULL || |
| 388 |
|
!inset(rtst.clipset, rtst.ro->omod))) |
| 389 |
|
return(1); /* plug light leak */ |
| 407 |
|
) |
| 408 |
|
{ /* initial limit is 10 degrees plus ambacc radians */ |
| 409 |
|
const double minangle = 10.0 * PI/180.; |
| 410 |
+ |
const int sgn = 1 - 2*(DOT(r->ron,rn) < 0); |
| 411 |
|
double maxangle = minangle + ambacc; |
| 412 |
|
double wsum = 0.0; |
| 413 |
|
FVECT ck0; |
| 452 |
|
* Direction test using unperturbed normal |
| 453 |
|
*/ |
| 454 |
|
decodedir(uvw[2], av->ndir); |
| 455 |
< |
d = DOT(uvw[2], r->ron); |
| 455 |
> |
d = sgn * DOT(uvw[2], r->ron); |
| 456 |
|
if (d <= 0.0) /* >= 90 degrees */ |
| 457 |
|
continue; |
| 458 |
|
delta_r2 = 2.0 - 2.0*d; /* approx. radians^2 */ |
| 508 |
|
int al |
| 509 |
|
) |
| 510 |
|
{ |
| 511 |
+ |
int sgn = 1 - 2*(DOT(r->ron,rn) < 0); |
| 512 |
|
AMBVAL amb; |
| 513 |
|
FVECT uvw[3]; |
| 514 |
|
int i; |
| 520 |
|
amb.weight = 1.25*r->rweight; |
| 521 |
|
setscolor(acol, AVGREFL, AVGREFL, AVGREFL); |
| 522 |
|
/* compute ambient */ |
| 523 |
< |
i = doambient(acol, r, amb.weight, |
| 523 |
> |
i = doambient(acol, r, amb.weight*sgn, |
| 524 |
|
uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral); |
| 525 |
|
scalescolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
| 526 |
|
if (i <= 0 || amb.rad[0] <= FTINY) /* no Hessian or zero radius */ |
| 527 |
|
return(i); |
| 528 |
+ |
uvw[2][0] = sgn*r->ron[0]; /* orient unperturbed normal */ |
| 529 |
+ |
uvw[2][1] = sgn*r->ron[1]; |
| 530 |
+ |
uvw[2][2] = sgn*r->ron[2]; |
| 531 |
|
/* store value */ |
| 532 |
|
VCOPY(amb.pos, r->rop); |
| 533 |
< |
amb.ndir = encodedir(r->ron); |
| 533 |
> |
amb.ndir = encodedir(uvw[2]); |
| 534 |
|
amb.udir = encodedir(uvw[0]); |
| 535 |
|
amb.lvl = al; |
| 536 |
|
copyscolor(amb.val, acol); |
| 537 |
< |
/* insert into tree */ |
| 538 |
< |
avsave(&amb); /* and save to file */ |
| 531 |
< |
if (rn != r->ron) { /* texture */ |
| 532 |
< |
VCOPY(uvw[2], r->ron); |
| 537 |
> |
avsave(&amb); /* insert and save to file */ |
| 538 |
> |
if (DOT(uvw[2],rn) < 0.9999) /* texture? */ |
| 539 |
|
extambient(acol, &amb, r->rop, rn, uvw); |
| 534 |
– |
} |
| 540 |
|
return(1); |
| 541 |
|
} |
| 542 |
|
|
| 631 |
|
{ |
| 632 |
|
extern char *progname, *octname; |
| 633 |
|
static char *mybuf = NULL; |
| 634 |
+ |
int ntries = 3; |
| 635 |
|
|
| 636 |
< |
#ifdef F_SETLKW |
| 637 |
< |
aflock(cre8 ? F_WRLCK : F_RDLCK); |
| 632 |
< |
#endif |
| 636 |
> |
if (!AMBFLUSH) |
| 637 |
> |
error(INTERNAL, "BUFSIZ too small in initambfile"); |
| 638 |
|
SET_FILE_BINARY(ambfp); |
| 639 |
|
if (mybuf == NULL) |
| 640 |
< |
mybuf = (char *)bmalloc(BUFSIZ+8); |
| 640 |
> |
mybuf = (char *)bmalloc(BUFSIZ); |
| 641 |
|
setbuf(ambfp, mybuf); |
| 642 |
+ |
nunflshed = 0; |
| 643 |
+ |
retry: |
| 644 |
|
if (cre8) { /* new file */ |
| 645 |
|
newheader("RADIANCE", ambfp); |
| 646 |
|
fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ", |
| 653 |
|
srcsizerat, shadthresh, shadcert); |
| 654 |
|
fprintf(ambfp, "-ss %g -st %g -lr %d -lw %g ", specjitter, |
| 655 |
|
specthresh, maxdepth, minweight); |
| 656 |
< |
fprintf(ambfp, "-cw %f %f -cs %d ", WLPART[3], WLPART[0], NCSAMP); |
| 656 |
> |
fprintf(ambfp, "-cw %g %g -cs %d ", WLPART[3], WLPART[0], NCSAMP); |
| 657 |
|
if (octname != NULL) |
| 658 |
|
fputs(octname, ambfp); |
| 659 |
< |
fputc('\n', ambfp); |
| 659 |
> |
fputc('\n', ambfp); /* end of command line, not header! */ |
| 660 |
|
fprintf(ambfp, "SOFTWARE= %s\n", VersionID); |
| 661 |
|
fputnow(ambfp); |
| 662 |
+ |
AMB_CNDX = CNDX; /* use current spectral sampling */ |
| 663 |
+ |
AMB_WLPART = WLPART; |
| 664 |
|
fputwlsplit(WLPART, ambfp); |
| 665 |
|
fputncomp(NCSAMP, ambfp); |
| 666 |
|
fputformat(AMBFMT, ambfp); |
| 667 |
|
fputc('\n', ambfp); |
| 668 |
|
putambmagic(ambfp); |
| 669 |
< |
} else if (getheader(ambfp, amb_headline, NULL) < 0 || !hasambmagic(ambfp)) |
| 669 |
> |
} else if (getheader(ambfp, amb_headline, NULL) < 0 || !hasambmagic(ambfp)) { |
| 670 |
> |
if (--ntries > 0 && ftell(ambfp) == 0) { |
| 671 |
> |
clearerr(ambfp); |
| 672 |
> |
sleep(2); |
| 673 |
> |
goto retry; |
| 674 |
> |
} |
| 675 |
|
error(USER, "bad/incompatible ambient file"); |
| 676 |
< |
|
| 676 |
> |
} |
| 677 |
|
if ((AMB_CNDX != CNDX) | (AMB_WLPART != WLPART)) { |
| 678 |
|
if (setspectrsamp(AMB_CNDX, AMB_WLPART) < 0) |
| 679 |
|
error(USER, "bad wavelength sampling in ambient file"); |
| 807 |
|
} |
| 808 |
|
|
| 809 |
|
|
| 796 |
– |
#ifdef F_SETLKW |
| 797 |
– |
|
| 798 |
– |
static void |
| 799 |
– |
aflock( /* lock/unlock ambient file */ |
| 800 |
– |
int typ |
| 801 |
– |
) |
| 802 |
– |
{ |
| 803 |
– |
static struct flock fls; /* static so initialized to zeroes */ |
| 804 |
– |
|
| 805 |
– |
if (typ == fls.l_type) /* already called? */ |
| 806 |
– |
return; |
| 807 |
– |
|
| 808 |
– |
fls.l_type = typ; |
| 809 |
– |
do |
| 810 |
– |
if (fcntl(fileno(ambfp), F_SETLKW, &fls) != -1) |
| 811 |
– |
return; |
| 812 |
– |
while (errno == EINTR); |
| 813 |
– |
|
| 814 |
– |
error(SYSTEM, "cannot (un)lock ambient file"); |
| 815 |
– |
} |
| 816 |
– |
|
| 817 |
– |
|
| 810 |
|
int |
| 811 |
|
ambsync(void) /* synchronize ambient file */ |
| 812 |
|
{ |
| 813 |
< |
long flen; |
| 813 |
> |
off_t newpos; |
| 814 |
> |
int n; |
| 815 |
|
AMBVAL avs; |
| 823 |
– |
int n; |
| 816 |
|
|
| 817 |
|
if (ambfp == NULL) /* no ambient file? */ |
| 818 |
|
return(0); |
| 819 |
< |
/* gain appropriate access */ |
| 820 |
< |
aflock(nunflshed ? F_WRLCK : F_RDLCK); |
| 821 |
< |
/* see if file has grown */ |
| 822 |
< |
if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0) |
| 819 |
> |
|
| 820 |
> |
if (nunflshed > 0) { /* append new values? */ |
| 821 |
> |
if (fflush(ambfp) < 0) |
| 822 |
> |
return(EOF); |
| 823 |
> |
newpos = lseek(fileno(ambfp), 0, SEEK_CUR); |
| 824 |
> |
} else |
| 825 |
> |
newpos = lseek(fileno(ambfp), 0, SEEK_END); |
| 826 |
> |
|
| 827 |
> |
if (newpos < 0) |
| 828 |
|
goto seekerr; |
| 829 |
< |
if ((n = flen - lastpos) > 0) { /* file has grown */ |
| 830 |
< |
if (ambinp == NULL) { /* get new file pointer */ |
| 831 |
< |
ambinp = fopen(ambfile, "rb"); |
| 832 |
< |
if (ambinp == NULL) |
| 833 |
< |
error(SYSTEM, "fopen failed in ambsync"); |
| 829 |
> |
/* how many others added? */ |
| 830 |
> |
n = (newpos - lastpos)/AMBVALSIZ - nunflshed; |
| 831 |
> |
nunflshed = 0; |
| 832 |
> |
if (n <= 0) { /* no one helping this time? */ |
| 833 |
> |
lastpos = newpos; |
| 834 |
> |
return(0); |
| 835 |
> |
} |
| 836 |
> |
if (ambinp == NULL) { /* else need to open for input? */ |
| 837 |
> |
ambinp = fopen(ambfile, "r"); |
| 838 |
> |
if (ambinp == NULL) { |
| 839 |
> |
sprintf(errmsg, "cannot reopen ambient file \"%s\"", |
| 840 |
> |
ambfile); |
| 841 |
> |
error(SYSTEM, errmsg); |
| 842 |
|
} |
| 843 |
< |
if (fseek(ambinp, lastpos, SEEK_SET) < 0) |
| 844 |
< |
goto seekerr; |
| 845 |
< |
while (n >= AMBVALSIZ) { /* load contributed values */ |
| 846 |
< |
if (!readambval(&avs, ambinp)) { |
| 847 |
< |
sprintf(errmsg, |
| 848 |
< |
"ambient file \"%s\" corrupted near character %ld", |
| 849 |
< |
ambfile, flen - n); |
| 850 |
< |
error(WARNING, errmsg); |
| 851 |
< |
break; |
| 852 |
< |
} |
| 853 |
< |
avstore(&avs); |
| 849 |
< |
n -= AMBVALSIZ; |
| 843 |
> |
SET_FILE_BINARY(ambinp); |
| 844 |
> |
} |
| 845 |
> |
/* read from last endpoint */ |
| 846 |
> |
if (fseeko(ambinp, lastpos, SEEK_SET) < 0) |
| 847 |
> |
goto seekerr; |
| 848 |
> |
while (n-- > 0) { /* load new contributed values */ |
| 849 |
> |
if (!readambval(&avs, ambinp)) { |
| 850 |
> |
sprintf(errmsg, "ambient file \"%s\" corrupted", |
| 851 |
> |
ambfile); |
| 852 |
> |
error(WARNING, errmsg); |
| 853 |
> |
break; |
| 854 |
|
} |
| 855 |
< |
lastpos = flen - n; /* check alignment */ |
| 852 |
< |
if (n && lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) |
| 853 |
< |
goto seekerr; |
| 855 |
> |
avstore(&avs); |
| 856 |
|
} |
| 857 |
< |
n = fflush(ambfp); /* calls write() at last */ |
| 858 |
< |
lastpos += (long)nunflshed*AMBVALSIZ; |
| 857 |
< |
aflock(F_UNLCK); /* release file */ |
| 858 |
< |
nunflshed = 0; |
| 859 |
< |
return(n); |
| 857 |
> |
lastpos = newpos; /* update endpoint */ |
| 858 |
> |
return(0); |
| 859 |
|
seekerr: |
| 860 |
|
error(SYSTEM, "seek failed in ambsync"); |
| 861 |
|
return(EOF); /* pro forma return */ |
| 862 |
|
} |
| 864 |
– |
|
| 865 |
– |
#else /* ! F_SETLKW */ |
| 866 |
– |
|
| 867 |
– |
int |
| 868 |
– |
ambsync(void) /* flush ambient file */ |
| 869 |
– |
{ |
| 870 |
– |
if (ambfp == NULL) |
| 871 |
– |
return(0); |
| 872 |
– |
nunflshed = 0; |
| 873 |
– |
return(fflush(ambfp)); |
| 874 |
– |
} |
| 875 |
– |
|
| 876 |
– |
#endif /* ! F_SETLKW */ |
