147 |
|
void *p |
148 |
|
) |
149 |
|
{ |
150 |
< |
char fmt[32]; |
150 |
> |
char fmt[MAXFMTLEN]; |
151 |
|
|
152 |
|
if (print_header) /* copy to output */ |
153 |
|
fputs(s, stdout); |
164 |
|
static void |
165 |
|
init(void) /* initialize calculation */ |
166 |
|
{ |
167 |
+ |
char *err; |
168 |
|
/* read header */ |
169 |
|
getheader(stdin, headline, NULL); |
170 |
|
if (wrongformat) { |
172 |
|
exit(1); |
173 |
|
} |
174 |
|
/* set view */ |
175 |
< |
if (setview(&midview) != NULL) { |
176 |
< |
fprintf(stderr, "%s: bad view information in input\n", |
175 |
> |
if ((err = setview(&midview)) != NULL) { |
176 |
> |
fprintf(stderr, "%s: %s\n", |
177 |
> |
progname, err); |
178 |
> |
exit(1); |
179 |
> |
} |
180 |
> |
if (fabs(DOT(midview.vdir, midview.vup)) > 1e-4) { |
181 |
> |
fprintf(stderr, |
182 |
> |
"%s: Input view direction not perpendicular to up vector\n", |
183 |
|
progname); |
184 |
|
exit(1); |
185 |
|
} |
194 |
|
#define S_DIREC 2 |
195 |
|
int state = S_SEARCH; |
196 |
|
char buf[128]; |
197 |
< |
register struct glare_src *gs; |
198 |
< |
register struct glare_dir *gd; |
197 |
> |
struct glare_src *gs; |
198 |
> |
struct glare_dir *gd; |
199 |
|
|
200 |
|
while (fgets(buf, sizeof(buf), stdin) != NULL) |
201 |
|
switch (state) { |
212 |
|
} |
213 |
|
if ((gs = newp(struct glare_src)) == NULL) |
214 |
|
goto memerr; |
215 |
< |
if (sscanf(buf, "%lf %lf %lf %lf %lf", |
216 |
< |
&gs->dir[0], &gs->dir[1], &gs->dir[2], |
217 |
< |
&gs->dom, &gs->lum) != 5) |
215 |
> |
if (sscanf(buf, FVFORMAT, &gs->dir[0], &gs->dir[1], |
216 |
> |
&gs->dir[2]) != 3 || |
217 |
> |
sscanf(sskip2(buf, 3), "%lf %lf", |
218 |
> |
&gs->dom, &gs->lum) != 2) |
219 |
|
goto readerr; |
220 |
|
normalize(gs->dir); |
221 |
|
gs->next = all_srcs; |
254 |
|
gdfun *func |
255 |
|
) |
256 |
|
{ |
257 |
< |
register struct glare_dir *gd; |
257 |
> |
struct glare_dir *gd; |
258 |
|
|
259 |
|
for (gd = all_dirs; gd != NULL; gd = gd->next) |
260 |
|
printf("%f\t%f\n", gd->ang*(180.0/PI), (*func)(gd)); |
268 |
|
{ |
269 |
|
FVECT mydir; |
270 |
|
double d, dval; |
271 |
< |
register struct glare_src *gs; |
271 |
> |
struct glare_src *gs; |
272 |
|
|
273 |
|
spinvector(mydir, midview.vdir, midview.vup, gd->ang); |
274 |
|
dval = 0.0; |
326 |
|
d = DOT(sd,vd); |
327 |
|
if (d <= 0.0) |
328 |
|
return(-1.0); |
329 |
< |
if (d >= 1.0) |
329 |
> |
if (d >= 1.0-FTINY) |
330 |
|
return(1.0); |
331 |
|
sigma = acos(d) * (180./PI); |
332 |
|
d = fabs(DOT(sd,vu)/sqrt(1.0-d*d)); |
333 |
< |
if (d >= 1.0) |
326 |
< |
tau = 0.0; |
327 |
< |
else |
328 |
< |
tau = acos(d) * (180./PI); |
333 |
> |
tau = Acos(d) * (180./PI); |
334 |
|
return( exp( sigma*( (35.2 - tau*.31889 - 1.22*exp(-.22222*tau))*1e-3 |
335 |
|
+ sigma*(21. + tau*(.26667 + tau*-.002963))*1e-5 ) |
336 |
|
) ); |
342 |
|
struct glare_dir *gd |
343 |
|
) |
344 |
|
{ |
345 |
< |
register struct glare_src *gs; |
345 |
> |
struct glare_src *gs; |
346 |
|
FVECT mydir,testdir[7],vhor; |
347 |
|
double r,posn,omega,p[7],sum; |
348 |
< |
int i,n; |
348 |
> |
int i; |
349 |
|
|
350 |
|
spinvector(mydir, midview.vdir, midview.vup, gd->ang); |
351 |
< |
sum = 0.0; n = 0; |
351 |
> |
sum = 0.0; |
352 |
|
for (gs = all_srcs; gs != NULL; gs = gs->next) { |
353 |
|
|
354 |
|
/* compute 1/p^2 weighted solid angle of the source */ |
355 |
< |
r = sqrt(1 - pow(1.-gs->dom/2./PI,2.)); |
355 |
> |
r = 1. - gs->dom*(.5/PI); |
356 |
> |
r = sqrt(1. - r*r); |
357 |
|
fcross(vhor,gs->dir,midview.vup); |
358 |
< |
normalize(vhor); |
358 |
> |
if (normalize(vhor) == 0.) |
359 |
> |
continue; |
360 |
|
VCOPY(testdir[0],gs->dir); |
361 |
|
fvsum(testdir[1],gs->dir,vhor,r); |
362 |
|
fvsum(testdir[2],gs->dir,vhor,0.5*r); |
367 |
|
fvsum(testdir[6],testdir[4],midview.vup,0.866*r); |
368 |
|
fvsum(testdir[4],testdir[4],midview.vup,-0.866*r); |
369 |
|
for (i = 0; i < 7; i++) { |
370 |
< |
normalize(testdir[i]); |
370 |
> |
p[i] = 0.0; |
371 |
> |
if (normalize(testdir[i]) == 0.) |
372 |
> |
continue; |
373 |
|
posn = posindex(testdir[i],mydir,midview.vup); |
374 |
< |
if (posn <= FTINY) |
366 |
< |
p[i] = 0.0; |
367 |
< |
else |
374 |
> |
if (posn > FTINY) |
375 |
|
p[i] = 1./(posn*posn); |
376 |
|
} |
377 |
< |
r = 1-gs->dom/2./PI; |
377 |
> |
r = 1. - gs->dom*(.5/PI); |
378 |
|
omega = gs->dom*p[0]; |
379 |
< |
omega += (r*PI*(1+1/r/r)-2*PI)*(-p[0]+(p[1]+p[2])*0.5); |
380 |
< |
omega += (2*PI-r*PI*(1+1/r/r))*(-p[0]-0.1667*(p[1]+p[3]) |
379 |
> |
omega += (r*PI*(1.+1./(r*r))-2.*PI)*(-p[0]+(p[1]+p[2])*0.5); |
380 |
> |
omega += (2.*PI-r*PI*(1.+1./(r*r)))*(-p[0]-0.1667*(p[1]+p[3]) |
381 |
|
+0.3334*(p[2]+p[4]+p[5]+p[6])); |
382 |
< |
|
382 |
> |
if (omega <= 0.) |
383 |
> |
omega = 0.; |
384 |
|
sum += pow(gs->lum,1.6) * pow(omega,0.8) / |
385 |
< |
(gd->indirect/PI + 0.07*sqrt(gs->dom)*gs->lum); |
378 |
< |
n++; |
385 |
> |
(gd->indirect*(1./PI) + 0.07*sqrt(gs->dom)*gs->lum); |
386 |
|
} |
387 |
< |
if (n == 0) |
387 |
> |
if (sum <= FTINY) |
388 |
|
return(0.0); |
389 |
< |
return( 10*log10(0.478*sum) ); |
389 |
> |
return( 10.*log10(0.478*sum) ); |
390 |
|
} |
391 |
|
|
392 |
|
|
395 |
|
struct glare_dir *gd |
396 |
|
) |
397 |
|
{ |
398 |
< |
register struct glare_src *gs; |
398 |
> |
struct glare_src *gs; |
399 |
|
FVECT mydir; |
400 |
|
double p; |
401 |
|
double sum; |
410 |
|
} |
411 |
|
if (sum <= FTINY) |
412 |
|
return(0.0); |
413 |
< |
sum /= gd->indirect/PI; |
413 |
> |
sum *= PI/gd->indirect; |
414 |
|
return(10*log10(0.478*sum)); |
415 |
|
} |
416 |
|
|
421 |
|
) |
422 |
|
{ |
423 |
|
#define q(w) (20.4*w+1.52*pow(w,.2)-.075) |
424 |
< |
register struct glare_src *gs; |
424 |
> |
struct glare_src *gs; |
425 |
|
FVECT mydir; |
426 |
|
double p; |
427 |
|
double sum; |
474 |
|
struct glare_dir *gd |
475 |
|
) |
476 |
|
{ |
477 |
< |
register struct glare_src *gs; |
477 |
> |
struct glare_src *gs; |
478 |
|
FVECT mydir; |
479 |
|
double dillum; |
480 |
|
double p; |
500 |
|
struct glare_dir *gd |
501 |
|
) |
502 |
|
{ |
503 |
< |
register struct glare_src *gs; |
503 |
> |
struct glare_src *gs; |
504 |
|
FVECT mydir; |
505 |
|
double p; |
506 |
|
double sum; |