1 |
– |
#ifndef lint |
1 |
|
static const char RCSid[] = "$Id$"; |
3 |
– |
#endif |
2 |
|
/* |
3 |
|
* ambient.c - routines dealing with ambient (inter-reflected) component. |
4 |
|
* |
12 |
|
#include "platform.h" |
13 |
|
#include "ray.h" |
14 |
|
#include "otypes.h" |
15 |
+ |
#include "otspecial.h" |
16 |
|
#include "resolu.h" |
17 |
|
#include "ambient.h" |
18 |
|
#include "random.h" |
19 |
+ |
#include "pmapamb.h" |
20 |
|
|
21 |
|
#ifndef OCTSCALE |
22 |
|
#define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */ |
23 |
|
#endif |
24 |
|
|
25 |
– |
extern char *shm_boundary; /* memory sharing boundary */ |
26 |
– |
|
25 |
|
#ifndef MAXASET |
26 |
|
#define MAXASET 4095 /* maximum number of elements in ambient set */ |
27 |
|
#endif |
35 |
|
static FILE *ambfp = NULL; /* ambient file pointer */ |
36 |
|
static int nunflshed = 0; /* number of unflushed ambient values */ |
37 |
|
|
40 |
– |
#ifndef SORT_THRESH |
41 |
– |
#ifdef SMLMEM |
42 |
– |
#define SORT_THRESH ((16L<<20)/sizeof(AMBVAL)) |
43 |
– |
#else |
44 |
– |
#define SORT_THRESH ((64L<<20)/sizeof(AMBVAL)) |
45 |
– |
#endif |
46 |
– |
#endif |
47 |
– |
#ifndef SORT_INTVL |
48 |
– |
#define SORT_INTVL (SORT_THRESH<<1) |
49 |
– |
#endif |
50 |
– |
#ifndef MAX_SORT_INTVL |
51 |
– |
#define MAX_SORT_INTVL (SORT_INTVL<<6) |
52 |
– |
#endif |
53 |
– |
|
54 |
– |
|
55 |
– |
static double qambacc = 0.; /* ambient accuracy to the 1/4 power */ |
38 |
|
static double avsum = 0.; /* computed ambient value sum (log) */ |
39 |
|
static unsigned int navsum = 0; /* number of values in avsum */ |
40 |
|
static unsigned int nambvals = 0; /* total number of indirect values */ |
41 |
|
static unsigned int nambshare = 0; /* number of values from file */ |
60 |
– |
static unsigned long ambclock = 0; /* ambient access clock */ |
61 |
– |
static unsigned long lastsort = 0; /* time of last value sort */ |
62 |
– |
static long sortintvl = SORT_INTVL; /* time until next sort */ |
42 |
|
static FILE *ambinp = NULL; /* auxiliary file for input */ |
43 |
|
static long lastpos = -1; /* last flush position */ |
44 |
|
|
66 |
– |
#define MAXACLOCK (1L<<30) /* clock turnover value */ |
67 |
– |
/* |
68 |
– |
* Track access times unless we are sharing ambient values |
69 |
– |
* through memory on a multiprocessor, when we want to avoid |
70 |
– |
* claiming our own memory (copy on write). Go ahead anyway |
71 |
– |
* if more than two thirds of our values are unshared. |
72 |
– |
* Compile with -Dtracktime=0 to turn this code off. |
73 |
– |
*/ |
74 |
– |
#ifndef tracktime |
75 |
– |
#define tracktime (shm_boundary == NULL || nambvals > 3*nambshare) |
76 |
– |
#endif |
77 |
– |
|
45 |
|
#define AMBFLUSH (BUFSIZ/AMBVALSIZ) |
46 |
|
|
47 |
< |
#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) |
48 |
< |
#define freeav(av) free((void *)av); |
47 |
> |
#define AVSIZE (sizeof(AMBVAL)-sizeof(SCOLOR)+sizeof(COLORV)*NCSAMP) |
48 |
> |
#define newambval() (AMBVAL *)malloc(AVSIZE) |
49 |
|
|
50 |
< |
static void initambfile(int creat); |
50 |
> |
#define tfunc(x0, x, x1) (((x)-(x0))/((x1)-(x0))) |
51 |
> |
|
52 |
> |
static void initambfile(int cre8); |
53 |
|
static void avsave(AMBVAL *av); |
54 |
|
static AMBVAL *avstore(AMBVAL *aval); |
55 |
|
static AMBTREE *newambtree(void); |
57 |
|
|
58 |
|
typedef void unloadtf_t(AMBVAL *); |
59 |
|
static unloadtf_t avinsert; |
91 |
– |
static unloadtf_t av2list; |
60 |
|
static unloadtf_t avfree; |
61 |
|
static void unloadatree(AMBTREE *at, unloadtf_t *f); |
62 |
|
|
63 |
< |
static int aposcmp(const void *avp1, const void *avp2); |
96 |
< |
static int avlmemi(AMBVAL *avaddr); |
97 |
< |
static void sortambvals(int always); |
63 |
> |
static void sortambvals(void); |
64 |
|
|
65 |
+ |
static int plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang); |
66 |
+ |
static double sumambient(SCOLOR acol, RAY *r, FVECT rn, int al, |
67 |
+ |
AMBTREE *at, FVECT c0, double s); |
68 |
+ |
static int makeambient(SCOLOR acol, RAY *r, FVECT rn, int al); |
69 |
+ |
static int extambient(SCOLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, |
70 |
+ |
FVECT uvw[3]); |
71 |
+ |
|
72 |
|
#ifdef F_SETLKW |
73 |
|
static void aflock(int typ); |
74 |
|
#endif |
83 |
|
/* set min & max radii */ |
84 |
|
if (ar <= 0) { |
85 |
|
minarad = 0; |
86 |
< |
maxarad = thescene.cusize / 2.0; |
86 |
> |
maxarad = thescene.cusize*0.2; |
87 |
|
} else { |
88 |
|
minarad = thescene.cusize / ar; |
89 |
< |
maxarad = 64 * minarad; /* heuristic */ |
90 |
< |
if (maxarad > thescene.cusize / 2.0) |
91 |
< |
maxarad = thescene.cusize / 2.0; |
89 |
> |
maxarad = 64.0 * minarad; /* heuristic */ |
90 |
> |
if (maxarad > thescene.cusize*0.2) |
91 |
> |
maxarad = thescene.cusize*0.2; |
92 |
|
} |
93 |
|
if (minarad <= FTINY) |
94 |
< |
minarad = 10*FTINY; |
94 |
> |
minarad = 10.0*FTINY; |
95 |
|
if (maxarad <= minarad) |
96 |
< |
maxarad = 64 * minarad; |
96 |
> |
maxarad = 64.0 * minarad; |
97 |
|
} |
98 |
|
|
99 |
|
|
102 |
|
double newa |
103 |
|
) |
104 |
|
{ |
105 |
< |
double ambdiff; |
106 |
< |
|
107 |
< |
if (newa < 0.0) |
108 |
< |
newa = 0.0; |
109 |
< |
ambdiff = fabs(newa - ambacc); |
110 |
< |
if (ambdiff >= .01 && (ambacc = newa) > FTINY) { |
111 |
< |
qambacc = sqrt(sqrt(ambacc)); |
139 |
< |
if (nambvals > 0) |
140 |
< |
sortambvals(1); /* rebuild tree */ |
105 |
> |
static double olda; /* remember previous setting here */ |
106 |
> |
|
107 |
> |
newa *= (newa > 0); |
108 |
> |
if (fabs(newa - olda) >= .05*(newa + olda)) { |
109 |
> |
ambacc = newa; |
110 |
> |
if (ambacc > FTINY && nambvals > 0) |
111 |
> |
sortambvals(); /* rebuild tree */ |
112 |
|
} |
113 |
|
} |
114 |
|
|
123 |
|
ambdone(); |
124 |
|
/* init ambient limits */ |
125 |
|
setambres(ambres); |
126 |
< |
qambacc = sqrt(sqrt(ambacc *= (ambacc > FTINY))); |
126 |
> |
setambacc(ambacc); |
127 |
|
if (ambfile == NULL || !ambfile[0]) |
128 |
|
return; |
129 |
|
if (ambacc <= FTINY) { |
139 |
|
initambfile(0); /* file exists */ |
140 |
|
lastpos = ftell(ambfp); |
141 |
|
while (readambval(&amb, ambfp)) |
142 |
< |
avinsert(avstore(&amb)); |
142 |
> |
avstore(&amb); |
143 |
|
nambshare = nambvals; /* share loaded values */ |
144 |
|
if (readonly) { |
145 |
|
sprintf(errmsg, |
159 |
|
(flen - lastpos)/AMBVALSIZ); |
160 |
|
error(WARNING, errmsg); |
161 |
|
fseek(ambfp, lastpos, SEEK_SET); |
191 |
– |
#ifndef _WIN32 /* XXX we need a replacement for that one */ |
162 |
|
ftruncate(fileno(ambfp), (off_t)lastpos); |
193 |
– |
#endif |
163 |
|
} |
164 |
|
} else if ((ambfp = fopen(ambfile, "w+")) != NULL) { |
165 |
|
initambfile(1); /* else create new file */ |
169 |
|
sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); |
170 |
|
error(SYSTEM, errmsg); |
171 |
|
} |
203 |
– |
#ifdef getc_unlocked |
204 |
– |
flockfile(ambfp); /* application-level lock */ |
205 |
– |
#endif |
172 |
|
#ifdef F_SETLKW |
173 |
|
aflock(F_UNLCK); /* release file */ |
174 |
|
#endif |
189 |
|
lastpos = -1; |
190 |
|
} |
191 |
|
/* free ambient tree */ |
192 |
< |
unloadatree(&atrunk, &avfree); |
192 |
> |
unloadatree(&atrunk, avfree); |
193 |
|
/* reset state variables */ |
194 |
|
avsum = 0.; |
195 |
|
navsum = 0; |
196 |
|
nambvals = 0; |
197 |
|
nambshare = 0; |
232 |
– |
ambclock = 0; |
233 |
– |
lastsort = 0; |
234 |
– |
sortintvl = SORT_INTVL; |
198 |
|
} |
199 |
|
|
200 |
|
|
227 |
|
} |
228 |
|
} |
229 |
|
|
267 |
– |
/************ THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD ***************/ |
230 |
|
|
269 |
– |
#ifdef NEWAMB |
270 |
– |
|
271 |
– |
#define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr))) |
272 |
– |
|
273 |
– |
static double sumambient(COLOR acol, RAY *r, FVECT rn, int al, |
274 |
– |
AMBTREE *at, FVECT c0, double s); |
275 |
– |
static int makeambient(COLOR acol, RAY *r, FVECT rn, int al); |
276 |
– |
static void extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, |
277 |
– |
FVECT uvw[3]); |
278 |
– |
|
231 |
|
void |
232 |
|
multambient( /* compute ambient component & multiply by coef. */ |
233 |
< |
COLOR aval, |
233 |
> |
SCOLOR aval, |
234 |
|
RAY *r, |
235 |
|
FVECT nrm |
236 |
|
) |
237 |
|
{ |
238 |
+ |
static double logAvgAbsorp = 1; |
239 |
|
static int rdepth = 0; /* ambient recursion */ |
240 |
< |
COLOR acol; |
241 |
< |
int ok; |
240 |
> |
SCOLOR acol, caustic; |
241 |
> |
int i, ok; |
242 |
|
double d, l; |
243 |
|
|
244 |
+ |
/* PMAP: Factor in ambient from photon map, if enabled and ray is |
245 |
+ |
* ambient. Return as all ambient components accounted for, else |
246 |
+ |
* continue. */ |
247 |
+ |
if (ambPmap(aval, r, rdepth)) |
248 |
+ |
return; |
249 |
+ |
|
250 |
+ |
if (logAvgAbsorp > 0) /* exclude in -aw to avoid growth */ |
251 |
+ |
logAvgAbsorp = log(1.-AVGREFL); |
252 |
+ |
|
253 |
+ |
/* PMAP: Factor in specular-diffuse ambient (caustics) from photon |
254 |
+ |
* map, if enabled and ray is primary, else caustic is zero. Continue |
255 |
+ |
* with RADIANCE ambient calculation */ |
256 |
+ |
{/* XXX TEMPORARY */ |
257 |
+ |
COLOR pmc; |
258 |
+ |
scolor_color(pmc, aval); |
259 |
+ |
ambPmapCaustic(pmc, r, rdepth); |
260 |
+ |
setscolor(caustic, colval(pmc,RED), colval(pmc,GRN), colval(pmc,BLU)); |
261 |
+ |
} |
262 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
263 |
|
goto dumbamb; |
264 |
|
/* check number of bounces */ |
269 |
|
ambincl != inset(ambset, r->ro->omod)) |
270 |
|
goto dumbamb; |
271 |
|
|
272 |
< |
if (ambacc <= FTINY) { /* no ambient storage */ |
273 |
< |
copycolor(acol, aval); |
272 |
> |
if (ambacc <= FTINY) { /* no ambient storage? */ |
273 |
> |
double rdot = DOT(nrm,r->ron); |
274 |
> |
int sgn = 1 - 2*(rdot < 0); |
275 |
> |
float dgrad[2], *dgp = NULL; |
276 |
> |
FVECT uvd[2]; |
277 |
> |
|
278 |
> |
if (sgn*rdot < 0.9999) |
279 |
> |
dgp = dgrad; /* compute rotational grad. */ |
280 |
> |
copyscolor(acol, aval); |
281 |
|
rdepth++; |
282 |
< |
ok = doambient(acol, r, r->rweight, NULL, NULL, NULL, NULL); |
282 |
> |
ok = doambient(acol, r, r->rweight*sgn, |
283 |
> |
uvd, NULL, NULL, dgp, NULL); |
284 |
|
rdepth--; |
285 |
|
if (!ok) |
286 |
|
goto dumbamb; |
287 |
< |
copycolor(aval, acol); |
287 |
> |
if ((ok > 0) & (dgp != NULL)) { /* apply texture */ |
288 |
> |
FVECT v1; |
289 |
> |
VCROSS(v1, r->ron, nrm); |
290 |
> |
d = 1.0; |
291 |
> |
for (i = 3; i--; ) |
292 |
> |
d += sgn*v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]); |
293 |
> |
if (d >= 0.05) |
294 |
> |
scalescolor(acol, d); |
295 |
> |
} |
296 |
> |
copyscolor(aval, acol); |
297 |
> |
|
298 |
> |
/* PMAP: add in caustic */ |
299 |
> |
saddscolor(aval, caustic); |
300 |
|
return; |
301 |
|
} |
311 |
– |
|
312 |
– |
if (tracktime) /* sort to minimize thrashing */ |
313 |
– |
sortambvals(0); |
302 |
|
/* interpolate ambient value */ |
303 |
< |
setcolor(acol, 0.0, 0.0, 0.0); |
303 |
> |
scolorblack(acol); |
304 |
|
d = sumambient(acol, r, nrm, rdepth, |
305 |
|
&atrunk, thescene.cuorg, thescene.cusize); |
306 |
+ |
|
307 |
|
if (d > FTINY) { |
308 |
< |
d = 1.0/d; |
309 |
< |
scalecolor(acol, d); |
310 |
< |
multcolor(aval, acol); |
308 |
> |
scalescolor(acol, 1.0/d); |
309 |
> |
smultscolor(aval, acol); |
310 |
> |
|
311 |
> |
/* PMAP: add in caustic */ |
312 |
> |
saddscolor(aval, caustic); |
313 |
|
return; |
314 |
|
} |
315 |
+ |
|
316 |
|
rdepth++; /* need to cache new value */ |
317 |
|
ok = makeambient(acol, r, nrm, rdepth-1); |
318 |
|
rdepth--; |
319 |
+ |
|
320 |
|
if (ok) { |
321 |
< |
multcolor(aval, acol); /* computed new value */ |
321 |
> |
smultscolor(aval, acol); /* computed new value */ |
322 |
> |
|
323 |
> |
/* PMAP: add in caustic */ |
324 |
> |
saddscolor(aval, caustic); |
325 |
|
return; |
326 |
|
} |
327 |
+ |
|
328 |
|
dumbamb: /* return global value */ |
329 |
|
if ((ambvwt <= 0) | (navsum == 0)) { |
330 |
< |
multcolor(aval, ambval); |
330 |
> |
smultcolor(aval, ambval); |
331 |
> |
|
332 |
> |
/* PMAP: add in caustic */ |
333 |
> |
saddscolor(aval, caustic); |
334 |
|
return; |
335 |
|
} |
336 |
< |
l = bright(ambval); /* average in computations */ |
336 |
> |
|
337 |
> |
l = bright(ambval); /* average in computations */ |
338 |
|
if (l > FTINY) { |
339 |
< |
d = (log(l)*(double)ambvwt + avsum) / |
339 |
> |
d = (log(l)*(double)ambvwt + avsum + logAvgAbsorp*navsum) / |
340 |
|
(double)(ambvwt + navsum); |
341 |
|
d = exp(d) / l; |
342 |
< |
scalecolor(aval, d); |
343 |
< |
multcolor(aval, ambval); /* apply color of ambval */ |
342 |
> |
scalescolor(aval, d); |
343 |
> |
smultcolor(aval, ambval); /* apply color of ambval */ |
344 |
|
} else { |
345 |
< |
d = exp( avsum / (double)navsum ); |
346 |
< |
scalecolor(aval, d); /* neutral color */ |
345 |
> |
d = exp( avsum/(double)navsum + logAvgAbsorp ); |
346 |
> |
scalescolor(aval, d); /* neutral color */ |
347 |
|
} |
348 |
|
} |
349 |
|
|
350 |
|
|
351 |
< |
double |
351 |
> |
/* Plug a potential leak where ambient cache value is occluded */ |
352 |
> |
static int |
353 |
> |
plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang) |
354 |
> |
{ |
355 |
> |
const double cost70sq = 0.1169778; /* cos(70deg)^2 */ |
356 |
> |
RAY rtst; |
357 |
> |
FVECT vdif; |
358 |
> |
double normdot, ndotd, nadotd; |
359 |
> |
double a, b, c, t[2]; |
360 |
> |
|
361 |
> |
ang += 2.*PI*(ang < 0); /* check direction flags */ |
362 |
> |
if ( !(ap->corral>>(int)(ang*(16./PI)) & 1) ) |
363 |
> |
return(0); |
364 |
> |
/* |
365 |
> |
* Generate test ray, targeting 20 degrees above sample point plane |
366 |
> |
* along surface normal from cache position. This should be high |
367 |
> |
* enough to miss local geometry we don't really care about. |
368 |
> |
*/ |
369 |
> |
VSUB(vdif, ap->pos, r->rop); |
370 |
> |
normdot = DOT(anorm, r->ron); |
371 |
> |
ndotd = DOT(vdif, r->ron); |
372 |
> |
nadotd = DOT(vdif, anorm); |
373 |
> |
a = normdot*normdot - cost70sq; |
374 |
> |
b = 2.0*(normdot*ndotd - nadotd*cost70sq); |
375 |
> |
c = ndotd*ndotd - DOT(vdif,vdif)*cost70sq; |
376 |
> |
if (quadratic(t, a, b, c) != 2) |
377 |
> |
return(1); /* should rarely happen */ |
378 |
> |
if (t[1] <= FTINY) |
379 |
> |
return(0); /* should fail behind test */ |
380 |
> |
rayorigin(&rtst, SHADOW, r, NULL); |
381 |
> |
VSUM(rtst.rdir, vdif, anorm, t[1]); /* further dist. > plane */ |
382 |
> |
rtst.rmax = normalize(rtst.rdir); /* short ray test */ |
383 |
> |
while (localhit(&rtst, &thescene)) { /* check for occluder */ |
384 |
> |
OBJREC *m = findmaterial(rtst.ro); |
385 |
> |
if (m != NULL && !istransp(m) && !isBSDFproxy(m) && |
386 |
> |
(rtst.clipset == NULL || |
387 |
> |
!inset(rtst.clipset, rtst.ro->omod))) |
388 |
> |
return(1); /* plug light leak */ |
389 |
> |
VCOPY(rtst.rorg, rtst.rop); /* skip invisible surface */ |
390 |
> |
rtst.rmax -= rtst.rot; |
391 |
> |
rayclear(&rtst); |
392 |
> |
} |
393 |
> |
return(0); /* seems we're OK */ |
394 |
> |
} |
395 |
> |
|
396 |
> |
|
397 |
> |
static double |
398 |
|
sumambient( /* get interpolated ambient value */ |
399 |
< |
COLOR acol, |
399 |
> |
SCOLOR acol, |
400 |
|
RAY *r, |
401 |
|
FVECT rn, |
402 |
|
int al, |
404 |
|
FVECT c0, |
405 |
|
double s |
406 |
|
) |
407 |
< |
{ /* initial limit is ambacc radians */ |
408 |
< |
const double maxangle = (ambacc-PI/2.)*pow(r->rweight,0.13) + PI/2.; |
407 |
> |
{ /* initial limit is 10 degrees plus ambacc radians */ |
408 |
> |
const double minangle = 10.0 * PI/180.; |
409 |
> |
const int sgn = 1 - 2*(DOT(r->ron,rn) < 0); |
410 |
> |
double maxangle = minangle + ambacc; |
411 |
|
double wsum = 0.0; |
412 |
|
FVECT ck0; |
413 |
|
int i, j; |
414 |
|
AMBVAL *av; |
415 |
+ |
|
416 |
+ |
if (at->kid != NULL) { /* sum children first */ |
417 |
+ |
s *= 0.5; |
418 |
+ |
for (i = 0; i < 8; i++) { |
419 |
+ |
for (j = 0; j < 3; j++) { |
420 |
+ |
ck0[j] = c0[j]; |
421 |
+ |
if (1<<j & i) |
422 |
+ |
ck0[j] += s; |
423 |
+ |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
424 |
+ |
break; |
425 |
+ |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
426 |
+ |
break; |
427 |
+ |
} |
428 |
+ |
if (j == 3) |
429 |
+ |
wsum += sumambient(acol, r, rn, al, |
430 |
+ |
at->kid+i, ck0, s); |
431 |
+ |
} |
432 |
+ |
/* good enough? */ |
433 |
+ |
if ((wsum >= 0.05) & (s*ambacc > minarad)) |
434 |
+ |
return(wsum); |
435 |
+ |
} |
436 |
+ |
/* adjust maximum angle */ |
437 |
+ |
if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6)) |
438 |
+ |
maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.; |
439 |
|
/* sum this node */ |
440 |
|
for (av = at->alist; av != NULL; av = av->next) { |
441 |
< |
double d, delta_r2, delta_t2; |
442 |
< |
COLOR ct; |
441 |
> |
double u, v, d, delta_r2, delta_t2; |
442 |
> |
SCOLOR sct; |
443 |
|
FVECT uvw[3]; |
371 |
– |
/* record access */ |
372 |
– |
if (tracktime) |
373 |
– |
av->latick = ambclock; |
444 |
|
/* |
445 |
|
* Ambient level test |
446 |
|
*/ |
447 |
< |
if (av->lvl > al) /* list sorted, so this works */ |
447 |
> |
if (av->lvl > al || /* list sorted, so this works */ |
448 |
> |
(av->lvl == al) & (av->weight < 0.9*r->rweight)) |
449 |
|
break; |
379 |
– |
if (av->weight < 0.9*r->rweight) |
380 |
– |
continue; |
450 |
|
/* |
451 |
|
* Direction test using unperturbed normal |
452 |
|
*/ |
453 |
|
decodedir(uvw[2], av->ndir); |
454 |
< |
d = DOT(uvw[2], r->ron); |
454 |
> |
d = sgn * DOT(uvw[2], r->ron); |
455 |
|
if (d <= 0.0) /* >= 90 degrees */ |
456 |
|
continue; |
457 |
|
delta_r2 = 2.0 - 2.0*d; /* approx. radians^2 */ |
458 |
|
if (delta_r2 >= maxangle*maxangle) |
459 |
|
continue; |
460 |
|
/* |
461 |
+ |
* Modified ray behind test |
462 |
+ |
*/ |
463 |
+ |
VSUB(ck0, r->rop, av->pos); |
464 |
+ |
d = DOT(ck0, uvw[2]); |
465 |
+ |
if (d < -minarad*ambacc) |
466 |
+ |
continue; |
467 |
+ |
d /= av->rad[0]; |
468 |
+ |
delta_t2 = d*d; |
469 |
+ |
if (delta_t2 >= ambacc*ambacc) |
470 |
+ |
continue; |
471 |
+ |
/* |
472 |
|
* Elliptical radii test based on Hessian |
473 |
|
*/ |
474 |
|
decodedir(uvw[0], av->udir); |
475 |
|
VCROSS(uvw[1], uvw[2], uvw[0]); |
476 |
< |
VSUB(ck0, av->pos, r->rop); |
397 |
< |
d = DOT(ck0, uvw[0]) / av->rad[0]; |
398 |
< |
delta_t2 = d*d; |
399 |
< |
d = DOT(ck0, uvw[1]) / av->rad[1]; |
476 |
> |
d = (u = DOT(ck0, uvw[0])) / av->rad[0]; |
477 |
|
delta_t2 += d*d; |
478 |
< |
if (delta_t2 >= qambacc*qambacc) |
478 |
> |
d = (v = DOT(ck0, uvw[1])) / av->rad[1]; |
479 |
> |
delta_t2 += d*d; |
480 |
> |
if (delta_t2 >= ambacc*ambacc) |
481 |
|
continue; |
482 |
|
/* |
483 |
< |
* Intersection behind test |
483 |
> |
* Test for potential light leak |
484 |
|
*/ |
485 |
< |
d = 0.0; |
407 |
< |
for (j = 0; j < 3; j++) |
408 |
< |
d += (r->rop[j] - av->pos[j])*(uvw[2][j] + r->ron[j]); |
409 |
< |
if (d*0.5 < -minarad*ambacc-.001) |
485 |
> |
if (av->corral && plugaleak(r, av, uvw[2], atan2a(v,u))) |
486 |
|
continue; |
487 |
|
/* |
488 |
|
* Extrapolate value and compute final weight (hat function) |
489 |
|
*/ |
490 |
< |
extambient(ct, av, r->rop, rn, uvw); |
490 |
> |
if (!extambient(sct, av, r->rop, rn, uvw)) |
491 |
> |
continue; |
492 |
|
d = tfunc(maxangle, sqrt(delta_r2), 0.0) * |
493 |
< |
tfunc(qambacc, sqrt(delta_t2), 0.0); |
494 |
< |
scalecolor(ct, d); |
495 |
< |
addcolor(acol, ct); |
493 |
> |
tfunc(ambacc, sqrt(delta_t2), 0.0); |
494 |
> |
scalescolor(sct, d); |
495 |
> |
saddscolor(acol, sct); |
496 |
|
wsum += d; |
497 |
|
} |
421 |
– |
if (at->kid == NULL) |
422 |
– |
return(wsum); |
423 |
– |
/* sum children */ |
424 |
– |
s *= 0.5; |
425 |
– |
for (i = 0; i < 8; i++) { |
426 |
– |
for (j = 0; j < 3; j++) { |
427 |
– |
ck0[j] = c0[j]; |
428 |
– |
if (1<<j & i) |
429 |
– |
ck0[j] += s; |
430 |
– |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
431 |
– |
break; |
432 |
– |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
433 |
– |
break; |
434 |
– |
} |
435 |
– |
if (j == 3) |
436 |
– |
wsum += sumambient(acol, r, rn, al, |
437 |
– |
at->kid+i, ck0, s); |
438 |
– |
} |
498 |
|
return(wsum); |
499 |
|
} |
500 |
|
|
501 |
|
|
502 |
< |
int |
502 |
> |
static int |
503 |
|
makeambient( /* make a new ambient value for storage */ |
504 |
< |
COLOR acol, |
504 |
> |
SCOLOR acol, |
505 |
|
RAY *r, |
506 |
|
FVECT rn, |
507 |
|
int al |
508 |
|
) |
509 |
|
{ |
510 |
+ |
int sgn = 1 - 2*(DOT(r->ron,rn) < 0); |
511 |
|
AMBVAL amb; |
512 |
|
FVECT uvw[3]; |
513 |
|
int i; |
517 |
|
amb.weight *= AVGREFL; |
518 |
|
if (r->rweight < 0.1*amb.weight) /* heuristic override */ |
519 |
|
amb.weight = 1.25*r->rweight; |
520 |
< |
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
520 |
> |
setscolor(acol, AVGREFL, AVGREFL, AVGREFL); |
521 |
|
/* compute ambient */ |
522 |
< |
i = doambient(acol, r, amb.weight, uvw, amb.rad, amb.gpos, amb.gdir); |
523 |
< |
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
522 |
> |
i = doambient(acol, r, amb.weight*sgn, |
523 |
> |
uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral); |
524 |
> |
scalescolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
525 |
|
if (i <= 0 || amb.rad[0] <= FTINY) /* no Hessian or zero radius */ |
526 |
|
return(i); |
527 |
+ |
uvw[2][0] = sgn*r->ron[0]; /* orient unperturbed normal */ |
528 |
+ |
uvw[2][1] = sgn*r->ron[1]; |
529 |
+ |
uvw[2][2] = sgn*r->ron[2]; |
530 |
|
/* store value */ |
531 |
|
VCOPY(amb.pos, r->rop); |
532 |
< |
amb.ndir = encodedir(r->ron); |
532 |
> |
amb.ndir = encodedir(uvw[2]); |
533 |
|
amb.udir = encodedir(uvw[0]); |
534 |
|
amb.lvl = al; |
535 |
< |
copycolor(amb.val, acol); |
536 |
< |
/* insert into tree */ |
537 |
< |
avsave(&amb); /* and save to file */ |
474 |
< |
if (rn != r->ron) { /* texture */ |
475 |
< |
VCOPY(uvw[2], r->ron); |
535 |
> |
copyscolor(amb.val, acol); |
536 |
> |
avsave(&amb); /* insert and save to file */ |
537 |
> |
if (DOT(uvw[2],rn) < 0.9999) /* texture? */ |
538 |
|
extambient(acol, &amb, r->rop, rn, uvw); |
477 |
– |
} |
539 |
|
return(1); |
540 |
|
} |
541 |
|
|
542 |
|
|
543 |
< |
void |
543 |
> |
static int |
544 |
|
extambient( /* extrapolate value at pv, nv */ |
545 |
< |
COLOR cr, |
545 |
> |
SCOLOR scr, |
546 |
|
AMBVAL *ap, |
547 |
|
FVECT pv, |
548 |
|
FVECT nv, |
549 |
|
FVECT uvw[3] |
550 |
|
) |
551 |
|
{ |
552 |
+ |
const double min_d = 0.05; |
553 |
+ |
const double max_d = 20.; |
554 |
|
static FVECT my_uvw[3]; |
555 |
|
FVECT v1; |
556 |
|
int i; |
570 |
|
for (i = 3; i--; ) |
571 |
|
d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]); |
572 |
|
|
573 |
< |
if (d <= 0.0) { |
574 |
< |
setcolor(cr, 0.0, 0.0, 0.0); |
575 |
< |
return; |
576 |
< |
} |
577 |
< |
copycolor(cr, ap->val); |
578 |
< |
scalecolor(cr, d); |
573 |
> |
if (d < min_d) /* clamp min/max scaling */ |
574 |
> |
d = min_d; |
575 |
> |
else if (d > max_d) |
576 |
> |
d = max_d; |
577 |
> |
copyscolor(scr, ap->val); |
578 |
> |
scalescolor(scr, d); |
579 |
> |
return(d > min_d); |
580 |
|
} |
581 |
|
|
582 |
|
|
598 |
|
at = &atrunk; |
599 |
|
VCOPY(ck0, thescene.cuorg); |
600 |
|
s = thescene.cusize; |
601 |
< |
while (s*(OCTSCALE/2) > av->rad[1]*qambacc) { |
601 |
> |
while (s*(OCTSCALE/2) > av->rad[1]*ambacc) { |
602 |
|
if (at->kid == NULL) |
603 |
|
if ((at->kid = newambtree()) == NULL) |
604 |
|
error(SYSTEM, "out of memory in avinsert"); |
613 |
|
} |
614 |
|
avh.next = at->alist; /* order by increasing level */ |
615 |
|
for (ap = &avh; ap->next != NULL; ap = ap->next) |
616 |
< |
if (ap->next->lvl >= av->lvl) |
616 |
> |
if ( ap->next->lvl > av->lvl || |
617 |
> |
(ap->next->lvl == av->lvl) & |
618 |
> |
(ap->next->weight <= av->weight) ) |
619 |
|
break; |
620 |
|
av->next = ap->next; |
621 |
|
ap->next = (AMBVAL*)av; |
623 |
|
} |
624 |
|
|
625 |
|
|
560 |
– |
#else /* ! NEWAMB */ |
561 |
– |
|
562 |
– |
static double sumambient(COLOR acol, RAY *r, FVECT rn, int al, |
563 |
– |
AMBTREE *at, FVECT c0, double s); |
564 |
– |
static double makeambient(COLOR acol, RAY *r, FVECT rn, int al); |
565 |
– |
static void extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv); |
566 |
– |
|
567 |
– |
|
568 |
– |
void |
569 |
– |
multambient( /* compute ambient component & multiply by coef. */ |
570 |
– |
COLOR aval, |
571 |
– |
RAY *r, |
572 |
– |
FVECT nrm |
573 |
– |
) |
574 |
– |
{ |
575 |
– |
static int rdepth = 0; /* ambient recursion */ |
576 |
– |
COLOR acol; |
577 |
– |
double d, l; |
578 |
– |
|
579 |
– |
if (ambdiv <= 0) /* no ambient calculation */ |
580 |
– |
goto dumbamb; |
581 |
– |
/* check number of bounces */ |
582 |
– |
if (rdepth >= ambounce) |
583 |
– |
goto dumbamb; |
584 |
– |
/* check ambient list */ |
585 |
– |
if (ambincl != -1 && r->ro != NULL && |
586 |
– |
ambincl != inset(ambset, r->ro->omod)) |
587 |
– |
goto dumbamb; |
588 |
– |
|
589 |
– |
if (ambacc <= FTINY) { /* no ambient storage */ |
590 |
– |
copycolor(acol, aval); |
591 |
– |
rdepth++; |
592 |
– |
d = doambient(acol, r, r->rweight, NULL, NULL); |
593 |
– |
rdepth--; |
594 |
– |
if (d <= FTINY) |
595 |
– |
goto dumbamb; |
596 |
– |
copycolor(aval, acol); |
597 |
– |
return; |
598 |
– |
} |
599 |
– |
|
600 |
– |
if (tracktime) /* sort to minimize thrashing */ |
601 |
– |
sortambvals(0); |
602 |
– |
/* interpolate ambient value */ |
603 |
– |
setcolor(acol, 0.0, 0.0, 0.0); |
604 |
– |
d = sumambient(acol, r, nrm, rdepth, |
605 |
– |
&atrunk, thescene.cuorg, thescene.cusize); |
606 |
– |
if (d > FTINY) { |
607 |
– |
d = 1.0/d; |
608 |
– |
scalecolor(acol, d); |
609 |
– |
multcolor(aval, acol); |
610 |
– |
return; |
611 |
– |
} |
612 |
– |
rdepth++; /* need to cache new value */ |
613 |
– |
d = makeambient(acol, r, nrm, rdepth-1); |
614 |
– |
rdepth--; |
615 |
– |
if (d > FTINY) { |
616 |
– |
multcolor(aval, acol); /* got new value */ |
617 |
– |
return; |
618 |
– |
} |
619 |
– |
dumbamb: /* return global value */ |
620 |
– |
if ((ambvwt <= 0) | (navsum == 0)) { |
621 |
– |
multcolor(aval, ambval); |
622 |
– |
return; |
623 |
– |
} |
624 |
– |
l = bright(ambval); /* average in computations */ |
625 |
– |
if (l > FTINY) { |
626 |
– |
d = (log(l)*(double)ambvwt + avsum) / |
627 |
– |
(double)(ambvwt + navsum); |
628 |
– |
d = exp(d) / l; |
629 |
– |
scalecolor(aval, d); |
630 |
– |
multcolor(aval, ambval); /* apply color of ambval */ |
631 |
– |
} else { |
632 |
– |
d = exp( avsum / (double)navsum ); |
633 |
– |
scalecolor(aval, d); /* neutral color */ |
634 |
– |
} |
635 |
– |
} |
636 |
– |
|
637 |
– |
|
638 |
– |
static double |
639 |
– |
sumambient( /* get interpolated ambient value */ |
640 |
– |
COLOR acol, |
641 |
– |
RAY *r, |
642 |
– |
FVECT rn, |
643 |
– |
int al, |
644 |
– |
AMBTREE *at, |
645 |
– |
FVECT c0, |
646 |
– |
double s |
647 |
– |
) |
648 |
– |
{ |
649 |
– |
double d, e1, e2, wt, wsum; |
650 |
– |
COLOR ct; |
651 |
– |
FVECT ck0; |
652 |
– |
int i; |
653 |
– |
int j; |
654 |
– |
AMBVAL *av; |
655 |
– |
|
656 |
– |
wsum = 0.0; |
657 |
– |
/* do this node */ |
658 |
– |
for (av = at->alist; av != NULL; av = av->next) { |
659 |
– |
double rn_dot = -2.0; |
660 |
– |
if (tracktime) |
661 |
– |
av->latick = ambclock; |
662 |
– |
/* |
663 |
– |
* Ambient level test. |
664 |
– |
*/ |
665 |
– |
if (av->lvl > al) /* list sorted, so this works */ |
666 |
– |
break; |
667 |
– |
if (av->weight < 0.9*r->rweight) |
668 |
– |
continue; |
669 |
– |
/* |
670 |
– |
* Ambient radius test. |
671 |
– |
*/ |
672 |
– |
VSUB(ck0, av->pos, r->rop); |
673 |
– |
e1 = DOT(ck0, ck0) / (av->rad * av->rad); |
674 |
– |
if (e1 > ambacc*ambacc*1.21) |
675 |
– |
continue; |
676 |
– |
/* |
677 |
– |
* Direction test using closest normal. |
678 |
– |
*/ |
679 |
– |
d = DOT(av->dir, r->ron); |
680 |
– |
if (rn != r->ron) { |
681 |
– |
rn_dot = DOT(av->dir, rn); |
682 |
– |
if (rn_dot > 1.0-FTINY) |
683 |
– |
rn_dot = 1.0-FTINY; |
684 |
– |
if (rn_dot >= d-FTINY) { |
685 |
– |
d = rn_dot; |
686 |
– |
rn_dot = -2.0; |
687 |
– |
} |
688 |
– |
} |
689 |
– |
e2 = (1.0 - d) * r->rweight; |
690 |
– |
if (e2 < 0.0) |
691 |
– |
e2 = 0.0; |
692 |
– |
else if (e1 + e2 > ambacc*ambacc*1.21) |
693 |
– |
continue; |
694 |
– |
/* |
695 |
– |
* Ray behind test. |
696 |
– |
*/ |
697 |
– |
d = 0.0; |
698 |
– |
for (j = 0; j < 3; j++) |
699 |
– |
d += (r->rop[j] - av->pos[j]) * |
700 |
– |
(av->dir[j] + r->ron[j]); |
701 |
– |
if (d*0.5 < -minarad*ambacc-.001) |
702 |
– |
continue; |
703 |
– |
/* |
704 |
– |
* Jittering final test reduces image artifacts. |
705 |
– |
*/ |
706 |
– |
e1 = sqrt(e1); |
707 |
– |
e2 = sqrt(e2); |
708 |
– |
wt = e1 + e2; |
709 |
– |
if (wt > ambacc*(.9+.2*urand(9015+samplendx))) |
710 |
– |
continue; |
711 |
– |
/* |
712 |
– |
* Recompute directional error using perturbed normal |
713 |
– |
*/ |
714 |
– |
if (rn_dot > 0.0) { |
715 |
– |
e2 = sqrt((1.0 - rn_dot)*r->rweight); |
716 |
– |
wt = e1 + e2; |
717 |
– |
} |
718 |
– |
if (wt <= 1e-3) |
719 |
– |
wt = 1e3; |
720 |
– |
else |
721 |
– |
wt = 1.0 / wt; |
722 |
– |
wsum += wt; |
723 |
– |
extambient(ct, av, r->rop, rn); |
724 |
– |
scalecolor(ct, wt); |
725 |
– |
addcolor(acol, ct); |
726 |
– |
} |
727 |
– |
if (at->kid == NULL) |
728 |
– |
return(wsum); |
729 |
– |
/* do children */ |
730 |
– |
s *= 0.5; |
731 |
– |
for (i = 0; i < 8; i++) { |
732 |
– |
for (j = 0; j < 3; j++) { |
733 |
– |
ck0[j] = c0[j]; |
734 |
– |
if (1<<j & i) |
735 |
– |
ck0[j] += s; |
736 |
– |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
737 |
– |
break; |
738 |
– |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
739 |
– |
break; |
740 |
– |
} |
741 |
– |
if (j == 3) |
742 |
– |
wsum += sumambient(acol, r, rn, al, |
743 |
– |
at->kid+i, ck0, s); |
744 |
– |
} |
745 |
– |
return(wsum); |
746 |
– |
} |
747 |
– |
|
748 |
– |
|
749 |
– |
static double |
750 |
– |
makeambient( /* make a new ambient value for storage */ |
751 |
– |
COLOR acol, |
752 |
– |
RAY *r, |
753 |
– |
FVECT rn, |
754 |
– |
int al |
755 |
– |
) |
756 |
– |
{ |
757 |
– |
AMBVAL amb; |
758 |
– |
FVECT gp, gd; |
759 |
– |
int i; |
760 |
– |
|
761 |
– |
amb.weight = 1.0; /* compute weight */ |
762 |
– |
for (i = al; i-- > 0; ) |
763 |
– |
amb.weight *= AVGREFL; |
764 |
– |
if (r->rweight < 0.1*amb.weight) /* heuristic override */ |
765 |
– |
amb.weight = 1.25*r->rweight; |
766 |
– |
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
767 |
– |
/* compute ambient */ |
768 |
– |
amb.rad = doambient(acol, r, amb.weight, gp, gd); |
769 |
– |
if (amb.rad <= FTINY) { |
770 |
– |
setcolor(acol, 0.0, 0.0, 0.0); |
771 |
– |
return(0.0); |
772 |
– |
} |
773 |
– |
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
774 |
– |
/* store value */ |
775 |
– |
VCOPY(amb.pos, r->rop); |
776 |
– |
VCOPY(amb.dir, r->ron); |
777 |
– |
amb.lvl = al; |
778 |
– |
copycolor(amb.val, acol); |
779 |
– |
VCOPY(amb.gpos, gp); |
780 |
– |
VCOPY(amb.gdir, gd); |
781 |
– |
/* insert into tree */ |
782 |
– |
avsave(&amb); /* and save to file */ |
783 |
– |
if (rn != r->ron) |
784 |
– |
extambient(acol, &amb, r->rop, rn); /* texture */ |
785 |
– |
return(amb.rad); |
786 |
– |
} |
787 |
– |
|
788 |
– |
|
626 |
|
static void |
790 |
– |
extambient( /* extrapolate value at pv, nv */ |
791 |
– |
COLOR cr, |
792 |
– |
AMBVAL *ap, |
793 |
– |
FVECT pv, |
794 |
– |
FVECT nv |
795 |
– |
) |
796 |
– |
{ |
797 |
– |
FVECT v1; |
798 |
– |
int i; |
799 |
– |
double d; |
800 |
– |
|
801 |
– |
d = 1.0; /* zeroeth order */ |
802 |
– |
/* gradient due to translation */ |
803 |
– |
for (i = 0; i < 3; i++) |
804 |
– |
d += ap->gpos[i]*(pv[i]-ap->pos[i]); |
805 |
– |
/* gradient due to rotation */ |
806 |
– |
VCROSS(v1, ap->dir, nv); |
807 |
– |
d += DOT(ap->gdir, v1); |
808 |
– |
if (d <= 0.0) { |
809 |
– |
setcolor(cr, 0.0, 0.0, 0.0); |
810 |
– |
return; |
811 |
– |
} |
812 |
– |
copycolor(cr, ap->val); |
813 |
– |
scalecolor(cr, d); |
814 |
– |
} |
815 |
– |
|
816 |
– |
|
817 |
– |
static void |
818 |
– |
avinsert( /* insert ambient value in our tree */ |
819 |
– |
AMBVAL *av |
820 |
– |
) |
821 |
– |
{ |
822 |
– |
AMBTREE *at; |
823 |
– |
AMBVAL *ap; |
824 |
– |
AMBVAL avh; |
825 |
– |
FVECT ck0; |
826 |
– |
double s; |
827 |
– |
int branch; |
828 |
– |
int i; |
829 |
– |
|
830 |
– |
if (av->rad <= FTINY) |
831 |
– |
error(CONSISTENCY, "zero ambient radius in avinsert"); |
832 |
– |
at = &atrunk; |
833 |
– |
VCOPY(ck0, thescene.cuorg); |
834 |
– |
s = thescene.cusize; |
835 |
– |
while (s*(OCTSCALE/2) > av->rad*ambacc) { |
836 |
– |
if (at->kid == NULL) |
837 |
– |
if ((at->kid = newambtree()) == NULL) |
838 |
– |
error(SYSTEM, "out of memory in avinsert"); |
839 |
– |
s *= 0.5; |
840 |
– |
branch = 0; |
841 |
– |
for (i = 0; i < 3; i++) |
842 |
– |
if (av->pos[i] > ck0[i] + s) { |
843 |
– |
ck0[i] += s; |
844 |
– |
branch |= 1 << i; |
845 |
– |
} |
846 |
– |
at = at->kid + branch; |
847 |
– |
} |
848 |
– |
avh.next = at->alist; /* order by increasing level */ |
849 |
– |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
850 |
– |
if (ap->next->lvl >= av->lvl) |
851 |
– |
break; |
852 |
– |
av->next = ap->next; |
853 |
– |
ap->next = (AMBVAL*)av; |
854 |
– |
at->alist = avh.next; |
855 |
– |
} |
856 |
– |
|
857 |
– |
#endif /* ! NEWAMB */ |
858 |
– |
|
859 |
– |
/************* FOLLOWING ROUTINES SAME FOR NEW & OLD METHODS ***************/ |
860 |
– |
|
861 |
– |
static void |
627 |
|
initambfile( /* initialize ambient file */ |
628 |
|
int cre8 |
629 |
|
) |
630 |
|
{ |
631 |
|
extern char *progname, *octname; |
632 |
|
static char *mybuf = NULL; |
633 |
+ |
int ntries = 3; |
634 |
|
|
635 |
|
#ifdef F_SETLKW |
636 |
|
aflock(cre8 ? F_WRLCK : F_RDLCK); |
639 |
|
if (mybuf == NULL) |
640 |
|
mybuf = (char *)bmalloc(BUFSIZ+8); |
641 |
|
setbuf(ambfp, mybuf); |
642 |
+ |
retry: |
643 |
|
if (cre8) { /* new file */ |
644 |
|
newheader("RADIANCE", ambfp); |
645 |
|
fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ", |
648 |
|
ambvwt, ambounce, ambacc); |
649 |
|
fprintf(ambfp, "-ad %d -as %d -ar %d ", |
650 |
|
ambdiv, ambssamp, ambres); |
651 |
+ |
fprintf(ambfp, "-dr %d -ds %g -dt %g -dc %g ", directrelay, |
652 |
+ |
srcsizerat, shadthresh, shadcert); |
653 |
+ |
fprintf(ambfp, "-ss %g -st %g -lr %d -lw %g ", specjitter, |
654 |
+ |
specthresh, maxdepth, minweight); |
655 |
+ |
fprintf(ambfp, "-cw %g %g -cs %d ", WLPART[3], WLPART[0], NCSAMP); |
656 |
|
if (octname != NULL) |
657 |
|
fputs(octname, ambfp); |
658 |
< |
fputc('\n', ambfp); |
658 |
> |
fputc('\n', ambfp); /* end of command line, not header! */ |
659 |
|
fprintf(ambfp, "SOFTWARE= %s\n", VersionID); |
660 |
|
fputnow(ambfp); |
661 |
+ |
AMB_CNDX = CNDX; /* use current spectral sampling */ |
662 |
+ |
AMB_WLPART = WLPART; |
663 |
+ |
fputwlsplit(WLPART, ambfp); |
664 |
+ |
fputncomp(NCSAMP, ambfp); |
665 |
|
fputformat(AMBFMT, ambfp); |
666 |
|
fputc('\n', ambfp); |
667 |
|
putambmagic(ambfp); |
668 |
< |
} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp)) |
669 |
< |
error(USER, "bad ambient file"); |
668 |
> |
} else if (getheader(ambfp, amb_headline, NULL) < 0 || !hasambmagic(ambfp)) { |
669 |
> |
if (--ntries > 0 && ftell(ambfp) == 0) { |
670 |
> |
#ifdef F_SETLKW |
671 |
> |
aflock(F_UNLCK); |
672 |
> |
clearerr(ambfp); |
673 |
> |
sleep(2); |
674 |
> |
aflock(F_RDLCK); |
675 |
> |
#else |
676 |
> |
clearerr(ambfp); |
677 |
> |
sleep(2); |
678 |
> |
#endif |
679 |
> |
goto retry; |
680 |
> |
} |
681 |
> |
error(USER, "bad/incompatible ambient file"); |
682 |
> |
} |
683 |
> |
if ((AMB_CNDX != CNDX) | (AMB_WLPART != WLPART)) { |
684 |
> |
if (setspectrsamp(AMB_CNDX, AMB_WLPART) < 0) |
685 |
> |
error(USER, "bad wavelength sampling in ambient file"); |
686 |
> |
if (AMB_CNDX[3] == CNDX[3] && FABSEQ(AMB_WLPART[0],WLPART[0]) && |
687 |
> |
FABSEQ(AMB_WLPART[3],WLPART[3])) { |
688 |
> |
AMB_CNDX = CNDX; |
689 |
> |
AMB_WLPART = WLPART; /* just the same */ |
690 |
> |
} else |
691 |
> |
error(WARNING, "different ambient file wavelength sampling"); |
692 |
> |
} |
693 |
|
} |
694 |
|
|
695 |
|
|
698 |
|
AMBVAL *av |
699 |
|
) |
700 |
|
{ |
701 |
< |
avinsert(avstore(av)); |
701 |
> |
avstore(av); |
702 |
|
if (ambfp == NULL) |
703 |
|
return; |
704 |
|
if (writambval(av, ambfp) < 0) |
713 |
|
|
714 |
|
|
715 |
|
static AMBVAL * |
716 |
< |
avstore( /* allocate memory and store aval */ |
716 |
> |
avstore( /* allocate memory and save aval */ |
717 |
|
AMBVAL *aval |
718 |
|
) |
719 |
|
{ |
722 |
|
|
723 |
|
if ((av = newambval()) == NULL) |
724 |
|
error(SYSTEM, "out of memory in avstore"); |
725 |
< |
*av = *aval; |
927 |
< |
av->latick = ambclock; |
725 |
> |
memcpy(av, aval, AVSIZE); /* AVSIZE <= sizeof(AMBVAL) */ |
726 |
|
av->next = NULL; |
727 |
|
nambvals++; |
728 |
< |
d = bright(av->val); |
728 |
> |
d = pbright(av->val); |
729 |
|
if (d > FTINY) { /* add to log sum for averaging */ |
730 |
|
avsum += log(d); |
731 |
|
navsum++; |
732 |
|
} |
733 |
+ |
avinsert(av); /* insert in our cache tree */ |
734 |
|
return(av); |
735 |
|
} |
736 |
|
|
757 |
|
} |
758 |
|
atp = atfreelist; |
759 |
|
atfreelist = atp->kid; |
760 |
< |
memset((char *)atp, '\0', 8*sizeof(AMBTREE)); |
760 |
> |
memset(atp, 0, 8*sizeof(AMBTREE)); |
761 |
|
return(atp); |
762 |
|
} |
763 |
|
|
783 |
|
/* transfer values at this node */ |
784 |
|
for (av = at->alist; av != NULL; av = at->alist) { |
785 |
|
at->alist = av->next; |
786 |
+ |
av->next = NULL; |
787 |
|
(*f)(av); |
788 |
|
} |
789 |
|
if (at->kid == NULL) |
795 |
|
} |
796 |
|
|
797 |
|
|
998 |
– |
static struct avl { |
999 |
– |
AMBVAL *p; |
1000 |
– |
unsigned long t; |
1001 |
– |
} *avlist1; /* ambient value list with ticks */ |
1002 |
– |
static AMBVAL **avlist2; /* memory positions for sorting */ |
1003 |
– |
static int i_avlist; /* index for lists */ |
1004 |
– |
|
1005 |
– |
static int alatcmp(const void *av1, const void *av2); |
1006 |
– |
|
798 |
|
static void |
799 |
|
avfree(AMBVAL *av) |
800 |
|
{ |
801 |
|
free(av); |
802 |
|
} |
803 |
|
|
804 |
+ |
|
805 |
|
static void |
806 |
< |
av2list( |
1015 |
< |
AMBVAL *av |
1016 |
< |
) |
806 |
> |
sortambvals(void) /* resort ambient values */ |
807 |
|
{ |
808 |
< |
#ifdef DEBUG |
1019 |
< |
if (i_avlist >= nambvals) |
1020 |
< |
error(CONSISTENCY, "too many ambient values in av2list1"); |
1021 |
< |
#endif |
1022 |
< |
avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av; |
1023 |
< |
avlist1[i_avlist++].t = av->latick; |
1024 |
< |
} |
808 |
> |
AMBTREE oldatrunk = atrunk; |
809 |
|
|
810 |
< |
|
811 |
< |
static int |
812 |
< |
alatcmp( /* compare ambient values for MRA */ |
1029 |
< |
const void *av1, |
1030 |
< |
const void *av2 |
1031 |
< |
) |
1032 |
< |
{ |
1033 |
< |
long lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t; |
1034 |
< |
return(lc<0 ? -1 : lc>0 ? 1 : 0); |
810 |
> |
atrunk.alist = NULL; |
811 |
> |
atrunk.kid = NULL; |
812 |
> |
unloadatree(&oldatrunk, avinsert); |
813 |
|
} |
814 |
|
|
815 |
|
|
1038 |
– |
/* GW NOTE 2002/10/3: |
1039 |
– |
* I used to compare AMBVAL pointers, but found that this was the |
1040 |
– |
* cause of a serious consistency error with gcc, since the optimizer |
1041 |
– |
* uses some dangerous trick in pointer subtraction that |
1042 |
– |
* assumes pointers differ by exact struct size increments. |
1043 |
– |
*/ |
1044 |
– |
static int |
1045 |
– |
aposcmp( /* compare ambient value positions */ |
1046 |
– |
const void *avp1, |
1047 |
– |
const void *avp2 |
1048 |
– |
) |
1049 |
– |
{ |
1050 |
– |
long diff = *(char * const *)avp1 - *(char * const *)avp2; |
1051 |
– |
if (diff < 0) |
1052 |
– |
return(-1); |
1053 |
– |
return(diff > 0); |
1054 |
– |
} |
1055 |
– |
|
1056 |
– |
|
1057 |
– |
static int |
1058 |
– |
avlmemi( /* find list position from address */ |
1059 |
– |
AMBVAL *avaddr |
1060 |
– |
) |
1061 |
– |
{ |
1062 |
– |
AMBVAL **avlpp; |
1063 |
– |
|
1064 |
– |
avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2, |
1065 |
– |
nambvals, sizeof(AMBVAL *), &aposcmp); |
1066 |
– |
if (avlpp == NULL) |
1067 |
– |
error(CONSISTENCY, "address not found in avlmemi"); |
1068 |
– |
return(avlpp - avlist2); |
1069 |
– |
} |
1070 |
– |
|
1071 |
– |
|
1072 |
– |
static void |
1073 |
– |
sortambvals( /* resort ambient values */ |
1074 |
– |
int always |
1075 |
– |
) |
1076 |
– |
{ |
1077 |
– |
AMBTREE oldatrunk; |
1078 |
– |
AMBVAL tav, *tap, *pnext; |
1079 |
– |
int i, j; |
1080 |
– |
/* see if it's time yet */ |
1081 |
– |
if (!always && (ambclock++ < lastsort+sortintvl || |
1082 |
– |
nambvals < SORT_THRESH)) |
1083 |
– |
return; |
1084 |
– |
/* |
1085 |
– |
* The idea here is to minimize memory thrashing |
1086 |
– |
* in VM systems by improving reference locality. |
1087 |
– |
* We do this by periodically sorting our stored ambient |
1088 |
– |
* values in memory in order of most recently to least |
1089 |
– |
* recently accessed. This ordering was chosen so that new |
1090 |
– |
* ambient values (which tend to be less important) go into |
1091 |
– |
* higher memory with the infrequently accessed values. |
1092 |
– |
* Since we expect our values to need sorting less |
1093 |
– |
* frequently as the process continues, we double our |
1094 |
– |
* waiting interval after each call. |
1095 |
– |
* This routine is also called by setambacc() with |
1096 |
– |
* the "always" parameter set to 1 so that the ambient |
1097 |
– |
* tree will be rebuilt with the new accuracy parameter. |
1098 |
– |
*/ |
1099 |
– |
if (tracktime) { /* allocate pointer arrays to sort */ |
1100 |
– |
avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); |
1101 |
– |
avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl)); |
1102 |
– |
} else { |
1103 |
– |
avlist2 = NULL; |
1104 |
– |
avlist1 = NULL; |
1105 |
– |
} |
1106 |
– |
if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */ |
1107 |
– |
if (avlist2 != NULL) |
1108 |
– |
free((void *)avlist2); |
1109 |
– |
if (always) { /* rebuild without sorting */ |
1110 |
– |
oldatrunk = atrunk; |
1111 |
– |
atrunk.alist = NULL; |
1112 |
– |
atrunk.kid = NULL; |
1113 |
– |
unloadatree(&oldatrunk, &avinsert); |
1114 |
– |
} |
1115 |
– |
} else { /* sort memory by last access time */ |
1116 |
– |
/* |
1117 |
– |
* Sorting memory is tricky because it isn't contiguous. |
1118 |
– |
* We have to sort an array of pointers by MRA and also |
1119 |
– |
* by memory position. We then copy values in "loops" |
1120 |
– |
* to minimize memory hits. Nevertheless, we will visit |
1121 |
– |
* everyone at least twice, and this is an expensive process |
1122 |
– |
* when we're thrashing, which is when we need to do it. |
1123 |
– |
*/ |
1124 |
– |
#ifdef DEBUG |
1125 |
– |
sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...", |
1126 |
– |
nambvals, ambclock); |
1127 |
– |
eputs(errmsg); |
1128 |
– |
#endif |
1129 |
– |
i_avlist = 0; |
1130 |
– |
unloadatree(&atrunk, &av2list); /* empty current tree */ |
1131 |
– |
#ifdef DEBUG |
1132 |
– |
if (i_avlist < nambvals) |
1133 |
– |
error(CONSISTENCY, "missing ambient values in sortambvals"); |
1134 |
– |
#endif |
1135 |
– |
qsort((char *)avlist1, nambvals, sizeof(struct avl), &alatcmp); |
1136 |
– |
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), &aposcmp); |
1137 |
– |
for (i = 0; i < nambvals; i++) { |
1138 |
– |
if (avlist1[i].p == NULL) |
1139 |
– |
continue; |
1140 |
– |
tap = avlist2[i]; |
1141 |
– |
tav = *tap; |
1142 |
– |
for (j = i; (pnext = avlist1[j].p) != tap; |
1143 |
– |
j = avlmemi(pnext)) { |
1144 |
– |
*(avlist2[j]) = *pnext; |
1145 |
– |
avinsert(avlist2[j]); |
1146 |
– |
avlist1[j].p = NULL; |
1147 |
– |
} |
1148 |
– |
*(avlist2[j]) = tav; |
1149 |
– |
avinsert(avlist2[j]); |
1150 |
– |
avlist1[j].p = NULL; |
1151 |
– |
} |
1152 |
– |
free((void *)avlist1); |
1153 |
– |
free((void *)avlist2); |
1154 |
– |
/* compute new sort interval */ |
1155 |
– |
sortintvl = ambclock - lastsort; |
1156 |
– |
if (sortintvl >= MAX_SORT_INTVL/2) |
1157 |
– |
sortintvl = MAX_SORT_INTVL; |
1158 |
– |
else |
1159 |
– |
sortintvl <<= 1; /* wait twice as long next */ |
1160 |
– |
#ifdef DEBUG |
1161 |
– |
eputs("done\n"); |
1162 |
– |
#endif |
1163 |
– |
} |
1164 |
– |
if (ambclock >= MAXACLOCK) |
1165 |
– |
ambclock = MAXACLOCK/2; |
1166 |
– |
lastsort = ambclock; |
1167 |
– |
} |
1168 |
– |
|
1169 |
– |
|
816 |
|
#ifdef F_SETLKW |
817 |
|
|
818 |
|
static void |
824 |
|
|
825 |
|
if (typ == fls.l_type) /* already called? */ |
826 |
|
return; |
827 |
+ |
|
828 |
|
fls.l_type = typ; |
829 |
< |
if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0) |
830 |
< |
error(SYSTEM, "cannot (un)lock ambient file"); |
829 |
> |
do |
830 |
> |
if (fcntl(fileno(ambfp), F_SETLKW, &fls) != -1) |
831 |
> |
return; |
832 |
> |
while (errno == EINTR); |
833 |
> |
|
834 |
> |
error(SYSTEM, "cannot (un)lock ambient file"); |
835 |
|
} |
836 |
|
|
837 |
|
|
850 |
|
if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0) |
851 |
|
goto seekerr; |
852 |
|
if ((n = flen - lastpos) > 0) { /* file has grown */ |
853 |
< |
if (ambinp == NULL) { /* use duplicate filedes */ |
854 |
< |
ambinp = fdopen(dup(fileno(ambfp)), "r"); |
853 |
> |
if (ambinp == NULL) { /* get new file pointer */ |
854 |
> |
ambinp = fopen(ambfile, "rb"); |
855 |
|
if (ambinp == NULL) |
856 |
< |
error(SYSTEM, "fdopen failed in ambsync"); |
856 |
> |
error(SYSTEM, "fopen failed in ambsync"); |
857 |
|
} |
858 |
|
if (fseek(ambinp, lastpos, SEEK_SET) < 0) |
859 |
|
goto seekerr; |
865 |
|
error(WARNING, errmsg); |
866 |
|
break; |
867 |
|
} |
868 |
< |
avinsert(avstore(&avs)); |
868 |
> |
avstore(&avs); |
869 |
|
n -= AMBVALSIZ; |
870 |
|
} |
871 |
< |
lastpos = flen - n; |
872 |
< |
/*** seek always as safety measure |
873 |
< |
if (n) ***/ /* alignment */ |
1223 |
< |
if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) |
1224 |
< |
goto seekerr; |
871 |
> |
lastpos = flen - n; /* check alignment */ |
872 |
> |
if (n && lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) |
873 |
> |
goto seekerr; |
874 |
|
} |
875 |
|
n = fflush(ambfp); /* calls write() at last */ |
876 |
< |
if (n != EOF) |
1228 |
< |
lastpos += (long)nunflshed*AMBVALSIZ; |
1229 |
< |
else if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0) |
1230 |
< |
goto seekerr; |
1231 |
< |
|
876 |
> |
lastpos += (long)nunflshed*AMBVALSIZ; |
877 |
|
aflock(F_UNLCK); /* release file */ |
878 |
|
nunflshed = 0; |
879 |
|
return(n); |
880 |
|
seekerr: |
881 |
|
error(SYSTEM, "seek failed in ambsync"); |
882 |
< |
return -1; /* pro forma return */ |
882 |
> |
return(EOF); /* pro forma return */ |
883 |
|
} |
884 |
|
|
885 |
|
#else /* ! F_SETLKW */ |