50 |
|
#endif |
51 |
|
#endif |
52 |
|
#ifndef SORT_INTVL |
53 |
< |
#define SORT_INTVL (SORT_THRESH*256) |
53 |
> |
#define SORT_INTVL (SORT_THRESH<<1) |
54 |
|
#endif |
55 |
|
#ifndef MAX_SORT_INTVL |
56 |
< |
#define MAX_SORT_INTVL (SORT_INTVL<<4) |
56 |
> |
#define MAX_SORT_INTVL (SORT_INTVL<<6) |
57 |
|
#endif |
58 |
|
|
59 |
< |
static COLOR avsum = BLKCOLOR; /* computed ambient value sum */ |
59 |
> |
static double avsum = 0.; /* computed ambient value sum (log) */ |
60 |
> |
static unsigned int navsum = 0; /* number of values in avsum */ |
61 |
|
static unsigned int nambvals = 0; /* total number of indirect values */ |
62 |
|
static unsigned int nambshare = 0; /* number of values from file */ |
63 |
|
static unsigned long ambclock = 0; /* ambient access clock */ |
70 |
|
* through memory on a multiprocessor, when we want to avoid |
71 |
|
* claiming our own memory (copy on write). Go ahead anyway |
72 |
|
* if more than two thirds of our values are unshared. |
73 |
+ |
* Compile with -Dtracktime=0 to turn this code off. |
74 |
|
*/ |
75 |
+ |
#ifndef tracktime |
76 |
|
#define tracktime (shm_boundary == NULL || nambvals > 3*nambshare) |
77 |
+ |
#endif |
78 |
|
|
79 |
|
#define AMBFLUSH (BUFSIZ/AMBVALSIZ) |
80 |
|
|
81 |
|
#define newambval() (AMBVAL *)bmalloc(sizeof(AMBVAL)) |
82 |
|
|
83 |
|
extern long ftell(), lseek(); |
84 |
< |
static int initambfile(), avsave(), avinsert(), sortambvals(); |
84 |
> |
static int initambfile(), avsave(), avinsert(), sortambvals(), avlmemi(); |
85 |
|
static AMBVAL *avstore(); |
86 |
|
#ifdef F_SETLKW |
87 |
|
static aflock(); |
148 |
|
pos += (long)nambvals*AMBVALSIZ; |
149 |
|
flen = lseek(fileno(ambfp), 0L, 2); |
150 |
|
if (flen != pos) { |
151 |
< |
error(WARNING, |
151 |
> |
sprintf(errmsg, |
152 |
|
"ignoring last %ld values in ambient file (corrupted)", |
153 |
|
(flen - pos)/AMBVALSIZ); |
154 |
+ |
error(WARNING, errmsg); |
155 |
|
fseek(ambfp, pos, 0); |
156 |
|
ftruncate(fileno(ambfp), pos); |
157 |
|
} |
195 |
|
FVECT nrm; |
196 |
|
{ |
197 |
|
static int rdepth = 0; /* ambient recursion */ |
198 |
< |
double d; |
198 |
> |
double d, l; |
199 |
|
|
200 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
201 |
|
goto dumbamb; |
215 |
|
goto dumbamb; |
216 |
|
return; |
217 |
|
} |
218 |
< |
/* resort memory? */ |
219 |
< |
sortambvals(0); |
218 |
> |
|
219 |
> |
if (tracktime) /* sort to minimize thrashing */ |
220 |
> |
sortambvals(0); |
221 |
|
/* get ambient value */ |
222 |
|
setcolor(acol, 0.0, 0.0, 0.0); |
223 |
|
d = sumambient(acol, r, nrm, rdepth, |
233 |
|
return; |
234 |
|
dumbamb: /* return global value */ |
235 |
|
copycolor(acol, ambval); |
236 |
< |
if (ambvwt <= 0 | nambvals == 0) |
236 |
> |
if (ambvwt <= 0 | navsum == 0) |
237 |
|
return; |
238 |
< |
scalecolor(acol, (double)ambvwt); |
239 |
< |
addcolor(acol, avsum); /* average in computations */ |
240 |
< |
d = 1.0/(ambvwt+nambvals); |
241 |
< |
scalecolor(acol, d); |
238 |
> |
l = bright(ambval); /* average in computations */ |
239 |
> |
if (l > FTINY) { |
240 |
> |
d = (log(l)*(double)ambvwt + avsum) / |
241 |
> |
(double)(ambvwt + navsum); |
242 |
> |
d = exp(d) / l; |
243 |
> |
scalecolor(acol, d); /* apply color of ambval */ |
244 |
> |
} else { |
245 |
> |
d = exp( avsum / (double)navsum ); |
246 |
> |
setcolor(acol, d, d, d); /* neutral color */ |
247 |
> |
} |
248 |
|
} |
249 |
|
|
250 |
|
|
269 |
|
/* do this node */ |
270 |
|
for (av = at->alist; av != NULL; av = av->next) { |
271 |
|
if (tracktime) |
272 |
< |
av->latick = ambclock++; |
272 |
> |
av->latick = ambclock; |
273 |
|
/* |
274 |
|
* Ambient level test. |
275 |
|
*/ |
414 |
|
setbuf(ambfp, bmalloc(BUFSIZ+8)); |
415 |
|
if (creat) { /* new file */ |
416 |
|
newheader("RADIANCE", ambfp); |
417 |
< |
fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ", |
417 |
> |
fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ", |
418 |
|
progname, colval(ambval,RED), |
419 |
|
colval(ambval,GRN), colval(ambval,BLU), |
420 |
< |
ambounce, ambacc); |
420 |
> |
ambvwt, ambounce, ambacc); |
421 |
|
fprintf(ambfp, "-ad %d -as %d -ar %d %s\n", |
422 |
|
ambdiv, ambssamp, ambres, |
423 |
|
octname==NULL ? "" : octname); |
453 |
|
register AMBVAL *aval; |
454 |
|
{ |
455 |
|
register AMBVAL *av; |
456 |
+ |
double d; |
457 |
|
|
458 |
|
if ((av = newambval()) == NULL) |
459 |
|
error(SYSTEM, "out of memory in avstore"); |
460 |
|
copystruct(av, aval); |
461 |
|
av->latick = ambclock; |
462 |
|
av->next = NULL; |
450 |
– |
addcolor(avsum, av->val); /* add to sum for averaging */ |
463 |
|
nambvals++; |
464 |
+ |
d = bright(av->val); |
465 |
+ |
if (d > FTINY) { /* add to log sum for averaging */ |
466 |
+ |
avsum += log(d); |
467 |
+ |
navsum++; |
468 |
+ |
} |
469 |
|
return(av); |
470 |
|
} |
471 |
|
|
568 |
|
} |
569 |
|
|
570 |
|
|
571 |
< |
static AMBVAL **avlist1, **avlist2; /* ambient value lists for sorting */ |
571 |
> |
static struct avl { |
572 |
> |
AMBVAL *p; |
573 |
> |
unsigned long t; |
574 |
> |
} *avlist1; /* ambient value list with ticks */ |
575 |
> |
static AMBVAL **avlist2; /* memory positions for sorting */ |
576 |
|
static int i_avlist; /* index for lists */ |
577 |
|
|
578 |
|
|
579 |
|
static |
580 |
|
av2list(av) |
581 |
< |
AMBVAL *av; |
581 |
> |
register AMBVAL *av; |
582 |
|
{ |
583 |
|
#ifdef DEBUG |
584 |
|
if (i_avlist >= nambvals) |
585 |
|
error(CONSISTENCY, "too many ambient values in av2list1"); |
586 |
|
#endif |
587 |
< |
avlist1[i_avlist] = avlist2[i_avlist] = av; |
588 |
< |
i_avlist++; |
587 |
> |
avlist1[i_avlist].p = avlist2[i_avlist] = av; |
588 |
> |
avlist1[i_avlist++].t = av->latick; |
589 |
|
} |
590 |
|
|
591 |
|
|
592 |
|
static int |
593 |
< |
alatcmp(avp1, avp2) /* compare ambient values for MRA */ |
594 |
< |
AMBVAL **avp1, **avp2; |
593 |
> |
alatcmp(av1, av2) /* compare ambient values for MRA */ |
594 |
> |
struct avl *av1, *av2; |
595 |
|
{ |
596 |
< |
register long lc = (**avp2).latick - (**avp1).latick; |
596 |
> |
register long lc = av2->t - av1->t; |
597 |
|
return(lc<0 ? -1 : lc>0 ? 1 : 0); |
598 |
|
} |
599 |
|
|
606 |
|
} |
607 |
|
|
608 |
|
|
609 |
< |
#if 1 |
609 |
> |
#if 1 |
610 |
|
static int |
611 |
|
avlmemi(avaddr) /* find list position from address */ |
612 |
|
AMBVAL *avaddr; |
633 |
|
AMBVAL tav, *tap, *pnext; |
634 |
|
register int i, j; |
635 |
|
/* see if it's time yet */ |
636 |
< |
if (!always && (ambclock < lastsort+sortintvl || |
636 |
> |
if (!always && (ambclock++ < lastsort+sortintvl || |
637 |
|
nambvals < SORT_THRESH)) |
638 |
|
return; |
639 |
|
/* |
652 |
|
* tree will be rebuilt with the new accuracy parameter. |
653 |
|
*/ |
654 |
|
if (tracktime) { /* allocate pointer arrays to sort */ |
634 |
– |
avlist1 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); |
655 |
|
avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); |
656 |
< |
} else |
657 |
< |
avlist1 = avlist2 = NULL; |
658 |
< |
if (avlist2 == NULL) { /* no time tracking -- rebuild tree? */ |
659 |
< |
if (avlist1 != NULL) |
660 |
< |
free((char *)avlist1); |
656 |
> |
avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl)); |
657 |
> |
} else { |
658 |
> |
avlist2 = NULL; |
659 |
> |
avlist1 = NULL; |
660 |
> |
} |
661 |
> |
if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */ |
662 |
> |
if (avlist2 != NULL) |
663 |
> |
free((char *)avlist2); |
664 |
|
if (always) { /* rebuild without sorting */ |
665 |
|
copystruct(&oldatrunk, &atrunk); |
666 |
|
atrunk.alist = NULL; |
687 |
|
if (i_avlist < nambvals) |
688 |
|
error(CONSISTENCY, "missing ambient values in sortambvals"); |
689 |
|
#endif |
690 |
< |
qsort((char *)avlist1, nambvals, sizeof(AMBVAL *), alatcmp); |
690 |
> |
qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp); |
691 |
|
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp); |
692 |
|
for (i = 0; i < nambvals; i++) { |
693 |
< |
if (avlist1[i] == NULL) |
693 |
> |
if (avlist1[i].p == NULL) |
694 |
|
continue; |
695 |
|
tap = avlist2[i]; |
696 |
|
copystruct(&tav, tap); |
697 |
< |
for (j = i; (pnext = avlist1[j]) != tap; |
697 |
> |
for (j = i; (pnext = avlist1[j].p) != tap; |
698 |
|
j = avlmemi(pnext)) { |
699 |
|
copystruct(avlist2[j], pnext); |
700 |
|
avinsert(avlist2[j]); |
701 |
< |
avlist1[j] = NULL; |
701 |
> |
avlist1[j].p = NULL; |
702 |
|
} |
703 |
|
copystruct(avlist2[j], &tav); |
704 |
|
avinsert(avlist2[j]); |
705 |
< |
avlist1[j] = NULL; |
705 |
> |
avlist1[j].p = NULL; |
706 |
|
} |
707 |
|
free((char *)avlist1); |
708 |
|
free((char *)avlist2); |