14 |
|
#include "platform.h" |
15 |
|
#include "ray.h" |
16 |
|
#include "otypes.h" |
17 |
+ |
#include "resolu.h" |
18 |
|
#include "ambient.h" |
19 |
|
#include "random.h" |
20 |
|
|
24 |
|
|
25 |
|
extern char *shm_boundary; /* memory sharing boundary */ |
26 |
|
|
27 |
< |
#define MAXASET 511 /* maximum number of elements in ambient set */ |
27 |
> |
#ifndef MAXASET |
28 |
> |
#define MAXASET 4095 /* maximum number of elements in ambient set */ |
29 |
> |
#endif |
30 |
|
OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */ |
31 |
|
|
32 |
|
double maxarad; /* maximum ambient radius */ |
39 |
|
|
40 |
|
#ifndef SORT_THRESH |
41 |
|
#ifdef SMLMEM |
42 |
< |
#define SORT_THRESH ((3L<<20)/sizeof(AMBVAL)) |
42 |
> |
#define SORT_THRESH ((16L<<20)/sizeof(AMBVAL)) |
43 |
|
#else |
44 |
< |
#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL)) |
44 |
> |
#define SORT_THRESH ((64L<<20)/sizeof(AMBVAL)) |
45 |
|
#endif |
46 |
|
#endif |
47 |
|
#ifndef 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 */ |
56 |
|
static double avsum = 0.; /* computed ambient value sum (log) */ |
57 |
|
static unsigned int navsum = 0; /* number of values in avsum */ |
58 |
|
static unsigned int nambvals = 0; /* total number of indirect values */ |
80 |
|
#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) |
81 |
|
#define freeav(av) free((void *)av); |
82 |
|
|
83 |
< |
static void initambfile(), avsave(), avinsert(), sortambvals(), unloadatree(); |
84 |
< |
static int avlmemi(); |
85 |
< |
static AMBVAL *avstore(); |
83 |
> |
static void initambfile(int creat); |
84 |
> |
static void avsave(AMBVAL *av); |
85 |
> |
static AMBVAL *avstore(AMBVAL *aval); |
86 |
> |
static AMBTREE *newambtree(void); |
87 |
> |
static void freeambtree(AMBTREE *atp); |
88 |
> |
|
89 |
> |
typedef void unloadtf_t(AMBVAL *); |
90 |
> |
static unloadtf_t avinsert; |
91 |
> |
static unloadtf_t av2list; |
92 |
> |
static unloadtf_t avfree; |
93 |
> |
static void unloadatree(AMBTREE *at, unloadtf_t *f); |
94 |
> |
|
95 |
> |
static int aposcmp(const void *avp1, const void *avp2); |
96 |
> |
static int avlmemi(AMBVAL *avaddr); |
97 |
> |
static void sortambvals(int always); |
98 |
> |
|
99 |
|
#ifdef F_SETLKW |
100 |
< |
static void aflock(); |
100 |
> |
static void aflock(int typ); |
101 |
|
#endif |
102 |
|
|
103 |
|
|
104 |
|
void |
105 |
< |
setambres(ar) /* set ambient resolution */ |
106 |
< |
int ar; |
105 |
> |
setambres( /* set ambient resolution */ |
106 |
> |
int ar |
107 |
> |
) |
108 |
|
{ |
109 |
|
ambres = ar < 0 ? 0 : ar; /* may be done already */ |
110 |
|
/* set min & max radii */ |
125 |
|
|
126 |
|
|
127 |
|
void |
128 |
< |
setambacc(newa) /* set ambient accuracy */ |
129 |
< |
double newa; |
128 |
> |
setambacc( /* set ambient accuracy */ |
129 |
> |
double newa |
130 |
> |
) |
131 |
|
{ |
132 |
|
double ambdiff; |
133 |
|
|
134 |
|
if (newa < 0.0) |
135 |
|
newa = 0.0; |
136 |
|
ambdiff = fabs(newa - ambacc); |
137 |
< |
if (ambdiff >= .01 && (ambacc = newa) > FTINY && nambvals > 0) |
138 |
< |
sortambvals(1); /* rebuild tree */ |
137 |
> |
if (ambdiff >= .01 && (ambacc = newa) > FTINY) { |
138 |
> |
qambacc = sqrt(sqrt(ambacc)); |
139 |
> |
if (nambvals > 0) |
140 |
> |
sortambvals(1); /* rebuild tree */ |
141 |
> |
} |
142 |
|
} |
143 |
|
|
144 |
|
|
145 |
|
void |
146 |
< |
setambient() /* initialize calculation */ |
146 |
> |
setambient(void) /* initialize calculation */ |
147 |
|
{ |
148 |
|
int readonly = 0; |
149 |
< |
long pos, flen; |
149 |
> |
long flen; |
150 |
|
AMBVAL amb; |
151 |
|
/* make sure we're fresh */ |
152 |
|
ambdone(); |
153 |
|
/* init ambient limits */ |
154 |
|
setambres(ambres); |
155 |
< |
setambacc(ambacc); |
155 |
> |
qambacc = sqrt(sqrt(ambacc *= (ambacc > FTINY))); |
156 |
|
if (ambfile == NULL || !ambfile[0]) |
157 |
|
return; |
158 |
|
if (ambacc <= FTINY) { |
166 |
|
readonly = (ambfp = fopen(ambfile, "r")) != NULL; |
167 |
|
if (ambfp != NULL) { |
168 |
|
initambfile(0); /* file exists */ |
169 |
< |
pos = ftell(ambfp); |
169 |
> |
lastpos = ftell(ambfp); |
170 |
|
while (readambval(&amb, ambfp)) |
171 |
|
avinsert(avstore(&amb)); |
172 |
|
nambshare = nambvals; /* share loaded values */ |
180 |
|
return; /* avoid ambsync() */ |
181 |
|
} |
182 |
|
/* align file pointer */ |
183 |
< |
pos += (long)nambvals*AMBVALSIZ; |
184 |
< |
flen = lseek(fileno(ambfp), (off_t)0L, 2); |
185 |
< |
if (flen != pos) { |
183 |
> |
lastpos += (long)nambvals*AMBVALSIZ; |
184 |
> |
flen = lseek(fileno(ambfp), (off_t)0, SEEK_END); |
185 |
> |
if (flen != lastpos) { |
186 |
|
sprintf(errmsg, |
187 |
|
"ignoring last %ld values in ambient file (corrupted)", |
188 |
< |
(flen - pos)/AMBVALSIZ); |
188 |
> |
(flen - lastpos)/AMBVALSIZ); |
189 |
|
error(WARNING, errmsg); |
190 |
< |
fseek(ambfp, pos, 0); |
190 |
> |
fseek(ambfp, lastpos, SEEK_SET); |
191 |
|
#ifndef _WIN32 /* XXX we need a replacement for that one */ |
192 |
< |
ftruncate(fileno(ambfp), (off_t)pos); |
192 |
> |
ftruncate(fileno(ambfp), (off_t)lastpos); |
193 |
|
#endif |
194 |
|
} |
195 |
|
} else if ((ambfp = fopen(ambfile, "w+")) != NULL) { |
196 |
|
initambfile(1); /* else create new file */ |
197 |
+ |
fflush(ambfp); |
198 |
+ |
lastpos = ftell(ambfp); |
199 |
|
} else { |
200 |
|
sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); |
201 |
|
error(SYSTEM, errmsg); |
202 |
|
} |
203 |
< |
nunflshed++; /* lie */ |
204 |
< |
ambsync(); |
203 |
> |
#ifdef getc_unlocked |
204 |
> |
flockfile(ambfp); /* application-level lock */ |
205 |
> |
#endif |
206 |
> |
#ifdef F_SETLKW |
207 |
> |
aflock(F_UNLCK); /* release file */ |
208 |
> |
#endif |
209 |
|
} |
210 |
|
|
211 |
|
|
212 |
|
void |
213 |
< |
ambdone() /* close ambient file and free memory */ |
213 |
> |
ambdone(void) /* close ambient file and free memory */ |
214 |
|
{ |
215 |
|
if (ambfp != NULL) { /* close ambient file */ |
216 |
|
ambsync(); |
223 |
|
lastpos = -1; |
224 |
|
} |
225 |
|
/* free ambient tree */ |
226 |
< |
unloadatree(&atrunk, free); |
226 |
> |
unloadatree(&atrunk, &avfree); |
227 |
|
/* reset state variables */ |
228 |
|
avsum = 0.; |
229 |
|
navsum = 0; |
236 |
|
|
237 |
|
|
238 |
|
void |
239 |
< |
ambnotify(obj) /* record new modifier */ |
240 |
< |
OBJECT obj; |
239 |
> |
ambnotify( /* record new modifier */ |
240 |
> |
OBJECT obj |
241 |
> |
) |
242 |
|
{ |
243 |
|
static int hitlimit = 0; |
244 |
< |
register OBJREC *o; |
245 |
< |
register char **amblp; |
244 |
> |
OBJREC *o; |
245 |
> |
char **amblp; |
246 |
|
|
247 |
|
if (obj == OVOID) { /* starting over */ |
248 |
|
ambset[0] = 0; |
264 |
|
} |
265 |
|
} |
266 |
|
|
267 |
+ |
/************ THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD ***************/ |
268 |
|
|
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 |
+ |
|
279 |
|
void |
280 |
< |
ambient(acol, r, nrm) /* compute ambient component for ray */ |
281 |
< |
COLOR acol; |
282 |
< |
register RAY *r; |
283 |
< |
FVECT nrm; |
280 |
> |
multambient( /* compute ambient component & multiply by coef. */ |
281 |
> |
COLOR aval, |
282 |
> |
RAY *r, |
283 |
> |
FVECT nrm |
284 |
> |
) |
285 |
|
{ |
286 |
|
static int rdepth = 0; /* ambient recursion */ |
287 |
+ |
COLOR acol; |
288 |
+ |
int ok; |
289 |
|
double d, l; |
290 |
|
|
291 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
299 |
|
goto dumbamb; |
300 |
|
|
301 |
|
if (ambacc <= FTINY) { /* no ambient storage */ |
302 |
+ |
copycolor(acol, aval); |
303 |
|
rdepth++; |
304 |
+ |
ok = doambient(acol, r, r->rweight, NULL, NULL, NULL, NULL); |
305 |
+ |
rdepth--; |
306 |
+ |
if (!ok) |
307 |
+ |
goto dumbamb; |
308 |
+ |
copycolor(aval, acol); |
309 |
+ |
return; |
310 |
+ |
} |
311 |
+ |
|
312 |
+ |
if (tracktime) /* sort to minimize thrashing */ |
313 |
+ |
sortambvals(0); |
314 |
+ |
/* interpolate ambient value */ |
315 |
+ |
setcolor(acol, 0.0, 0.0, 0.0); |
316 |
+ |
d = sumambient(acol, r, nrm, rdepth, |
317 |
+ |
&atrunk, thescene.cuorg, thescene.cusize); |
318 |
+ |
if (d > FTINY) { |
319 |
+ |
d = 1.0/d; |
320 |
+ |
scalecolor(acol, d); |
321 |
+ |
multcolor(aval, acol); |
322 |
+ |
return; |
323 |
+ |
} |
324 |
+ |
rdepth++; /* need to cache new value */ |
325 |
+ |
ok = makeambient(acol, r, nrm, rdepth-1); |
326 |
+ |
rdepth--; |
327 |
+ |
if (ok) { |
328 |
+ |
multcolor(aval, acol); /* computed new value */ |
329 |
+ |
return; |
330 |
+ |
} |
331 |
+ |
dumbamb: /* return global value */ |
332 |
+ |
if ((ambvwt <= 0) | (navsum == 0)) { |
333 |
+ |
multcolor(aval, ambval); |
334 |
+ |
return; |
335 |
+ |
} |
336 |
+ |
l = bright(ambval); /* average in computations */ |
337 |
+ |
if (l > FTINY) { |
338 |
+ |
d = (log(l)*(double)ambvwt + avsum) / |
339 |
+ |
(double)(ambvwt + navsum); |
340 |
+ |
d = exp(d) / l; |
341 |
+ |
scalecolor(aval, d); |
342 |
+ |
multcolor(aval, ambval); /* apply color of ambval */ |
343 |
+ |
} else { |
344 |
+ |
d = exp( avsum / (double)navsum ); |
345 |
+ |
scalecolor(aval, d); /* neutral color */ |
346 |
+ |
} |
347 |
+ |
} |
348 |
+ |
|
349 |
+ |
|
350 |
+ |
double |
351 |
+ |
sumambient( /* get interpolated ambient value */ |
352 |
+ |
COLOR acol, |
353 |
+ |
RAY *r, |
354 |
+ |
FVECT rn, |
355 |
+ |
int al, |
356 |
+ |
AMBTREE *at, |
357 |
+ |
FVECT c0, |
358 |
+ |
double s |
359 |
+ |
) |
360 |
+ |
{ /* initial limit is 10 degrees plus ambacc radians */ |
361 |
+ |
const double minangle = 10.0 * PI/180.; |
362 |
+ |
const double maxangle = (minangle+ambacc-PI/2.)*pow(r->rweight,0.13) |
363 |
+ |
+ PI/2.; |
364 |
+ |
double wsum = 0.0; |
365 |
+ |
FVECT ck0; |
366 |
+ |
int i, j; |
367 |
+ |
AMBVAL *av; |
368 |
+ |
/* sum this node */ |
369 |
+ |
for (av = at->alist; av != NULL; av = av->next) { |
370 |
+ |
double d, delta_r2, delta_t2; |
371 |
+ |
COLOR ct; |
372 |
+ |
FVECT uvw[3]; |
373 |
+ |
/* record access */ |
374 |
+ |
if (tracktime) |
375 |
+ |
av->latick = ambclock; |
376 |
+ |
/* |
377 |
+ |
* Ambient level test |
378 |
+ |
*/ |
379 |
+ |
if (av->lvl > al) /* list sorted, so this works */ |
380 |
+ |
break; |
381 |
+ |
if (av->weight < 0.9*r->rweight) |
382 |
+ |
continue; |
383 |
+ |
/* |
384 |
+ |
* Direction test using unperturbed normal |
385 |
+ |
*/ |
386 |
+ |
decodedir(uvw[2], av->ndir); |
387 |
+ |
d = DOT(uvw[2], r->ron); |
388 |
+ |
if (d <= 0.0) /* >= 90 degrees */ |
389 |
+ |
continue; |
390 |
+ |
delta_r2 = 2.0 - 2.0*d; /* approx. radians^2 */ |
391 |
+ |
if (delta_r2 >= maxangle*maxangle) |
392 |
+ |
continue; |
393 |
+ |
/* |
394 |
+ |
* Modified ray behind test |
395 |
+ |
*/ |
396 |
+ |
VSUB(ck0, av->pos, r->rop); |
397 |
+ |
d = DOT(ck0, uvw[2]); |
398 |
+ |
if (d < -minarad*qambacc-.001) |
399 |
+ |
continue; |
400 |
+ |
d /= av->rad[0]; |
401 |
+ |
delta_t2 = d*d; |
402 |
+ |
if (delta_t2 >= qambacc*qambacc) |
403 |
+ |
continue; |
404 |
+ |
/* |
405 |
+ |
* Elliptical radii test based on Hessian |
406 |
+ |
*/ |
407 |
+ |
decodedir(uvw[0], av->udir); |
408 |
+ |
VCROSS(uvw[1], uvw[2], uvw[0]); |
409 |
+ |
d = DOT(ck0, uvw[0]) / av->rad[0]; |
410 |
+ |
delta_t2 += d*d; |
411 |
+ |
d = DOT(ck0, uvw[1]) / av->rad[1]; |
412 |
+ |
delta_t2 += d*d; |
413 |
+ |
if (delta_t2 >= qambacc*qambacc) |
414 |
+ |
continue; |
415 |
+ |
/* |
416 |
+ |
* Extrapolate value and compute final weight (hat function) |
417 |
+ |
*/ |
418 |
+ |
extambient(ct, av, r->rop, rn, uvw); |
419 |
+ |
d = tfunc(maxangle, sqrt(delta_r2), 0.0) * |
420 |
+ |
tfunc(qambacc, sqrt(delta_t2), 0.0); |
421 |
+ |
scalecolor(ct, d); |
422 |
+ |
addcolor(acol, ct); |
423 |
+ |
wsum += d; |
424 |
+ |
} |
425 |
+ |
if (at->kid == NULL) |
426 |
+ |
return(wsum); |
427 |
+ |
/* sum children */ |
428 |
+ |
s *= 0.5; |
429 |
+ |
for (i = 0; i < 8; i++) { |
430 |
+ |
for (j = 0; j < 3; j++) { |
431 |
+ |
ck0[j] = c0[j]; |
432 |
+ |
if (1<<j & i) |
433 |
+ |
ck0[j] += s; |
434 |
+ |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
435 |
+ |
break; |
436 |
+ |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
437 |
+ |
break; |
438 |
+ |
} |
439 |
+ |
if (j == 3) |
440 |
+ |
wsum += sumambient(acol, r, rn, al, |
441 |
+ |
at->kid+i, ck0, s); |
442 |
+ |
} |
443 |
+ |
return(wsum); |
444 |
+ |
} |
445 |
+ |
|
446 |
+ |
|
447 |
+ |
int |
448 |
+ |
makeambient( /* make a new ambient value for storage */ |
449 |
+ |
COLOR acol, |
450 |
+ |
RAY *r, |
451 |
+ |
FVECT rn, |
452 |
+ |
int al |
453 |
+ |
) |
454 |
+ |
{ |
455 |
+ |
AMBVAL amb; |
456 |
+ |
FVECT uvw[3]; |
457 |
+ |
int i; |
458 |
+ |
|
459 |
+ |
amb.weight = 1.0; /* compute weight */ |
460 |
+ |
for (i = al; i-- > 0; ) |
461 |
+ |
amb.weight *= AVGREFL; |
462 |
+ |
if (r->rweight < 0.1*amb.weight) /* heuristic override */ |
463 |
+ |
amb.weight = 1.25*r->rweight; |
464 |
+ |
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
465 |
+ |
/* compute ambient */ |
466 |
+ |
i = doambient(acol, r, amb.weight, uvw, amb.rad, amb.gpos, amb.gdir); |
467 |
+ |
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
468 |
+ |
if (i <= 0 || amb.rad[0] <= FTINY) /* no Hessian or zero radius */ |
469 |
+ |
return(i); |
470 |
+ |
/* store value */ |
471 |
+ |
VCOPY(amb.pos, r->rop); |
472 |
+ |
amb.ndir = encodedir(r->ron); |
473 |
+ |
amb.udir = encodedir(uvw[0]); |
474 |
+ |
amb.lvl = al; |
475 |
+ |
copycolor(amb.val, acol); |
476 |
+ |
/* insert into tree */ |
477 |
+ |
avsave(&amb); /* and save to file */ |
478 |
+ |
if (rn != r->ron) { /* texture */ |
479 |
+ |
VCOPY(uvw[2], r->ron); |
480 |
+ |
extambient(acol, &amb, r->rop, rn, uvw); |
481 |
+ |
} |
482 |
+ |
return(1); |
483 |
+ |
} |
484 |
+ |
|
485 |
+ |
|
486 |
+ |
void |
487 |
+ |
extambient( /* extrapolate value at pv, nv */ |
488 |
+ |
COLOR cr, |
489 |
+ |
AMBVAL *ap, |
490 |
+ |
FVECT pv, |
491 |
+ |
FVECT nv, |
492 |
+ |
FVECT uvw[3] |
493 |
+ |
) |
494 |
+ |
{ |
495 |
+ |
static FVECT my_uvw[3]; |
496 |
+ |
FVECT v1; |
497 |
+ |
int i; |
498 |
+ |
double d = 1.0; /* zeroeth order */ |
499 |
+ |
|
500 |
+ |
if (uvw == NULL) { /* need local coordinates? */ |
501 |
+ |
decodedir(my_uvw[2], ap->ndir); |
502 |
+ |
decodedir(my_uvw[0], ap->udir); |
503 |
+ |
VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]); |
504 |
+ |
uvw = my_uvw; |
505 |
+ |
} |
506 |
+ |
for (i = 3; i--; ) /* gradient due to translation */ |
507 |
+ |
d += (pv[i] - ap->pos[i]) * |
508 |
+ |
(ap->gpos[0]*uvw[0][i] + ap->gpos[1]*uvw[1][i]); |
509 |
+ |
|
510 |
+ |
VCROSS(v1, uvw[2], nv); /* gradient due to rotation */ |
511 |
+ |
for (i = 3; i--; ) |
512 |
+ |
d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]); |
513 |
+ |
|
514 |
+ |
if (d <= 0.0) { |
515 |
+ |
setcolor(cr, 0.0, 0.0, 0.0); |
516 |
+ |
return; |
517 |
+ |
} |
518 |
+ |
copycolor(cr, ap->val); |
519 |
+ |
scalecolor(cr, d); |
520 |
+ |
} |
521 |
+ |
|
522 |
+ |
|
523 |
+ |
static void |
524 |
+ |
avinsert( /* insert ambient value in our tree */ |
525 |
+ |
AMBVAL *av |
526 |
+ |
) |
527 |
+ |
{ |
528 |
+ |
AMBTREE *at; |
529 |
+ |
AMBVAL *ap; |
530 |
+ |
AMBVAL avh; |
531 |
+ |
FVECT ck0; |
532 |
+ |
double s; |
533 |
+ |
int branch; |
534 |
+ |
int i; |
535 |
+ |
|
536 |
+ |
if (av->rad[0] <= FTINY) |
537 |
+ |
error(CONSISTENCY, "zero ambient radius in avinsert"); |
538 |
+ |
at = &atrunk; |
539 |
+ |
VCOPY(ck0, thescene.cuorg); |
540 |
+ |
s = thescene.cusize; |
541 |
+ |
while (s*(OCTSCALE/2) > av->rad[1]*qambacc) { |
542 |
+ |
if (at->kid == NULL) |
543 |
+ |
if ((at->kid = newambtree()) == NULL) |
544 |
+ |
error(SYSTEM, "out of memory in avinsert"); |
545 |
+ |
s *= 0.5; |
546 |
+ |
branch = 0; |
547 |
+ |
for (i = 0; i < 3; i++) |
548 |
+ |
if (av->pos[i] > ck0[i] + s) { |
549 |
+ |
ck0[i] += s; |
550 |
+ |
branch |= 1 << i; |
551 |
+ |
} |
552 |
+ |
at = at->kid + branch; |
553 |
+ |
} |
554 |
+ |
avh.next = at->alist; /* order by increasing level */ |
555 |
+ |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
556 |
+ |
if (ap->next->lvl >= av->lvl) |
557 |
+ |
break; |
558 |
+ |
av->next = ap->next; |
559 |
+ |
ap->next = (AMBVAL*)av; |
560 |
+ |
at->alist = avh.next; |
561 |
+ |
} |
562 |
+ |
|
563 |
+ |
|
564 |
+ |
#else /* ! NEWAMB */ |
565 |
+ |
|
566 |
+ |
static double sumambient(COLOR acol, RAY *r, FVECT rn, int al, |
567 |
+ |
AMBTREE *at, FVECT c0, double s); |
568 |
+ |
static double makeambient(COLOR acol, RAY *r, FVECT rn, int al); |
569 |
+ |
static void extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv); |
570 |
+ |
|
571 |
+ |
|
572 |
+ |
void |
573 |
+ |
multambient( /* compute ambient component & multiply by coef. */ |
574 |
+ |
COLOR aval, |
575 |
+ |
RAY *r, |
576 |
+ |
FVECT nrm |
577 |
+ |
) |
578 |
+ |
{ |
579 |
+ |
static int rdepth = 0; /* ambient recursion */ |
580 |
+ |
COLOR acol; |
581 |
+ |
double d, l; |
582 |
+ |
|
583 |
+ |
if (ambdiv <= 0) /* no ambient calculation */ |
584 |
+ |
goto dumbamb; |
585 |
+ |
/* check number of bounces */ |
586 |
+ |
if (rdepth >= ambounce) |
587 |
+ |
goto dumbamb; |
588 |
+ |
/* check ambient list */ |
589 |
+ |
if (ambincl != -1 && r->ro != NULL && |
590 |
+ |
ambincl != inset(ambset, r->ro->omod)) |
591 |
+ |
goto dumbamb; |
592 |
+ |
|
593 |
+ |
if (ambacc <= FTINY) { /* no ambient storage */ |
594 |
+ |
copycolor(acol, aval); |
595 |
+ |
rdepth++; |
596 |
|
d = doambient(acol, r, r->rweight, NULL, NULL); |
597 |
|
rdepth--; |
598 |
|
if (d <= FTINY) |
599 |
|
goto dumbamb; |
600 |
+ |
copycolor(aval, acol); |
601 |
|
return; |
602 |
|
} |
603 |
|
|
604 |
|
if (tracktime) /* sort to minimize thrashing */ |
605 |
|
sortambvals(0); |
606 |
< |
/* get ambient value */ |
606 |
> |
/* interpolate ambient value */ |
607 |
|
setcolor(acol, 0.0, 0.0, 0.0); |
608 |
|
d = sumambient(acol, r, nrm, rdepth, |
609 |
|
&atrunk, thescene.cuorg, thescene.cusize); |
610 |
|
if (d > FTINY) { |
611 |
< |
scalecolor(acol, 1.0/d); |
611 |
> |
d = 1.0/d; |
612 |
> |
scalecolor(acol, d); |
613 |
> |
multcolor(aval, acol); |
614 |
|
return; |
615 |
|
} |
616 |
|
rdepth++; /* need to cache new value */ |
617 |
|
d = makeambient(acol, r, nrm, rdepth-1); |
618 |
|
rdepth--; |
619 |
< |
if (d > FTINY) |
619 |
> |
if (d > FTINY) { |
620 |
> |
multcolor(aval, acol); /* got new value */ |
621 |
|
return; |
622 |
+ |
} |
623 |
|
dumbamb: /* return global value */ |
624 |
< |
copycolor(acol, ambval); |
625 |
< |
if (ambvwt <= 0 | navsum == 0) |
624 |
> |
if ((ambvwt <= 0) | (navsum == 0)) { |
625 |
> |
multcolor(aval, ambval); |
626 |
|
return; |
627 |
+ |
} |
628 |
|
l = bright(ambval); /* average in computations */ |
629 |
|
if (l > FTINY) { |
630 |
|
d = (log(l)*(double)ambvwt + avsum) / |
631 |
|
(double)(ambvwt + navsum); |
632 |
|
d = exp(d) / l; |
633 |
< |
scalecolor(acol, d); /* apply color of ambval */ |
633 |
> |
scalecolor(aval, d); |
634 |
> |
multcolor(aval, ambval); /* apply color of ambval */ |
635 |
|
} else { |
636 |
|
d = exp( avsum / (double)navsum ); |
637 |
< |
setcolor(acol, d, d, d); /* neutral color */ |
637 |
> |
scalecolor(aval, d); /* neutral color */ |
638 |
|
} |
639 |
|
} |
640 |
|
|
641 |
|
|
642 |
< |
double |
643 |
< |
sumambient(acol, r, rn, al, at, c0, s) /* get interpolated ambient value */ |
644 |
< |
COLOR acol; |
645 |
< |
register RAY *r; |
646 |
< |
FVECT rn; |
647 |
< |
int al; |
648 |
< |
AMBTREE *at; |
649 |
< |
FVECT c0; |
650 |
< |
double s; |
642 |
> |
static double |
643 |
> |
sumambient( /* get interpolated ambient value */ |
644 |
> |
COLOR acol, |
645 |
> |
RAY *r, |
646 |
> |
FVECT rn, |
647 |
> |
int al, |
648 |
> |
AMBTREE *at, |
649 |
> |
FVECT c0, |
650 |
> |
double s |
651 |
> |
) |
652 |
|
{ |
653 |
|
double d, e1, e2, wt, wsum; |
654 |
|
COLOR ct; |
655 |
|
FVECT ck0; |
656 |
|
int i; |
657 |
< |
register int j; |
658 |
< |
register AMBVAL *av; |
657 |
> |
int j; |
658 |
> |
AMBVAL *av; |
659 |
|
|
660 |
|
wsum = 0.0; |
661 |
|
/* do this node */ |
668 |
|
*/ |
669 |
|
if (av->lvl > al) /* list sorted, so this works */ |
670 |
|
break; |
671 |
< |
if (av->weight < r->rweight-FTINY) |
671 |
> |
if (av->weight < 0.9*r->rweight) |
672 |
|
continue; |
673 |
|
/* |
674 |
|
* Ambient radius test. |
675 |
|
*/ |
676 |
< |
d = av->pos[0] - r->rop[0]; |
677 |
< |
e1 = d * d; |
333 |
< |
d = av->pos[1] - r->rop[1]; |
334 |
< |
e1 += d * d; |
335 |
< |
d = av->pos[2] - r->rop[2]; |
336 |
< |
e1 += d * d; |
337 |
< |
e1 /= av->rad * av->rad; |
676 |
> |
VSUB(ck0, av->pos, r->rop); |
677 |
> |
e1 = DOT(ck0, ck0) / (av->rad * av->rad); |
678 |
|
if (e1 > ambacc*ambacc*1.21) |
679 |
|
continue; |
680 |
|
/* |
691 |
|
} |
692 |
|
} |
693 |
|
e2 = (1.0 - d) * r->rweight; |
694 |
< |
if (e2 < 0.0) e2 = 0.0; |
695 |
< |
if (e1 + e2 > ambacc*ambacc*1.21) |
694 |
> |
if (e2 < 0.0) |
695 |
> |
e2 = 0.0; |
696 |
> |
else if (e1 + e2 > ambacc*ambacc*1.21) |
697 |
|
continue; |
698 |
|
/* |
699 |
|
* Ray behind test. |
743 |
|
break; |
744 |
|
} |
745 |
|
if (j == 3) |
746 |
< |
wsum += sumambient(acol, r, rn, al, at->kid+i, ck0, s); |
746 |
> |
wsum += sumambient(acol, r, rn, al, |
747 |
> |
at->kid+i, ck0, s); |
748 |
|
} |
749 |
|
return(wsum); |
750 |
|
} |
751 |
|
|
752 |
|
|
753 |
< |
double |
754 |
< |
makeambient(acol, r, rn, al) /* make a new ambient value */ |
755 |
< |
COLOR acol; |
756 |
< |
register RAY *r; |
757 |
< |
FVECT rn; |
758 |
< |
int al; |
753 |
> |
static double |
754 |
> |
makeambient( /* make a new ambient value for storage */ |
755 |
> |
COLOR acol, |
756 |
> |
RAY *r, |
757 |
> |
FVECT rn, |
758 |
> |
int al |
759 |
> |
) |
760 |
|
{ |
761 |
|
AMBVAL amb; |
762 |
|
FVECT gp, gd; |
763 |
< |
/* compute weight */ |
764 |
< |
amb.weight = pow(AVGREFL, (double)al); |
765 |
< |
if (r->rweight < 0.1*amb.weight) /* heuristic */ |
766 |
< |
amb.weight = r->rweight; |
763 |
> |
int i; |
764 |
> |
|
765 |
> |
amb.weight = 1.0; /* compute weight */ |
766 |
> |
for (i = al; i-- > 0; ) |
767 |
> |
amb.weight *= AVGREFL; |
768 |
> |
if (r->rweight < 0.1*amb.weight) /* heuristic override */ |
769 |
> |
amb.weight = 1.25*r->rweight; |
770 |
> |
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
771 |
|
/* compute ambient */ |
772 |
|
amb.rad = doambient(acol, r, amb.weight, gp, gd); |
773 |
< |
if (amb.rad <= FTINY) |
773 |
> |
if (amb.rad <= FTINY) { |
774 |
> |
setcolor(acol, 0.0, 0.0, 0.0); |
775 |
|
return(0.0); |
776 |
< |
/* store it */ |
776 |
> |
} |
777 |
> |
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
778 |
> |
/* store value */ |
779 |
|
VCOPY(amb.pos, r->rop); |
780 |
|
VCOPY(amb.dir, r->ron); |
781 |
|
amb.lvl = al; |
790 |
|
} |
791 |
|
|
792 |
|
|
793 |
< |
void |
794 |
< |
extambient(cr, ap, pv, nv) /* extrapolate value at pv, nv */ |
795 |
< |
COLOR cr; |
796 |
< |
register AMBVAL *ap; |
797 |
< |
FVECT pv, nv; |
793 |
> |
static void |
794 |
> |
extambient( /* extrapolate value at pv, nv */ |
795 |
> |
COLOR cr, |
796 |
> |
AMBVAL *ap, |
797 |
> |
FVECT pv, |
798 |
> |
FVECT nv |
799 |
> |
) |
800 |
|
{ |
801 |
|
FVECT v1; |
802 |
< |
register int i; |
802 |
> |
int i; |
803 |
|
double d; |
804 |
|
|
805 |
|
d = 1.0; /* zeroeth order */ |
819 |
|
|
820 |
|
|
821 |
|
static void |
822 |
< |
initambfile(creat) /* initialize ambient file */ |
823 |
< |
int creat; |
822 |
> |
avinsert( /* insert ambient value in our tree */ |
823 |
> |
AMBVAL *av |
824 |
> |
) |
825 |
|
{ |
826 |
+ |
AMBTREE *at; |
827 |
+ |
AMBVAL *ap; |
828 |
+ |
AMBVAL avh; |
829 |
+ |
FVECT ck0; |
830 |
+ |
double s; |
831 |
+ |
int branch; |
832 |
+ |
int i; |
833 |
+ |
|
834 |
+ |
if (av->rad <= FTINY) |
835 |
+ |
error(CONSISTENCY, "zero ambient radius in avinsert"); |
836 |
+ |
at = &atrunk; |
837 |
+ |
VCOPY(ck0, thescene.cuorg); |
838 |
+ |
s = thescene.cusize; |
839 |
+ |
while (s*(OCTSCALE/2) > av->rad*ambacc) { |
840 |
+ |
if (at->kid == NULL) |
841 |
+ |
if ((at->kid = newambtree()) == NULL) |
842 |
+ |
error(SYSTEM, "out of memory in avinsert"); |
843 |
+ |
s *= 0.5; |
844 |
+ |
branch = 0; |
845 |
+ |
for (i = 0; i < 3; i++) |
846 |
+ |
if (av->pos[i] > ck0[i] + s) { |
847 |
+ |
ck0[i] += s; |
848 |
+ |
branch |= 1 << i; |
849 |
+ |
} |
850 |
+ |
at = at->kid + branch; |
851 |
+ |
} |
852 |
+ |
avh.next = at->alist; /* order by increasing level */ |
853 |
+ |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
854 |
+ |
if (ap->next->lvl >= av->lvl) |
855 |
+ |
break; |
856 |
+ |
av->next = ap->next; |
857 |
+ |
ap->next = (AMBVAL*)av; |
858 |
+ |
at->alist = avh.next; |
859 |
+ |
} |
860 |
+ |
|
861 |
+ |
#endif /* ! NEWAMB */ |
862 |
+ |
|
863 |
+ |
/************* FOLLOWING ROUTINES SAME FOR NEW & OLD METHODS ***************/ |
864 |
+ |
|
865 |
+ |
static void |
866 |
+ |
initambfile( /* initialize ambient file */ |
867 |
+ |
int cre8 |
868 |
+ |
) |
869 |
+ |
{ |
870 |
|
extern char *progname, *octname; |
871 |
|
static char *mybuf = NULL; |
872 |
|
|
873 |
|
#ifdef F_SETLKW |
874 |
< |
aflock(creat ? F_WRLCK : F_RDLCK); |
874 |
> |
aflock(cre8 ? F_WRLCK : F_RDLCK); |
875 |
|
#endif |
876 |
|
SET_FILE_BINARY(ambfp); |
877 |
|
if (mybuf == NULL) |
878 |
|
mybuf = (char *)bmalloc(BUFSIZ+8); |
879 |
|
setbuf(ambfp, mybuf); |
880 |
< |
if (creat) { /* new file */ |
880 |
> |
if (cre8) { /* new file */ |
881 |
|
newheader("RADIANCE", ambfp); |
882 |
|
fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ", |
883 |
|
progname, colval(ambval,RED), |
886 |
|
fprintf(ambfp, "-ad %d -as %d -ar %d ", |
887 |
|
ambdiv, ambssamp, ambres); |
888 |
|
if (octname != NULL) |
889 |
< |
printargs(1, &octname, ambfp); |
890 |
< |
else |
494 |
< |
fputc('\n', ambfp); |
889 |
> |
fputs(octname, ambfp); |
890 |
> |
fputc('\n', ambfp); |
891 |
|
fprintf(ambfp, "SOFTWARE= %s\n", VersionID); |
892 |
|
fputnow(ambfp); |
893 |
|
fputformat(AMBFMT, ambfp); |
894 |
< |
putc('\n', ambfp); |
894 |
> |
fputc('\n', ambfp); |
895 |
|
putambmagic(ambfp); |
896 |
|
} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp)) |
897 |
|
error(USER, "bad ambient file"); |
899 |
|
|
900 |
|
|
901 |
|
static void |
902 |
< |
avsave(av) /* insert and save an ambient value */ |
903 |
< |
AMBVAL *av; |
902 |
> |
avsave( /* insert and save an ambient value */ |
903 |
> |
AMBVAL *av |
904 |
> |
) |
905 |
|
{ |
906 |
|
avinsert(avstore(av)); |
907 |
|
if (ambfp == NULL) |
918 |
|
|
919 |
|
|
920 |
|
static AMBVAL * |
921 |
< |
avstore(aval) /* allocate memory and store aval */ |
922 |
< |
register AMBVAL *aval; |
921 |
> |
avstore( /* allocate memory and store aval */ |
922 |
> |
AMBVAL *aval |
923 |
> |
) |
924 |
|
{ |
925 |
< |
register AMBVAL *av; |
925 |
> |
AMBVAL *av; |
926 |
|
double d; |
927 |
|
|
928 |
|
if ((av = newambval()) == NULL) |
946 |
|
|
947 |
|
|
948 |
|
static AMBTREE * |
949 |
< |
newambtree() /* allocate 8 ambient tree structs */ |
949 |
> |
newambtree(void) /* allocate 8 ambient tree structs */ |
950 |
|
{ |
951 |
< |
register AMBTREE *atp, *upperlim; |
951 |
> |
AMBTREE *atp, *upperlim; |
952 |
|
|
953 |
|
if (atfreelist == NULL) { /* get more nodes */ |
954 |
|
atfreelist = (AMBTREE *)malloc(ATALLOCSZ*8*sizeof(AMBTREE)); |
968 |
|
|
969 |
|
|
970 |
|
static void |
971 |
< |
freeambtree(atp) /* free 8 ambient tree structs */ |
972 |
< |
AMBTREE *atp; |
971 |
> |
freeambtree( /* free 8 ambient tree structs */ |
972 |
> |
AMBTREE *atp |
973 |
> |
) |
974 |
|
{ |
975 |
|
atp->kid = atfreelist; |
976 |
|
atfreelist = atp; |
978 |
|
|
979 |
|
|
980 |
|
static void |
981 |
< |
avinsert(av) /* insert ambient value in our tree */ |
982 |
< |
register AMBVAL *av; |
981 |
> |
unloadatree( /* unload an ambient value tree */ |
982 |
> |
AMBTREE *at, |
983 |
> |
unloadtf_t *f |
984 |
> |
) |
985 |
|
{ |
986 |
< |
register AMBTREE *at; |
987 |
< |
register AMBVAL *ap; |
587 |
< |
AMBVAL avh; |
588 |
< |
FVECT ck0; |
589 |
< |
double s; |
590 |
< |
int branch; |
591 |
< |
register int i; |
592 |
< |
|
593 |
< |
if (av->rad <= FTINY) |
594 |
< |
error(CONSISTENCY, "zero ambient radius in avinsert"); |
595 |
< |
at = &atrunk; |
596 |
< |
VCOPY(ck0, thescene.cuorg); |
597 |
< |
s = thescene.cusize; |
598 |
< |
while (s*(OCTSCALE/2) > av->rad*ambacc) { |
599 |
< |
if (at->kid == NULL) |
600 |
< |
if ((at->kid = newambtree()) == NULL) |
601 |
< |
error(SYSTEM, "out of memory in avinsert"); |
602 |
< |
s *= 0.5; |
603 |
< |
branch = 0; |
604 |
< |
for (i = 0; i < 3; i++) |
605 |
< |
if (av->pos[i] > ck0[i] + s) { |
606 |
< |
ck0[i] += s; |
607 |
< |
branch |= 1 << i; |
608 |
< |
} |
609 |
< |
at = at->kid + branch; |
610 |
< |
} |
611 |
< |
avh.next = at->alist; /* order by increasing level */ |
612 |
< |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
613 |
< |
if (ap->next->lvl >= av->lvl) |
614 |
< |
break; |
615 |
< |
av->next = ap->next; |
616 |
< |
ap->next = av; |
617 |
< |
at->alist = avh.next; |
618 |
< |
} |
619 |
< |
|
620 |
< |
|
621 |
< |
static void |
622 |
< |
unloadatree(at, f) /* unload an ambient value tree */ |
623 |
< |
register AMBTREE *at; |
624 |
< |
void (*f)(); |
625 |
< |
{ |
626 |
< |
register AMBVAL *av; |
627 |
< |
register int i; |
986 |
> |
AMBVAL *av; |
987 |
> |
int i; |
988 |
|
/* transfer values at this node */ |
989 |
|
for (av = at->alist; av != NULL; av = at->alist) { |
990 |
|
at->alist = av->next; |
1006 |
|
static AMBVAL **avlist2; /* memory positions for sorting */ |
1007 |
|
static int i_avlist; /* index for lists */ |
1008 |
|
|
1009 |
+ |
static int alatcmp(const void *av1, const void *av2); |
1010 |
|
|
1011 |
< |
static int |
1012 |
< |
av2list(av) |
652 |
< |
register AMBVAL *av; |
1011 |
> |
static void |
1012 |
> |
avfree(AMBVAL *av) |
1013 |
|
{ |
1014 |
+ |
free(av); |
1015 |
+ |
} |
1016 |
+ |
|
1017 |
+ |
static void |
1018 |
+ |
av2list( |
1019 |
+ |
AMBVAL *av |
1020 |
+ |
) |
1021 |
+ |
{ |
1022 |
|
#ifdef DEBUG |
1023 |
|
if (i_avlist >= nambvals) |
1024 |
|
error(CONSISTENCY, "too many ambient values in av2list1"); |
1025 |
|
#endif |
1026 |
< |
avlist1[i_avlist].p = avlist2[i_avlist] = av; |
1026 |
> |
avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av; |
1027 |
|
avlist1[i_avlist++].t = av->latick; |
1028 |
|
} |
1029 |
|
|
1030 |
|
|
1031 |
|
static int |
1032 |
< |
alatcmp(av1, av2) /* compare ambient values for MRA */ |
1033 |
< |
struct avl *av1, *av2; |
1032 |
> |
alatcmp( /* compare ambient values for MRA */ |
1033 |
> |
const void *av1, |
1034 |
> |
const void *av2 |
1035 |
> |
) |
1036 |
|
{ |
1037 |
< |
register long lc = av2->t - av1->t; |
1037 |
> |
long lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t; |
1038 |
|
return(lc<0 ? -1 : lc>0 ? 1 : 0); |
1039 |
|
} |
1040 |
|
|
1046 |
|
* assumes pointers differ by exact struct size increments. |
1047 |
|
*/ |
1048 |
|
static int |
1049 |
< |
aposcmp(avp1, avp2) /* compare ambient value positions */ |
1050 |
< |
const void *avp1, *avp2; |
1049 |
> |
aposcmp( /* compare ambient value positions */ |
1050 |
> |
const void *avp1, |
1051 |
> |
const void *avp2 |
1052 |
> |
) |
1053 |
|
{ |
1054 |
< |
register long diff = *(char * const *)avp1 - *(char * const *)avp2; |
1054 |
> |
long diff = *(char * const *)avp1 - *(char * const *)avp2; |
1055 |
|
if (diff < 0) |
1056 |
|
return(-1); |
1057 |
|
return(diff > 0); |
1058 |
|
} |
1059 |
|
|
1060 |
< |
#if 1 |
1060 |
> |
|
1061 |
|
static int |
1062 |
< |
avlmemi(avaddr) /* find list position from address */ |
1063 |
< |
AMBVAL *avaddr; |
1062 |
> |
avlmemi( /* find list position from address */ |
1063 |
> |
AMBVAL *avaddr |
1064 |
> |
) |
1065 |
|
{ |
1066 |
< |
register AMBVAL **avlpp; |
1066 |
> |
AMBVAL **avlpp; |
1067 |
|
|
1068 |
|
avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2, |
1069 |
< |
nambvals, sizeof(AMBVAL *), aposcmp); |
1069 |
> |
nambvals, sizeof(AMBVAL *), &aposcmp); |
1070 |
|
if (avlpp == NULL) |
1071 |
|
error(CONSISTENCY, "address not found in avlmemi"); |
1072 |
|
return(avlpp - avlist2); |
1073 |
|
} |
701 |
– |
#else |
702 |
– |
#define avlmemi(avaddr) ((AMBVAL **)bsearch((char *)&avaddr,(char *)avlist2, \ |
703 |
– |
nambvals,sizeof(AMBVAL *),aposcmp) - avlist2) |
704 |
– |
#endif |
1074 |
|
|
1075 |
|
|
1076 |
|
static void |
1077 |
< |
sortambvals(always) /* resort ambient values */ |
1078 |
< |
int always; |
1077 |
> |
sortambvals( /* resort ambient values */ |
1078 |
> |
int always |
1079 |
> |
) |
1080 |
|
{ |
1081 |
|
AMBTREE oldatrunk; |
1082 |
|
AMBVAL tav, *tap, *pnext; |
1083 |
< |
register int i, j; |
1083 |
> |
int i, j; |
1084 |
|
/* see if it's time yet */ |
1085 |
|
if (!always && (ambclock++ < lastsort+sortintvl || |
1086 |
|
nambvals < SORT_THRESH)) |
1114 |
|
oldatrunk = atrunk; |
1115 |
|
atrunk.alist = NULL; |
1116 |
|
atrunk.kid = NULL; |
1117 |
< |
unloadatree(&oldatrunk, avinsert); |
1117 |
> |
unloadatree(&oldatrunk, &avinsert); |
1118 |
|
} |
1119 |
|
} else { /* sort memory by last access time */ |
1120 |
|
/* |
1131 |
|
eputs(errmsg); |
1132 |
|
#endif |
1133 |
|
i_avlist = 0; |
1134 |
< |
unloadatree(&atrunk, av2list); /* empty current tree */ |
1134 |
> |
unloadatree(&atrunk, &av2list); /* empty current tree */ |
1135 |
|
#ifdef DEBUG |
1136 |
|
if (i_avlist < nambvals) |
1137 |
|
error(CONSISTENCY, "missing ambient values in sortambvals"); |
1138 |
|
#endif |
1139 |
< |
qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp); |
1140 |
< |
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp); |
1139 |
> |
qsort((char *)avlist1, nambvals, sizeof(struct avl), &alatcmp); |
1140 |
> |
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), &aposcmp); |
1141 |
|
for (i = 0; i < nambvals; i++) { |
1142 |
|
if (avlist1[i].p == NULL) |
1143 |
|
continue; |
1174 |
|
#ifdef F_SETLKW |
1175 |
|
|
1176 |
|
static void |
1177 |
< |
aflock(typ) /* lock/unlock ambient file */ |
1178 |
< |
int typ; |
1177 |
> |
aflock( /* lock/unlock ambient file */ |
1178 |
> |
int typ |
1179 |
> |
) |
1180 |
|
{ |
1181 |
|
static struct flock fls; /* static so initialized to zeroes */ |
1182 |
|
|
1183 |
+ |
if (typ == fls.l_type) /* already called? */ |
1184 |
+ |
return; |
1185 |
|
fls.l_type = typ; |
1186 |
|
if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0) |
1187 |
|
error(SYSTEM, "cannot (un)lock ambient file"); |
1189 |
|
|
1190 |
|
|
1191 |
|
int |
1192 |
< |
ambsync() /* synchronize ambient file */ |
1192 |
> |
ambsync(void) /* synchronize ambient file */ |
1193 |
|
{ |
1194 |
|
long flen; |
1195 |
|
AMBVAL avs; |
1196 |
< |
register int n; |
1196 |
> |
int n; |
1197 |
|
|
1198 |
< |
if (nunflshed == 0) |
1198 |
> |
if (ambfp == NULL) /* no ambient file? */ |
1199 |
|
return(0); |
1200 |
< |
if (lastpos < 0) /* initializing (locked in initambfile) */ |
1201 |
< |
goto syncend; |
829 |
< |
/* gain exclusive access */ |
830 |
< |
aflock(F_WRLCK); |
1200 |
> |
/* gain appropriate access */ |
1201 |
> |
aflock(nunflshed ? F_WRLCK : F_RDLCK); |
1202 |
|
/* see if file has grown */ |
1203 |
< |
if ((flen = lseek(fileno(ambfp), (off_t)0L, 2)) < 0) |
1203 |
> |
if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0) |
1204 |
|
goto seekerr; |
1205 |
< |
if (n = flen - lastpos) { /* file has grown */ |
1205 |
> |
if ((n = flen - lastpos) > 0) { /* file has grown */ |
1206 |
|
if (ambinp == NULL) { /* use duplicate filedes */ |
1207 |
|
ambinp = fdopen(dup(fileno(ambfp)), "r"); |
1208 |
|
if (ambinp == NULL) |
1209 |
|
error(SYSTEM, "fdopen failed in ambsync"); |
1210 |
|
} |
1211 |
< |
if (fseek(ambinp, lastpos, 0) < 0) |
1211 |
> |
if (fseek(ambinp, lastpos, SEEK_SET) < 0) |
1212 |
|
goto seekerr; |
1213 |
|
while (n >= AMBVALSIZ) { /* load contributed values */ |
1214 |
|
if (!readambval(&avs, ambinp)) { |
1221 |
|
avinsert(avstore(&avs)); |
1222 |
|
n -= AMBVALSIZ; |
1223 |
|
} |
1224 |
+ |
lastpos = flen - n; |
1225 |
|
/*** seek always as safety measure |
1226 |
|
if (n) ***/ /* alignment */ |
1227 |
< |
if (lseek(fileno(ambfp), (off_t)(flen-n), 0) < 0) |
1227 |
> |
if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) |
1228 |
|
goto seekerr; |
1229 |
|
} |
858 |
– |
#ifdef DEBUG |
859 |
– |
if (ambfp->_ptr - ambfp->_base != nunflshed*AMBVALSIZ) { |
860 |
– |
sprintf(errmsg, "ambient file buffer at %d rather than %d", |
861 |
– |
ambfp->_ptr - ambfp->_base, |
862 |
– |
nunflshed*AMBVALSIZ); |
863 |
– |
error(CONSISTENCY, errmsg); |
864 |
– |
} |
865 |
– |
#endif |
866 |
– |
syncend: |
1230 |
|
n = fflush(ambfp); /* calls write() at last */ |
1231 |
< |
if ((lastpos = lseek(fileno(ambfp), (off_t)0L, 1)) < 0) |
1231 |
> |
if (n != EOF) |
1232 |
> |
lastpos += (long)nunflshed*AMBVALSIZ; |
1233 |
> |
else if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0) |
1234 |
|
goto seekerr; |
1235 |
+ |
|
1236 |
|
aflock(F_UNLCK); /* release file */ |
1237 |
|
nunflshed = 0; |
1238 |
|
return(n); |
1239 |
|
seekerr: |
1240 |
|
error(SYSTEM, "seek failed in ambsync"); |
1241 |
+ |
return -1; /* pro forma return */ |
1242 |
|
} |
1243 |
|
|
1244 |
< |
#else |
1244 |
> |
#else /* ! F_SETLKW */ |
1245 |
|
|
1246 |
|
int |
1247 |
< |
ambsync() /* flush ambient file */ |
1247 |
> |
ambsync(void) /* flush ambient file */ |
1248 |
|
{ |
1249 |
< |
if (nunflshed == 0) |
1249 |
> |
if (ambfp == NULL) |
1250 |
|
return(0); |
1251 |
|
nunflshed = 0; |
1252 |
|
return(fflush(ambfp)); |
1253 |
|
} |
1254 |
|
|
1255 |
< |
#endif |
1255 |
> |
#endif /* ! F_SETLKW */ |