18 |
|
const char win6_template[] = "WINDOW6BSDFt.xml"; |
19 |
|
|
20 |
|
const char stdin_name[] = "<stdin>"; |
21 |
– |
|
21 |
|
/* input files (can be stdin_name) */ |
22 |
|
const char *xml_input = NULL; |
23 |
|
/* unit for materials & geometry */ |
32 |
|
|
33 |
|
int angle_basis = ABdefault; |
34 |
|
|
35 |
+ |
int correct_solid_angle = 0; |
36 |
+ |
|
37 |
+ |
const char *klems_basis_name[] = { |
38 |
+ |
"LBNL/Klems Full", |
39 |
+ |
"LBNL/Klems Half", |
40 |
+ |
"LBNL/Klems Quarter", |
41 |
+ |
}; |
42 |
|
/* field IDs and nicknames */ |
43 |
|
struct s_fieldID { |
44 |
|
char nickName[4]; |
63 |
|
const char *field_assignment[MAXASSIGN]; |
64 |
|
int nfield_assign = 0; |
65 |
|
#define FASEP ';' |
60 |
– |
|
66 |
|
/* data file(s) & spectra */ |
67 |
|
enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward }; |
68 |
|
|
294 |
|
if (xml_input == win6_template) |
295 |
|
for (i = 0; XMLfieldID[i].nickName[0]; i++) |
296 |
|
if (XMLfieldID[i].win_need && |
297 |
< |
!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0]) { |
297 |
> |
!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0]) |
298 |
|
fprintf(stderr, |
299 |
< |
"%s: missing required '%s' assignment for WINDOW <%s>\n", |
299 |
> |
"%s: warning - missing '%s' assignment for WINDOW <%s>\n", |
300 |
|
caller, XMLfieldID[i].nickName, |
301 |
|
XMLfieldID[i].fullName); |
302 |
< |
return 0; |
298 |
< |
} |
299 |
< |
return 1; /* no errors */ |
302 |
> |
return 1; |
303 |
|
} |
304 |
|
|
305 |
|
/* Complete angle basis specification */ |
381 |
|
return -1; |
382 |
|
} |
383 |
|
|
384 |
< |
/* Filter Klems angle basis, applying appropriate solid angle correction */ |
384 |
> |
/* Filter Klems angle basis, factoring out incident projected solid angle */ |
385 |
|
static int |
386 |
|
filter_klems_matrix(FILE *fp) |
387 |
|
{ |
388 |
|
#define MAX_COLUMNS 145 |
389 |
+ |
const char *bn = klems_basis_name[angle_basis]; |
390 |
|
float col_corr[MAX_COLUMNS]; |
387 |
– |
const char *bn; |
391 |
|
int i, j, n = nabases; |
392 |
|
/* get angle basis */ |
390 |
– |
switch (angle_basis) { |
391 |
– |
case ABklemsFull: bn = "LBNL/Klems Full"; break; |
392 |
– |
case ABklemsHalf: bn = "LBNL/Klems Half"; break; |
393 |
– |
case ABklemsQuarter: bn = "LBNL/Klems Quarter"; break; |
394 |
– |
default: |
395 |
– |
return 0; |
396 |
– |
} |
393 |
|
while (n-- > 0) |
394 |
|
if (!strcasecmp(bn, abase_list[n].name)) |
395 |
|
break; |
396 |
|
if (n < 0) |
397 |
|
return 0; |
398 |
|
if (abase_list[n].nangles > MAX_COLUMNS) { |
399 |
< |
fprintf(stderr, "Internal error - too many Klems columns!\n"); |
399 |
> |
fputs("Internal error - too many Klems columns!\n", stderr); |
400 |
|
return 0; |
401 |
|
} |
402 |
|
/* get correction factors */ |
408 |
|
double d; |
409 |
|
if (fscanf(fp, "%lf", &d) != 1) |
410 |
|
return 0; |
411 |
< |
printf(" %f", d*col_corr[j]); |
411 |
> |
if (d < -1e-3) { |
412 |
> |
fputs("Negative BSDF data!\n", stderr); |
413 |
> |
return 0; |
414 |
> |
} |
415 |
> |
printf(" %.3e", d*col_corr[j]*(d > 0)); |
416 |
|
} |
417 |
|
fputc('\n', stdout); |
418 |
|
} |
419 |
< |
return 1; |
419 |
> |
while ((i = getc(fp)) != EOF) |
420 |
> |
if (!isspace(i)) { |
421 |
> |
fputs("Unexpected data past EOF\n", stderr); |
422 |
> |
return 0; |
423 |
> |
} |
424 |
> |
return 1; /* all is good */ |
425 |
|
#undef MAX_COLUMNS |
426 |
|
} |
427 |
|
|
429 |
|
static int |
430 |
|
writeBSDFblock(const char *caller, struct s_dfile *df) |
431 |
|
{ |
432 |
< |
int klems_data = 0; |
432 |
> |
int correct_klems = correct_solid_angle; |
433 |
|
char *cp; |
434 |
|
|
435 |
|
puts("\t<WavelengthData>"); |
437 |
|
switch (df->spectrum) { |
438 |
|
case DSvisible: |
439 |
|
puts("\t\t<Wavelength unit=\"Integral\">Visible</Wavelength>"); |
440 |
< |
puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>"); |
440 |
> |
puts("\t\t<SourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>"); |
441 |
|
puts("\t\t<DetectorSpectrum>ASTM E308 1931 Y.dsp</DetectorSpectrum>"); |
442 |
|
break; |
443 |
|
case DSxbar31: |
493 |
|
return 0; |
494 |
|
} |
495 |
|
puts("</WavelengthDataDirection>"); |
491 |
– |
klems_data = 1; |
496 |
|
switch (angle_basis) { |
497 |
|
case ABklemsFull: |
494 |
– |
puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Full</ColumnAngleBasis>"); |
495 |
– |
break; |
498 |
|
case ABklemsHalf: |
497 |
– |
puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Half</ColumnAngleBasis>"); |
498 |
– |
break; |
499 |
|
case ABklemsQuarter: |
500 |
< |
puts("\t\t\t<ColumnAngleBasis>LBNL/Klems Quarter</ColumnAngleBasis>"); |
500 |
> |
fputs("\t\t\t<ColumnAngleBasis>", stdout); |
501 |
> |
fputs(klems_basis_name[angle_basis], stdout); |
502 |
> |
puts("</ColumnAngleBasis>"); |
503 |
> |
fputs("\t\t\t<RowAngleBasis>", stdout); |
504 |
> |
fputs(klems_basis_name[angle_basis], stdout); |
505 |
> |
puts("</RowAngleBasis>"); |
506 |
|
break; |
507 |
|
case ABtensorTree3: |
508 |
|
case ABtensorTree4: |
509 |
|
puts("\t\t\t<AngleBasis>LBNL/Shirley-Chiu</AngleBasis>"); |
510 |
< |
klems_data = 0; |
510 |
> |
correct_klems = 0; |
511 |
|
break; |
512 |
|
default: |
513 |
|
fprintf(stderr, "%s: bad angle basis (%d)\n", caller, angle_basis); |
516 |
|
puts("\t\t\t<ScatteringDataType>BTDF</ScatteringDataType>"); |
517 |
|
puts("\t\t\t<ScatteringData>"); |
518 |
|
fflush(stdout); |
519 |
< |
if (klems_data) { |
519 |
> |
if (correct_klems) { /* correct Klems matrix data */ |
520 |
|
FILE *fp = stdin; |
521 |
|
if (df->fname[0] == '!') |
522 |
|
fp = popen(df->fname+1, "r"); |
772 |
|
else |
773 |
|
UsageExit(argv[0]); |
774 |
|
continue; |
775 |
+ |
case 'c': /* correct solid angle */ |
776 |
+ |
correct_solid_angle = 1; |
777 |
+ |
continue; |
778 |
|
case 't': /* transmission */ |
779 |
|
if (i >= argc-1) |
780 |
|
UsageExit(argv[0]); |
816 |
|
argv[i] = (char *)stdin_name; |
817 |
|
} |
818 |
|
data_file[ndataf].fname = argv[i]; |
819 |
< |
data_file[ndataf++].spectrum = cur_spectrum; |
819 |
> |
data_file[ndataf].spectrum = cur_spectrum; |
820 |
> |
ndataf++; |
821 |
|
continue; |
822 |
|
case 's': /* spectrum name or input file */ |
823 |
|
if (++i >= argc) |
879 |
|
} else { |
880 |
|
xml_input = argv[i]; |
881 |
|
} |
873 |
– |
if ((xml_input == win6_template) & (angle_basis == ABdefault)) |
874 |
– |
angle_basis = ABklemsFull; |
882 |
|
/* wrap it! */ |
883 |
|
return !wrapBSDF(argv[0]); |
884 |
|
} |