80 |
|
} |
81 |
|
free((char *)spanbr); |
82 |
|
close_allsrcs(); |
83 |
– |
absorb_specks(); |
83 |
|
} |
84 |
|
|
85 |
|
|
131 |
|
|
132 |
|
comp_thresh() /* compute glare threshold */ |
133 |
|
{ |
134 |
+ |
SPANERR sperr; |
135 |
|
int h, v; |
136 |
|
int nsamps; |
137 |
|
double brsum, br; |
141 |
|
progname); |
142 |
|
brsum = 0.0; |
143 |
|
nsamps = 0; |
144 |
< |
for (v = vsize; v >= -vsize; v -= TSAMPSTEP) |
144 |
> |
for (v = vsize; v >= -vsize; v -= TSAMPSTEP) { |
145 |
> |
setspanerr(&sperr, v); |
146 |
|
for (h = -hsize; h <= hsize; h += TSAMPSTEP) { |
147 |
< |
if ((br = getviewpix(h, v)) < 0.0) |
147 |
> |
if ((br = getviewpix(h, v, &sperr)) < 0.0) |
148 |
|
continue; |
149 |
|
brsum += br; |
150 |
|
nsamps++; |
151 |
|
} |
152 |
+ |
} |
153 |
|
if (nsamps == 0) { |
154 |
|
fprintf(stderr, "%s: no viewable scene!\n", progname); |
155 |
|
exit(1); |
290 |
|
for (ss = sp->first; ss != NULL; ss = ss->next) { |
291 |
|
sp->brt += ss->brsum; |
292 |
|
n += ss->r - ss->l; |
293 |
< |
if (compdir(dright, ss->r, ss->v) < 0) |
294 |
< |
compdir(dright, ss->r-2, ss->v); |
293 |
> |
if (compdir(dright, ss->r, ss->v, NULL) < 0) |
294 |
> |
compdir(dright, ss->r-2, ss->v, NULL); |
295 |
|
for (h = ss->r-1; h >= ss->l; h--) |
296 |
< |
if (compdir(dthis, h, ss->v) == 0) { |
296 |
> |
if (compdir(dthis, h, ss->v, NULL) == 0) { |
297 |
|
d = dist2(dthis, dright); |
298 |
|
fvsum(sp->dir, sp->dir, dthis, d); |
299 |
|
sp->dom += d; |
308 |
|
donelist = sp; |
309 |
|
if (verbose) |
310 |
|
fprintf(stderr, |
311 |
< |
"%s: found source at (%.3f,%.3f,%.3f), dw %.5f, br %.1f (%d samps)\n", |
311 |
> |
"%s: source at [%.3f,%.3f,%.3f], dw %.5f, br %.1f (%d samps)\n", |
312 |
|
progname, sp->dir[0], sp->dir[1], sp->dir[2], |
313 |
|
sp->dom, sp->brt, n); |
314 |
|
} |
342 |
|
fprintf(stderr, "%s: absorbing small sources...\n", progname); |
343 |
|
head.next = donelist; |
344 |
|
last = &head; |
345 |
< |
for (this = donelist; this != NULL; this = this->next) |
345 |
> |
for (this = head.next; this != NULL; this = this->next) |
346 |
|
if (TOOSMALL(this)) { |
347 |
|
last->next = this->next; |
348 |
< |
buddy = findbuddy(this, donelist); |
348 |
> |
buddy = findbuddy(this, head.next); |
349 |
|
if (buddy != NULL) |
350 |
|
mergesource(buddy, this); |
351 |
|
else |