| 470 |
|
} |
| 471 |
|
switch (XMLfile[0]) { /* avoid RAYPATH search */ |
| 472 |
|
case '.': |
| 473 |
+ |
case '~': |
| 474 |
|
CASEDIRSEP: |
| 475 |
|
curdir = ""; |
| 476 |
|
break; |
| 750 |
|
strcpy(bsdf_manuf, myBSDF.makr); |
| 751 |
|
put_matBSDF(argv[1]); |
| 752 |
|
} else { |
| 753 |
< |
FILE *fp; |
| 753 |
> |
FILE *fp[4]; |
| 754 |
> |
if (argc > 5) { |
| 755 |
> |
fprintf(stderr, "%s: more than 4 hemispheres!\n", progname); |
| 756 |
> |
return(1); |
| 757 |
> |
} |
| 758 |
|
for (n = 1; n < argc; n++) { |
| 759 |
< |
fp = fopen(argv[n], "rb"); |
| 760 |
< |
if (fp == NULL) { |
| 759 |
> |
fp[n-1] = fopen(argv[n], "rb"); |
| 760 |
> |
if (fp[n-1] == NULL) { |
| 761 |
|
fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n", |
| 762 |
|
progname, argv[n]); |
| 763 |
|
return(1); |
| 764 |
|
} |
| 765 |
< |
if (getheader(fp, rbf_headline, NULL) < 0) { |
| 765 |
> |
if (getheader(fp[n-1], rbf_headline, NULL) < 0) { |
| 766 |
|
fprintf(stderr, "%s: bad BSDF interpolant '%s'\n", |
| 767 |
|
progname, argv[n]); |
| 768 |
|
return(1); |
| 769 |
|
} |
| 765 |
– |
fclose(fp); |
| 770 |
|
} |
| 771 |
|
set_minlog(); |
| 772 |
|
for (n = 1; n < argc; n++) { |
| 773 |
< |
fp = fopen(argv[n], "rb"); |
| 774 |
< |
if (!load_bsdf_rep(fp)) |
| 773 |
> |
if (fseek(fp[n-1], 0L, SEEK_SET) < 0) { |
| 774 |
> |
fprintf(stderr, "%s: cannot seek on '%s'\n", |
| 775 |
> |
progname, argv[n]); |
| 776 |
|
return(1); |
| 777 |
< |
fclose(fp); |
| 777 |
> |
} |
| 778 |
> |
if (!load_bsdf_rep(fp[n-1])) |
| 779 |
> |
return(1); |
| 780 |
> |
fclose(fp[n-1]); |
| 781 |
|
if (!build_wRBF()) |
| 782 |
|
return(1); |
| 783 |
|
} |
| 788 |
|
put_scale(); |
| 789 |
|
if (inpXML && myBSDF.mgf) |
| 790 |
|
convert_mgf(myBSDF.mgf); |
| 791 |
< |
if (!put_BSDFs()) |
| 791 |
> |
if (!put_BSDFs()) /* most of the output happens here */ |
| 792 |
|
return(1); |
| 793 |
|
cleanup_tmp(); |
| 794 |
|
return(0); |
