26 |
|
int input_orient = 0; |
27 |
|
int output_orient = 0; |
28 |
|
|
29 |
+ |
/* BSDF histogram */ |
30 |
+ |
int bsdf_hist[HISTLEN]; |
31 |
+ |
|
32 |
+ |
/* BSDF value for boundary regions */ |
33 |
+ |
double bsdf_min = 0; |
34 |
+ |
|
35 |
|
/* processed incident DSF measurements */ |
36 |
|
RBFNODE *dsf_list = NULL; |
37 |
|
|
88 |
|
int |
89 |
|
use_symmetry(FVECT vec) |
90 |
|
{ |
91 |
< |
double phi = get_phi360(vec); |
91 |
> |
const double phi = get_phi360(vec); |
92 |
|
|
93 |
|
switch (inp_coverage) { |
94 |
|
case INP_QUAD1|INP_QUAD2|INP_QUAD3|INP_QUAD4: |
194 |
|
FVECT outvec; |
195 |
|
int pos[2]; |
196 |
|
int n; |
197 |
< |
#ifdef DEBUG |
198 |
< |
{ |
193 |
< |
double tdiff = 180./M_PI*fabs(acos(invec[2])-acos(rbf->invec[2])); |
194 |
< |
if (tdiff >= 1.5) |
195 |
< |
fprintf(stderr, |
196 |
< |
"%s: Warning - rotated theta differs by %.1f degrees\n", |
197 |
< |
progname, tdiff); |
198 |
< |
} |
199 |
< |
#endif |
200 |
< |
for (n = rbf->nrbf; n-- > 0; ) { |
197 |
> |
|
198 |
> |
for (n = ((-.01 > phi) | (phi > .01))*rbf->nrbf; n-- > 0; ) { |
199 |
|
ovec_from_pos(outvec, rbf->rbfa[n].gx, rbf->rbfa[n].gy); |
200 |
|
spinvector(outvec, outvec, vnorm, phi); |
201 |
|
pos_from_vec(pos, outvec); |
221 |
|
double uv[2]; |
222 |
|
double r2; |
223 |
|
|
224 |
< |
SDsquare2disk(uv, (1./grid_res)*(xpos+.5), (1./grid_res)*(ypos+.5)); |
224 |
> |
SDsquare2disk(uv, (xpos+.5)/grid_res, (ypos+.5)/grid_res); |
225 |
|
/* uniform hemispherical projection */ |
226 |
|
r2 = uv[0]*uv[0] + uv[1]*uv[1]; |
227 |
|
vec[0] = vec[1] = sqrt(2. - r2); |
247 |
|
double |
248 |
|
eval_rbfrep(const RBFNODE *rp, const FVECT outvec) |
249 |
|
{ |
250 |
< |
double res = .0; |
250 |
> |
double minval = bsdf_min*output_orient*outvec[2]; |
251 |
> |
double res = 0; |
252 |
|
const RBFVAL *rbfp; |
253 |
|
FVECT odir; |
254 |
|
double sig2; |
255 |
|
int n; |
256 |
< |
|
257 |
< |
if (rp == NULL) |
258 |
< |
return(.0); |
256 |
> |
/* use minimum if no information avail. */ |
257 |
> |
if (rp == NULL) { |
258 |
> |
if (outvec[2] > 0 ^ output_orient > 0) |
259 |
> |
return(.0); |
260 |
> |
return(minval); |
261 |
> |
} |
262 |
|
rbfp = rp->rbfa; |
263 |
|
for (n = rp->nrbf; n--; rbfp++) { |
264 |
|
ovec_from_pos(odir, rbfp->gx, rbfp->gy); |
267 |
|
if (sig2 > -19.) |
268 |
|
res += rbfp->peak * exp(sig2); |
269 |
|
} |
270 |
+ |
if (res < minval) /* never return less than minval */ |
271 |
+ |
return(minval); |
272 |
|
return(res); |
273 |
|
} |
274 |
|
|
402 |
|
fprintf(ofp, "SYMMETRY=%d\n", !single_plane_incident * inp_coverage); |
403 |
|
fprintf(ofp, "IO_SIDES= %d %d\n", input_orient, output_orient); |
404 |
|
fprintf(ofp, "GRIDRES=%d\n", grid_res); |
405 |
+ |
fprintf(ofp, "BSDFMIN=%g\n", bsdf_min); |
406 |
|
fputformat(BSDFREP_FMT, ofp); |
407 |
|
fputc('\n', ofp); |
408 |
|
/* write each DSF */ |
468 |
|
sscanf(s+8, "%d", &grid_res); |
469 |
|
return(0); |
470 |
|
} |
471 |
+ |
if (!strncmp(s, "BSDFMIN=", 8)) { |
472 |
+ |
sscanf(s+8, "%lf", &bsdf_min); |
473 |
+ |
return(0); |
474 |
+ |
} |
475 |
|
if (formatval(fmt, s) && strcmp(fmt, BSDFREP_FMT)) |
476 |
|
return(-1); |
477 |
|
return(0); |
502 |
|
rbfh.invec[0] = getflt(ifp); |
503 |
|
rbfh.invec[1] = getflt(ifp); |
504 |
|
rbfh.invec[2] = getflt(ifp); |
505 |
+ |
if (normalize(rbfh.invec) == 0) { |
506 |
+ |
fprintf(stderr, "%s: zero incident vector\n", progname); |
507 |
+ |
return(0); |
508 |
+ |
} |
509 |
|
rbfh.vtotal = getflt(ifp); |
510 |
|
rbfh.nrbf = getint(4, ifp); |
511 |
|
newrbf = (RBFNODE *)malloc(sizeof(RBFNODE) + |
512 |
|
sizeof(RBFVAL)*(rbfh.nrbf-1)); |
513 |
|
if (newrbf == NULL) |
514 |
|
goto memerr; |
515 |
< |
memcpy(newrbf, &rbfh, sizeof(RBFNODE)); |
515 |
> |
memcpy(newrbf, &rbfh, sizeof(RBFNODE)-sizeof(RBFVAL)); |
516 |
|
for (i = 0; i < rbfh.nrbf; i++) { |
517 |
|
newrbf->rbfa[i].peak = getflt(ifp); |
518 |
|
newrbf->rbfa[i].crad = getint(2, ifp) & 0xffff; |