255 |
|
register struct glare_src *gs; |
256 |
|
double p; |
257 |
|
double sum; |
258 |
+ |
double wtot, brsum; |
259 |
|
int n; |
260 |
|
|
261 |
< |
sum = 0.0; n = 0; |
261 |
> |
sum = wtot = brsum = 0.0; n = 0; |
262 |
|
for (gs = all_srcs; gs != NULL; gs = gs->next) { |
263 |
|
p = posindex(gs->dir, midview.vdir, midview.vup); |
264 |
|
if (p <= FTINY) |
265 |
|
continue; |
266 |
|
sum += gs->lum * q(gs->dom) / p; |
267 |
+ |
brsum += gs->lum * gs->dom; |
268 |
+ |
wtot += gs->dom; |
269 |
|
n++; |
270 |
|
} |
271 |
|
if (n == 0) |
272 |
|
return(0.0); |
273 |
|
else |
274 |
|
return( pow( |
275 |
< |
.5*sum/pow(direct(gd)+gd->indirect,.44), |
275 |
> |
.5*sum/pow((brsum+(5.-wtot)*gd->indirect/PI)/5.,.44), |
276 |
|
pow((double)n, -.0914) ) ); |
277 |
|
#undef q |
278 |
|
} |
291 |
|
guth_vcp(gd) /* compute Guth visual comfort probability */ |
292 |
|
struct glare_dir *gd; |
293 |
|
{ |
294 |
< |
return(100.*norm_integral(-6.374+1.3227*log(guth_dgr(gd)))); |
294 |
> |
return(100.*norm_integral(6.374-1.3227*log(guth_dgr(gd)))); |
295 |
|
} |