--- ray/src/cv/bsdf2ttree.c 2020/05/15 03:02:32 2.51 +++ ray/src/cv/bsdf2ttree.c 2023/07/26 15:50:03 2.59 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.51 2020/05/15 03:02:32 greg Exp $"; +static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.59 2023/07/26 15:50:03 greg Exp $"; #endif /* * Load measured BSDF interpolant and write out as XML file with tensor tree. @@ -10,6 +10,7 @@ static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.51 #define _USE_MATH_DEFINES #include #include +#include #include "random.h" #include "platform.h" #include "paths.h" @@ -27,9 +28,7 @@ static int samp_order = 6; /* super-sampling threshold */ static double ssamp_thresh = 0.35; /* number of super-samples */ -#ifndef NSSAMP -#define NSSAMP 256 -#endif +static int nssamp = 256; /* limit on number of RBF lobes */ static int lobe_lim = 15000; /* progress bar length */ @@ -136,7 +135,7 @@ eval_isotropic(char *funame) int assignD = 0; char cmd[128]; int ix, ox, oy; - double iovec[6]; + RREAL iovec[6]; float bsdf, uv[2]; if (pctcull >= 0) { @@ -192,13 +191,11 @@ eval_isotropic(char *funame) } if (funame != NULL) /* need to assign Dx, Dy, Dz? */ assignD = (fundefined(funame) < 6); -#if (NSSAMP > 0) val_last = (float *)calloc(sqres, sizeof(float)); if (funame == NULL) sdv_next = (SDValue *)malloc(sizeof(SDValue)*sqres); else val_next = (float *)malloc(sizeof(float)*sqres); -#endif /* run through directions */ for (ix = 0; ix < sqres/2; ix++) { const int zipsgn = (ix & 1)*2 - 1; @@ -211,7 +208,7 @@ eval_isotropic(char *funame) rbf = advect_rbf(iovec, lobe_lim); /* presample first row */ for (oy = 0; oy < sqres; oy++) { - SDsquare2disk(iovec+3, .5*sqfact, (oy+.5)*sqfact); + square2disk(iovec+3, .5*sqfact, (oy+.5)*sqfact); iovec[5] = output_orient * sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); if (funame == NULL) { @@ -233,7 +230,7 @@ eval_isotropic(char *funame) */ for (oy = 0; oy < sqres; oy++) { if (ox < sqres-1) { /* keeping one row ahead... */ - SDsquare2disk(iovec+3, (ox+1.5)*sqfact, (oy+.5)*sqfact); + square2disk(iovec+3, (ox+1.5)*sqfact, (oy+.5)*sqfact); iovec[5] = output_orient * sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); } @@ -242,7 +239,6 @@ eval_isotropic(char *funame) bsdf = sdv.cieY; if (ox < sqres-1) eval_rbfcol(&sdv_next[oy], rbf, iovec+3); -#if (NSSAMP > 0) if (abs_diff(bsdf, sdv_next[oy].cieY) > ssamp_thresh || (ox && abs_diff(bsdf, val_last[oy]) > ssamp_thresh) || (oy && abs_diff(bsdf, val_last[oy-1]) > ssamp_thresh) || @@ -251,10 +247,10 @@ eval_isotropic(char *funame) int ssi; double ssa[2], sum = 0, usum = 0, vsum = 0; /* super-sample voxel */ - for (ssi = NSSAMP; ssi--; ) { - SDmultiSamp(ssa, 2, (ssi+frandom()) * - (1./NSSAMP)); - SDsquare2disk(iovec+3, (ox+ssa[0])*sqfact, + for (ssi = nssamp; ssi--; ) { + SDmultiSamp(ssa, 2, (ssi+frandom()) / + (double)nssamp); + square2disk(iovec+3, (ox+ssa[0])*sqfact, (oy+ssa[1])*sqfact); iovec[5] = output_orient * sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); @@ -267,14 +263,12 @@ eval_isotropic(char *funame) vsum += 9.*sdv.spec.cy * sdv.cieY; } } - bsdf = sum * (1./NSSAMP); + bsdf = sum / (double)nssamp; if (rbf_colorimetry == RBCtristimulus) { uv[0] = usum / (sum+FTINY); uv[1] = vsum / (sum+FTINY); } - } else -#endif - if (rbf_colorimetry == RBCtristimulus) { + } else if (rbf_colorimetry == RBCtristimulus) { uv[0] = uv[1] = 1. / (-2.*sdv.spec.cx + 12.*sdv.spec.cy + 3.); uv[0] *= 4.*sdv.spec.cx; @@ -291,7 +285,6 @@ eval_isotropic(char *funame) } val_next[oy] = funvalue(funame, 6, iovec); } -#if (NSSAMP > 0) if (abs_diff(bsdf, val_next[oy]) > ssamp_thresh || (ox && abs_diff(bsdf, val_last[oy]) > ssamp_thresh) || (oy && abs_diff(bsdf, val_last[oy-1]) > ssamp_thresh) || @@ -300,9 +293,9 @@ eval_isotropic(char *funame) int ssi; double ssa[4], ssvec[6], sum = 0; /* super-sample voxel */ - for (ssi = NSSAMP; ssi--; ) { - SDmultiSamp(ssa, 4, (ssi+frandom()) * - (1./NSSAMP)); + for (ssi = nssamp; ssi--; ) { + SDmultiSamp(ssa, 4, (ssi+frandom()) / + (double)nssamp); ssvec[0] = 2.*sqfact*(ix+ssa[0]) - 1.; ssvec[1] = zipsgn*sqfact*ssa[1]; ssvec[2] = 1. - ssvec[0]*ssvec[0] @@ -312,7 +305,7 @@ eval_isotropic(char *funame) ssvec[2] = 1. - ssvec[0]*ssvec[0]; } ssvec[2] = input_orient * sqrt(ssvec[2]); - SDsquare2disk(ssvec+3, (ox+ssa[2])*sqfact, + square2disk(ssvec+3, (ox+ssa[2])*sqfact, (oy+ssa[3])*sqfact); ssvec[5] = output_orient * sqrt(1. - ssvec[3]*ssvec[3] - @@ -325,9 +318,8 @@ eval_isotropic(char *funame) } sum += funvalue(funame, 6, ssvec); } - bsdf = sum * (1./NSSAMP); + bsdf = sum / (double)nssamp; } -#endif } if (pctcull >= 0) putbinary(&bsdf, sizeof(bsdf), 1, ofp); @@ -407,7 +399,7 @@ eval_anisotropic(char *funame) int assignD = 0; char cmd[128]; int ix, iy, ox, oy; - double iovec[6]; + RREAL iovec[6]; float bsdf, uv[2]; if (pctcull >= 0) { @@ -468,25 +460,23 @@ eval_anisotropic(char *funame) } if (funame != NULL) /* need to assign Dx, Dy, Dz? */ assignD = (fundefined(funame) < 6); -#if (NSSAMP > 0) val_last = (float *)calloc(sqres, sizeof(float)); if (funame == NULL) sdv_next = (SDValue *)malloc(sizeof(SDValue)*sqres); else val_next = (float *)malloc(sizeof(float)*sqres); -#endif /* run through directions */ for (ix = 0; ix < sqres; ix++) for (iy = 0; iy < sqres; iy++) { RBFNODE *rbf = NULL; /* Klems reversal */ - SDsquare2disk(iovec, 1.-(ix+.5)*sqfact, 1.-(iy+.5)*sqfact); + square2disk(iovec, 1.-(ix+.5)*sqfact, 1.-(iy+.5)*sqfact); iovec[2] = input_orient * sqrt(1. - iovec[0]*iovec[0] - iovec[1]*iovec[1]); if (funame == NULL) rbf = advect_rbf(iovec, lobe_lim); /* presample first row */ for (oy = 0; oy < sqres; oy++) { - SDsquare2disk(iovec+3, .5*sqfact, (oy+.5)*sqfact); + square2disk(iovec+3, .5*sqfact, (oy+.5)*sqfact); iovec[5] = output_orient * sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); if (funame == NULL) { @@ -508,7 +498,7 @@ eval_anisotropic(char *funame) */ for (oy = 0; oy < sqres; oy++) { if (ox < sqres-1) { /* keeping one row ahead... */ - SDsquare2disk(iovec+3, (ox+1.5)*sqfact, (oy+.5)*sqfact); + square2disk(iovec+3, (ox+1.5)*sqfact, (oy+.5)*sqfact); iovec[5] = output_orient * sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); } @@ -517,7 +507,6 @@ eval_anisotropic(char *funame) bsdf = sdv.cieY; if (ox < sqres-1) eval_rbfcol(&sdv_next[oy], rbf, iovec+3); -#if (NSSAMP > 0) if (abs_diff(bsdf, sdv_next[oy].cieY) > ssamp_thresh || (ox && abs_diff(bsdf, val_last[oy]) > ssamp_thresh) || (oy && abs_diff(bsdf, val_last[oy-1]) > ssamp_thresh) || @@ -526,10 +515,10 @@ eval_anisotropic(char *funame) int ssi; double ssa[2], sum = 0, usum = 0, vsum = 0; /* super-sample voxel */ - for (ssi = NSSAMP; ssi--; ) { - SDmultiSamp(ssa, 2, (ssi+frandom()) * - (1./NSSAMP)); - SDsquare2disk(iovec+3, (ox+ssa[0])*sqfact, + for (ssi = nssamp; ssi--; ) { + SDmultiSamp(ssa, 2, (ssi+frandom()) / + (double)nssamp); + square2disk(iovec+3, (ox+ssa[0])*sqfact, (oy+ssa[1])*sqfact); iovec[5] = output_orient * sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); @@ -542,14 +531,12 @@ eval_anisotropic(char *funame) vsum += 9.*sdv.spec.cy * sdv.cieY; } } - bsdf = sum * (1./NSSAMP); + bsdf = sum / (double)nssamp; if (rbf_colorimetry == RBCtristimulus) { uv[0] = usum / (sum+FTINY); uv[1] = vsum / (sum+FTINY); } - } else -#endif - if (rbf_colorimetry == RBCtristimulus) { + } else if (rbf_colorimetry == RBCtristimulus) { uv[0] = uv[1] = 1. / (-2.*sdv.spec.cx + 12.*sdv.spec.cy + 3.); uv[0] *= 4.*sdv.spec.cx; @@ -566,7 +553,6 @@ eval_anisotropic(char *funame) } val_next[oy] = funvalue(funame, 6, iovec); } -#if (NSSAMP > 0) if (abs_diff(bsdf, val_next[oy]) > ssamp_thresh || (ox && abs_diff(bsdf, val_last[oy]) > ssamp_thresh) || (oy && abs_diff(bsdf, val_last[oy-1]) > ssamp_thresh) || @@ -575,15 +561,15 @@ eval_anisotropic(char *funame) int ssi; double ssa[4], ssvec[6], sum = 0; /* super-sample voxel */ - for (ssi = NSSAMP; ssi--; ) { - SDmultiSamp(ssa, 4, (ssi+frandom()) * - (1./NSSAMP)); - SDsquare2disk(ssvec, 1.-(ix+ssa[0])*sqfact, + for (ssi = nssamp; ssi--; ) { + SDmultiSamp(ssa, 4, (ssi+frandom()) / + (double)nssamp); + square2disk(ssvec, 1.-(ix+ssa[0])*sqfact, 1.-(iy+ssa[1])*sqfact); ssvec[2] = input_orient * sqrt(1. - ssvec[0]*ssvec[0] - ssvec[1]*ssvec[1]); - SDsquare2disk(ssvec+3, (ox+ssa[2])*sqfact, + square2disk(ssvec+3, (ox+ssa[2])*sqfact, (oy+ssa[3])*sqfact); ssvec[5] = output_orient * sqrt(1. - ssvec[3]*ssvec[3] - @@ -596,9 +582,8 @@ eval_anisotropic(char *funame) } sum += funvalue(funame, 6, ssvec); } - bsdf = sum * (1./NSSAMP); + bsdf = sum / (double)nssamp; } -#endif } if (pctcull >= 0) putbinary(&bsdf, sizeof(bsdf), 1, ofp); @@ -664,7 +649,7 @@ eval_anisotropic(char *funame) static int wrap_up(void) { - char cmd[8192]; + char cmd[32700]; if (bsdf_manuf[0]) { add_wbsdf("-f", 1); @@ -715,29 +700,72 @@ wrap_up(void) } #endif +#define HEAD_BUFLEN 10240 +static char head_buf[HEAD_BUFLEN]; +static int cur_headlen = 0; + +/* Record header line as comment associated with this SIR input */ +static int +record2header(char *s) +{ + int len = strlen(s); + + if (cur_headlen+len >= HEAD_BUFLEN-6) + return(0); + /* includes EOL */ + strcpy(head_buf+cur_headlen, s); + cur_headlen += len; + +#if defined(_WIN32) || defined(_WIN64) + if (head_buf[cur_headlen-1] == '\n') + head_buf[cur_headlen-1] = '\t'; +#endif + return(1); +} + +/* Finish off header for this file */ +static void +done_header(void) +{ + while (cur_headlen > 0 && isspace(head_buf[cur_headlen-1])) + --cur_headlen; + head_buf[cur_headlen] = '\0'; + if (!cur_headlen) + return; + add_wbsdf("-C", 1); + add_wbsdf(head_buf, 0); + head_buf[cur_headlen=0] = '\0'; +} + /* Read in BSDF and interpolate as tensor tree representation */ int main(int argc, char *argv[]) { - static char tfmt[2][4] = {"t4", "t3"}; - int dofwd = 0, dobwd = 1; - char buf[2048]; - int i, na; + static const char tfmt[2][4] = {"t4", "t3"}; + int dofwd = 0, dobwd = 1; + int nsirs = 0; + char buf[1024]; + int i; progname = argv[0]; esupport |= E_VARIABLE|E_FUNCTION|E_RCONST; esupport &= ~(E_INCHAN|E_OUTCHAN); scompile("PI:3.14159265358979323846", NULL, 0); biggerlib(); - for (i = 1; i < argc && (argv[i][0] == '-') | (argv[i][0] == '+'); i++) - switch (argv[i][1]) { /* get options */ + strcpy(buf, "File produced by: "); + if (convert_commandline(buf+18, sizeof(buf)-18, argv) != NULL) { + add_wbsdf("-C", 1); add_wbsdf(buf, 0); + } + for (i = 1; i < argc; i++) + if ((argv[i][0] == '-') | (argv[i][0] == '+')) { + switch (argv[i][1]) { /* get option */ case 'e': scompile(argv[++i], NULL, 0); if (single_plane_incident < 0) single_plane_incident = 0; break; case 'f': - if (!argv[i][2]) { + if ((argv[i][0] == '-') & !argv[i][2]) { if (strchr(argv[++i], '=') != NULL) { add_wbsdf("-f", 1); add_wbsdf(argv[i], 1); @@ -763,6 +791,16 @@ main(int argc, char *argv[]) case 'b': dobwd = (argv[i][0] == '+'); break; + case 'n': + nssamp = atoi(argv[++i]); + if (nssamp <= 0) + goto userr; + break; + case 's': + ssamp_thresh = atof(argv[++i]); + if (ssamp_thresh <= FTINY) + goto userr; + break; case 't': switch (argv[i][2]) { case '3': @@ -798,11 +836,39 @@ main(int argc, char *argv[]) default: goto userr; } - strcpy(buf, "File produced by: "); - if (convert_commandline(buf+18, sizeof(buf)-18, argv) != NULL) { - add_wbsdf("-C", 1); add_wbsdf(buf, 0); - } - if (single_plane_incident >= 0) { /* function-based BSDF? */ + } else { /* input SIR or function */ + FILE *fpin; + if (!nsirs & (single_plane_incident >= 0)) + break; /* must be a function */ + if (nsirs >= 4) { + fprintf(stderr, "At most 4 SIR inputs supported\n"); + goto userr; + } + fpin = fopen(argv[i], "rb"); /* open SIR file */ + if (fpin == NULL) { + fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n", + progname, argv[i]); + return(1); + } + sprintf(buf, "%s:\n", argv[i]); + record2header(buf); + sir_headshare = &record2header; + if (!load_bsdf_rep(fpin)) + return(1); + fclose(fpin); + done_header(); + sprintf(buf, "Interpolating component '%s'", argv[i]); + prog_start(buf); + if (!nsirs++) { + add_wbsdf("-a", 1); + add_wbsdf(tfmt[single_plane_incident], 1); + } + if (single_plane_incident) + eval_isotropic(NULL); + else + eval_anisotropic(NULL); + } + if (i < argc) { /* function-based BSDF? */ void (*evf)(char *s) = single_plane_incident ? eval_isotropic : eval_anisotropic; if (i != argc-1 || fundefined(argv[i]) < 3) { @@ -813,7 +879,6 @@ main(int argc, char *argv[]) goto userr; } ++eclock; - ssamp_thresh *= 0.5; /* lower sampling threshold */ add_wbsdf("-a", 1); add_wbsdf(tfmt[single_plane_incident], 1); if (dofwd) { @@ -834,52 +899,27 @@ main(int argc, char *argv[]) prog_start("Evaluating inside->outside transmission"); (*evf)(argv[i]); } - return(wrap_up()); + } else if (!nsirs) { /* else load SIR from stdin? */ + record2header(":\n"); + sir_headshare = &record2header; + if (!load_bsdf_rep(stdin)) + return(1); + done_header(); + prog_start("Interpolating from standard input"); + add_wbsdf("-a", 1); + add_wbsdf(tfmt[single_plane_incident], 1); + if (single_plane_incident) /* resample dist. */ + eval_isotropic(NULL); + else + eval_anisotropic(NULL); } - if (i < argc) { /* open input files if given */ - int nbsdf = 0; - for ( ; i < argc; i++) { /* interpolate each component */ - char pbuf[256]; - FILE *fpin = fopen(argv[i], "rb"); - if (fpin == NULL) { - fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n", - progname, argv[i]); - return(1); - } - if (!load_bsdf_rep(fpin)) - return(1); - fclose(fpin); - sprintf(pbuf, "Interpolating component '%s'", argv[i]); - prog_start(pbuf); - if (!nbsdf++) { - add_wbsdf("-a", 1); - add_wbsdf(tfmt[single_plane_incident], 1); - } - if (single_plane_incident) - eval_isotropic(NULL); - else - eval_anisotropic(NULL); - } - return(wrap_up()); - } - SET_FILE_BINARY(stdin); /* load from stdin */ - if (!load_bsdf_rep(stdin)) - return(1); - prog_start("Interpolating from standard input"); - add_wbsdf("-a", 1); - add_wbsdf(tfmt[single_plane_incident], 1); - if (single_plane_incident) /* resample dist. */ - eval_isotropic(NULL); - else - eval_anisotropic(NULL); - - return(wrap_up()); + return(wrap_up()); /* call wrapBSDF */ userr: fprintf(stderr, - "Usage: %s [{+|-}a][-g Nlog2][-t pctcull][-l maxlobes] [bsdf.sir ..] > bsdf.xml\n", + "Usage: %s [{+|-}a][-g Nlog2][-t pctcull][-n nss][-s thresh][-l maxlobes][bsdf.sir ..] > bsdf.xml\n", progname); fprintf(stderr, - " or: %s -t{3|4} [{+|-}a][-g Nlog2][-t pctcull][{+|-}for[ward]][{+|-}b[ackward]][-e expr][-f file] bsdf_func > bsdf.xml\n", + " 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", progname); return(1); }