268 |
|
uv[0] = usum / (sum+FTINY); |
269 |
|
uv[1] = vsum / (sum+FTINY); |
270 |
|
} |
271 |
< |
} else |
272 |
< |
if (rbf_colorimetry == RBCtristimulus) { |
271 |
> |
} else if (rbf_colorimetry == RBCtristimulus) { |
272 |
|
uv[0] = uv[1] = 1. / |
273 |
|
(-2.*sdv.spec.cx + 12.*sdv.spec.cy + 3.); |
274 |
|
uv[0] *= 4.*sdv.spec.cx; |
536 |
|
uv[0] = usum / (sum+FTINY); |
537 |
|
uv[1] = vsum / (sum+FTINY); |
538 |
|
} |
539 |
< |
} else |
541 |
< |
if (rbf_colorimetry == RBCtristimulus) { |
539 |
> |
} else if (rbf_colorimetry == RBCtristimulus) { |
540 |
|
uv[0] = uv[1] = 1. / |
541 |
|
(-2.*sdv.spec.cx + 12.*sdv.spec.cy + 3.); |
542 |
|
uv[0] *= 4.*sdv.spec.cx; |
649 |
|
static int |
650 |
|
wrap_up(void) |
651 |
|
{ |
652 |
< |
char cmd[8192]; |
652 |
> |
char cmd[32700]; |
653 |
|
|
654 |
|
if (bsdf_manuf[0]) { |
655 |
|
add_wbsdf("-f", 1); |
700 |
|
} |
701 |
|
#endif |
702 |
|
|
703 |
< |
#define HEAD_BUFLEN 8192 |
703 |
> |
#define HEAD_BUFLEN 10240 |
704 |
|
static char head_buf[HEAD_BUFLEN]; |
705 |
|
static int cur_headlen = 0; |
706 |
|
|
716 |
|
strcpy(head_buf+cur_headlen, s); |
717 |
|
cur_headlen += len; |
718 |
|
|
719 |
+ |
#if defined(_WIN32) || defined(_WIN64) |
720 |
+ |
if (head_buf[cur_headlen-1] == '\n') |
721 |
+ |
head_buf[cur_headlen-1] = '\t'; |
722 |
+ |
#endif |
723 |
|
return(1); |
724 |
|
} |
725 |
|
|
741 |
|
int |
742 |
|
main(int argc, char *argv[]) |
743 |
|
{ |
744 |
< |
static char tfmt[2][4] = {"t4", "t3"}; |
745 |
< |
int dofwd = 0, dobwd = 1; |
746 |
< |
char buf[2048]; |
747 |
< |
int i, na; |
744 |
> |
static const char tfmt[2][4] = {"t4", "t3"}; |
745 |
> |
int dofwd = 0, dobwd = 1; |
746 |
> |
int nsirs = 0; |
747 |
> |
char buf[1024]; |
748 |
> |
int i; |
749 |
|
|
750 |
|
progname = argv[0]; |
751 |
|
esupport |= E_VARIABLE|E_FUNCTION|E_RCONST; |
752 |
|
esupport &= ~(E_INCHAN|E_OUTCHAN); |
753 |
|
scompile("PI:3.14159265358979323846", NULL, 0); |
754 |
|
biggerlib(); |
755 |
< |
for (i = 1; i < argc && (argv[i][0] == '-') | (argv[i][0] == '+'); i++) |
756 |
< |
switch (argv[i][1]) { /* get options */ |
755 |
> |
strcpy(buf, "File produced by: "); |
756 |
> |
if (convert_commandline(buf+18, sizeof(buf)-18, argv) != NULL) { |
757 |
> |
add_wbsdf("-C", 1); add_wbsdf(buf, 0); |
758 |
> |
} |
759 |
> |
for (i = 1; i < argc; i++) |
760 |
> |
if ((argv[i][0] == '-') | (argv[i][0] == '+')) { |
761 |
> |
switch (argv[i][1]) { /* get option */ |
762 |
|
case 'e': |
763 |
|
scompile(argv[++i], NULL, 0); |
764 |
|
if (single_plane_incident < 0) |
836 |
|
default: |
837 |
|
goto userr; |
838 |
|
} |
839 |
< |
strcpy(buf, "File produced by: "); |
840 |
< |
if (convert_commandline(buf+18, sizeof(buf)-18, argv) != NULL) { |
841 |
< |
add_wbsdf("-C", 1); add_wbsdf(buf, 0); |
842 |
< |
} |
843 |
< |
if (single_plane_incident >= 0) { /* function-based BSDF? */ |
839 |
> |
} else { /* input SIR or function */ |
840 |
> |
FILE *fpin; |
841 |
> |
if (!nsirs & (single_plane_incident >= 0)) |
842 |
> |
break; /* must be a function */ |
843 |
> |
if (nsirs >= 4) { |
844 |
> |
fprintf(stderr, "At most 4 SIR inputs supported\n"); |
845 |
> |
goto userr; |
846 |
> |
} |
847 |
> |
fpin = fopen(argv[i], "rb"); /* open SIR file */ |
848 |
> |
if (fpin == NULL) { |
849 |
> |
fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n", |
850 |
> |
progname, argv[i]); |
851 |
> |
return(1); |
852 |
> |
} |
853 |
> |
sprintf(buf, "%s:\n", argv[i]); |
854 |
> |
record2header(buf); |
855 |
> |
sir_headshare = &record2header; |
856 |
> |
if (!load_bsdf_rep(fpin)) |
857 |
> |
return(1); |
858 |
> |
fclose(fpin); |
859 |
> |
done_header(); |
860 |
> |
sprintf(buf, "Interpolating component '%s'", argv[i]); |
861 |
> |
prog_start(buf); |
862 |
> |
if (!nsirs++) { |
863 |
> |
add_wbsdf("-a", 1); |
864 |
> |
add_wbsdf(tfmt[single_plane_incident], 1); |
865 |
> |
} |
866 |
> |
if (single_plane_incident) |
867 |
> |
eval_isotropic(NULL); |
868 |
> |
else |
869 |
> |
eval_anisotropic(NULL); |
870 |
> |
} |
871 |
> |
if (i < argc) { /* function-based BSDF? */ |
872 |
|
void (*evf)(char *s) = single_plane_incident ? |
873 |
|
eval_isotropic : eval_anisotropic; |
874 |
|
if (i != argc-1 || fundefined(argv[i]) < 3) { |
899 |
|
prog_start("Evaluating inside->outside transmission"); |
900 |
|
(*evf)(argv[i]); |
901 |
|
} |
902 |
< |
return(wrap_up()); |
902 |
> |
} else if (!nsirs) { /* else load SIR from stdin? */ |
903 |
> |
record2header("<stdin>:\n"); |
904 |
> |
sir_headshare = &record2header; |
905 |
> |
if (!load_bsdf_rep(stdin)) |
906 |
> |
return(1); |
907 |
> |
done_header(); |
908 |
> |
prog_start("Interpolating from standard input"); |
909 |
> |
add_wbsdf("-a", 1); |
910 |
> |
add_wbsdf(tfmt[single_plane_incident], 1); |
911 |
> |
if (single_plane_incident) /* resample dist. */ |
912 |
> |
eval_isotropic(NULL); |
913 |
> |
else |
914 |
> |
eval_anisotropic(NULL); |
915 |
|
} |
916 |
< |
if (i < argc) { /* open input files if given */ |
869 |
< |
int nbsdf = 0; |
870 |
< |
for ( ; i < argc; i++) { /* interpolate each component */ |
871 |
< |
char pbuf[256]; |
872 |
< |
FILE *fpin = fopen(argv[i], "rb"); |
873 |
< |
if (fpin == NULL) { |
874 |
< |
fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n", |
875 |
< |
progname, argv[i]); |
876 |
< |
return(1); |
877 |
< |
} |
878 |
< |
sprintf(pbuf, "%s:\n", argv[i]); |
879 |
< |
record2header(pbuf); |
880 |
< |
sir_headshare = &record2header; |
881 |
< |
if (!load_bsdf_rep(fpin)) |
882 |
< |
return(1); |
883 |
< |
fclose(fpin); |
884 |
< |
done_header(); |
885 |
< |
sprintf(pbuf, "Interpolating component '%s'", argv[i]); |
886 |
< |
prog_start(pbuf); |
887 |
< |
if (!nbsdf++) { |
888 |
< |
add_wbsdf("-a", 1); |
889 |
< |
add_wbsdf(tfmt[single_plane_incident], 1); |
890 |
< |
} |
891 |
< |
if (single_plane_incident) |
892 |
< |
eval_isotropic(NULL); |
893 |
< |
else |
894 |
< |
eval_anisotropic(NULL); |
895 |
< |
} |
896 |
< |
return(wrap_up()); |
897 |
< |
} |
898 |
< |
SET_FILE_BINARY(stdin); /* load from stdin */ |
899 |
< |
if (!load_bsdf_rep(stdin)) |
900 |
< |
return(1); |
901 |
< |
prog_start("Interpolating from standard input"); |
902 |
< |
add_wbsdf("-a", 1); |
903 |
< |
add_wbsdf(tfmt[single_plane_incident], 1); |
904 |
< |
if (single_plane_incident) /* resample dist. */ |
905 |
< |
eval_isotropic(NULL); |
906 |
< |
else |
907 |
< |
eval_anisotropic(NULL); |
908 |
< |
|
909 |
< |
return(wrap_up()); |
916 |
> |
return(wrap_up()); /* call wrapBSDF */ |
917 |
|
userr: |
918 |
|
fprintf(stderr, |
919 |
< |
"Usage: %s [{+|-}a][-g Nlog2][-t pctcull][-n nss][-s thresh][-l maxlobes] [bsdf.sir ..] > bsdf.xml\n", |
919 |
> |
"Usage: %s [{+|-}a][-g Nlog2][-t pctcull][-n nss][-s thresh][-l maxlobes][bsdf.sir ..] > bsdf.xml\n", |
920 |
|
progname); |
921 |
|
fprintf(stderr, |
922 |
|
" or: %s -t{3|4} [{+|-}a][-g Nlog2][-t pctcull][-n nss][-s thresh][{+|-}for[ward]][{+|-}b[ackward]][-e expr][-f file] bsdf_func > bsdf.xml\n", |