| 50 |
|
if (spanbr == NULL) |
| 51 |
|
memerr("view span brightness buffer"); |
| 52 |
|
for (v = vsize; v >= -vsize; v--) { |
| 53 |
+ |
close_sources(v); |
| 54 |
|
getviewspan(v, spanbr); |
| 55 |
|
left = hsize + 1; |
| 56 |
< |
for (h = -hsize; h <= hsize; h++) |
| 56 |
> |
for (h = -hsize; h <= hsize; h++) { |
| 57 |
|
if (spanbr[h+hsize] < 0.0) { /* off view */ |
| 58 |
|
if (left < h) { |
| 59 |
< |
addsrcspan(newspan(left,h-1,v,spanbr)); |
| 59 |
> |
addsrcspan(newspan(left,h,v,spanbr)); |
| 60 |
|
left = hsize + 1; |
| 61 |
|
} |
| 62 |
|
continue; |
| 63 |
|
} |
| 64 |
|
if (spanbr[h+hsize] > threshold) { /* in source */ |
| 65 |
< |
if (left >= h) |
| 65 |
> |
if (left > h) |
| 66 |
|
left = h; |
| 67 |
|
} else { /* out of source */ |
| 68 |
|
if (left < h) { |
| 69 |
< |
addsrcspan(newspan(left,h-1,v,spanbr)); |
| 69 |
> |
addsrcspan(newspan(left,h,v,spanbr)); |
| 70 |
|
left = hsize + 1; |
| 71 |
|
} |
| 72 |
|
addindirect(h, spanbr[h+hsize]); |
| 73 |
|
} |
| 74 |
+ |
} |
| 75 |
|
if (left < h) |
| 76 |
< |
addsrcspan(newspan(left,h-1,v,spanbr)); |
| 75 |
< |
close_sources(v); |
| 76 |
> |
addsrcspan(newspan(left,h,v,spanbr)); |
| 77 |
|
} |
| 78 |
|
close_allsrcs(); |
| 79 |
|
free((char *)spanbr); |
| 88 |
|
register int i; |
| 89 |
|
|
| 90 |
|
if (h <= -hlim) { /* left region */ |
| 91 |
< |
d = (double)(h+hlim)/SAMPDENS; |
| 91 |
> |
d = (double)(h+hlim)/sampdens; |
| 92 |
|
if (d <= -1.0+FTINY) |
| 93 |
|
return; |
| 94 |
|
tanb = d/sqrt(1.0-d*d); |
| 102 |
|
return; |
| 103 |
|
} |
| 104 |
|
if (h >= hlim) { /* right region */ |
| 105 |
< |
d = (double)(h-hlim)/SAMPDENS; |
| 105 |
> |
d = (double)(h-hlim)/sampdens; |
| 106 |
|
if (d >= 1.0-FTINY) |
| 107 |
|
return; |
| 108 |
|
tanb = d/sqrt(1.0-d*d); |
| 153 |
|
fprintf(stderr, "%s: threshold zero!\n", progname); |
| 154 |
|
exit(1); |
| 155 |
|
} |
| 156 |
< |
if (verbose) |
| 156 |
> |
if (verbose) { |
| 157 |
> |
pict_stats(); |
| 158 |
|
fprintf(stderr, |
| 159 |
|
"%s: threshold set to %f cd/m2 from %d samples\n", |
| 160 |
|
progname, threshold, nsamps); |
| 161 |
+ |
} |
| 162 |
|
} |
| 163 |
|
|
| 164 |
|
|
| 167 |
|
{ |
| 168 |
|
struct source *last, *cs, *this; |
| 169 |
|
register struct srcspan *ss; |
| 167 |
– |
register int res; |
| 170 |
|
|
| 171 |
|
cs = NULL; |
| 172 |
|
for (this = curlist; this != NULL; this = this->next) { |
| 180 |
|
mergesource(cs, this); |
| 181 |
|
last->next = this->next; |
| 182 |
|
free((char *)this); |
| 183 |
+ |
this = last; |
| 184 |
|
} |
| 185 |
|
break; |
| 186 |
|
} |
| 246 |
|
|
| 247 |
|
close_allsrcs() /* done with everything */ |
| 248 |
|
{ |
| 249 |
< |
register struct source *this; |
| 249 |
> |
register struct source *this, *next; |
| 250 |
|
|
| 251 |
< |
for (this = curlist; this != NULL; this = this->next) |
| 251 |
> |
this = curlist; |
| 252 |
> |
while (this != NULL) { |
| 253 |
> |
next = this->next; |
| 254 |
|
donesource(this); |
| 255 |
+ |
this = next; |
| 256 |
+ |
} |
| 257 |
|
curlist = NULL; |
| 258 |
|
} |
| 259 |
|
|
| 267 |
|
double d; |
| 268 |
|
|
| 269 |
|
sp->dom = 0.0; |
| 270 |
< |
sp->dir[0] = sp->dir[1] = sp->dir[1] = 0.0; |
| 270 |
> |
sp->dir[0] = sp->dir[1] = sp->dir[2] = 0.0; |
| 271 |
|
sp->brt = 0.0; |
| 272 |
+ |
n = 0; |
| 273 |
|
for (ss = sp->first; ss != NULL; ss = ss->next) { |
| 274 |
|
sp->brt += ss->brsum; |
| 275 |
|
n += ss->r - ss->l; |
| 276 |
< |
compdir(dright, ss->r, ss->v); |
| 277 |
< |
for (h = ss->r-1; h >= ss->l; h--) { |
| 278 |
< |
compdir(dthis, h, ss->v); |
| 279 |
< |
d = dist2(dthis, dright); |
| 280 |
< |
fvsum(sp->dir, sp->dir, dthis, d); |
| 281 |
< |
sp->dom += d; |
| 282 |
< |
VCOPY(dright, dthis); |
| 283 |
< |
} |
| 276 |
> |
if (compdir(dright, ss->r, ss->v) < 0) |
| 277 |
> |
compdir(dright, ss->r-2, ss->v); |
| 278 |
> |
for (h = ss->r-1; h >= ss->l; h--) |
| 279 |
> |
if (compdir(dthis, h, ss->v) == 0) { |
| 280 |
> |
d = dist2(dthis, dright); |
| 281 |
> |
fvsum(sp->dir, sp->dir, dthis, d); |
| 282 |
> |
sp->dom += d; |
| 283 |
> |
VCOPY(dright, dthis); |
| 284 |
> |
} |
| 285 |
|
free((char *)ss); |
| 286 |
|
} |
| 287 |
|
sp->first = NULL; |
| 288 |
|
sp->brt /= (double)n; |
| 289 |
< |
sp->dir[0] /= sp->dom; |
| 281 |
< |
sp->dir[1] /= sp->dom; |
| 282 |
< |
sp->dir[2] /= sp->dom; |
| 289 |
> |
normalize(sp->dir); |
| 290 |
|
sp->next = donelist; |
| 291 |
|
donelist = sp; |
| 292 |
|
if (verbose) |
| 293 |
|
fprintf(stderr, |
| 294 |
< |
"%s: found source at (%f,%f,%f), solid angle %f, brightness %f\n", |
| 295 |
< |
progname, sp->dir[0], sp->dir[1], sp->dir[2], sp->brt); |
| 294 |
> |
"%s: found source at (%.3f,%.3f,%.3f), dw %.5f, br %.1f (%d samps)\n", |
| 295 |
> |
progname, sp->dir[0], sp->dir[1], sp->dir[2], |
| 296 |
> |
sp->dom, sp->brt, n); |
| 297 |
|
} |
