77 |
|
inpfile[i].isDSF = 1; |
78 |
|
continue; |
79 |
|
} |
80 |
< |
if (!strcasecmp(typ, "BSDF")) { |
80 |
> |
if (!strcasecmp(typ, "BSDF") || |
81 |
> |
!strcasecmp(typ, "BRDF") || |
82 |
> |
!strcasecmp(typ, "BTDF")) { |
83 |
|
inpfile[i].isDSF = 0; |
84 |
|
continue; |
85 |
|
} |
131 |
|
if (i) /* process previous incidence */ |
132 |
|
make_rbfrep(); |
133 |
|
#ifdef DEBUG |
134 |
< |
fprintf(stderr, "New incident (theta,phi)=(%f,%f)\n", |
134 |
> |
fprintf(stderr, "New incident (theta,phi)=(%.1f,%.1f)\n", |
135 |
|
inpfile[i].theta, inpfile[i].phi); |
136 |
|
#endif |
137 |
|
new_bsdf_data(inpfile[i].theta, inpfile[i].phi); |
186 |
|
for (i = 0; i < ninpfiles; i++) |
187 |
|
if (!init_pabopto_inp(i, argv[i+1])) |
188 |
|
return(1); |
189 |
< |
qsort(inpfile, ninpfiles, sizeof(PGINPUT), &cmp_indir); |
189 |
> |
qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir); |
190 |
|
/* compile measurements */ |
191 |
|
for (i = 0; i < ninpfiles; i++) |
192 |
|
if (!add_pabopto_inp(i)) |
238 |
|
if (dsf_grid[i][j].sum.n > 0) { |
239 |
|
ovec_from_pos(dir, i, j); |
240 |
|
bsdf = dsf_grid[i][j].sum.v / |
241 |
< |
(dsf_grid[i][j].sum.n*output_orient*dir[2]); |
241 |
> |
((double)dsf_grid[i][j].sum.n*output_orient*dir[2]); |
242 |
|
if (bsdf <= bsdf_min*.6) |
243 |
|
continue; |
244 |
|
bsdf = log(bsdf + 1e-5) - min_log; |