--- ray/src/cv/bsdf2ttree.c 2013/03/23 04:14:50 2.14 +++ ray/src/cv/bsdf2ttree.c 2013/10/03 17:01:02 2.19 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.14 2013/03/23 04:14:50 greg Exp $"; +static const char RCSid[] = "$Id: bsdf2ttree.c,v 2.19 2013/10/03 17:01:02 greg Exp $"; #endif /* * Load measured BSDF interpolant and write out as XML file with tensor tree. @@ -20,6 +20,12 @@ char *progname; double pctcull = 90.; /* sampling order */ int samp_order = 6; + /* super-sampling threshold */ +const double ssamp_thresh = 0.35; + /* number of super-samples */ +const int nssamp = 100; + /* limit on number of RBF lobes */ +static int lobe_lim = 15000; /* Output XML prologue to stdout */ static void @@ -90,24 +96,34 @@ xml_epilogue(void) puts(""); } +/* Compute absolute relative difference */ +static double +abs_diff(double v1, double v0) +{ + if ((v0 < 0) | (v1 < 0)) + return(.0); + v1 = (v1-v0)*2./(v0+v1+.0001); + if (v1 < 0) + return(-v1); + return(v1); +} + /* Interpolate and output isotropic BSDF data */ static void eval_isotropic(char *funame) { const int sqres = 1<= 0) fprintf(stderr, "data with %.1f%% culling\n", pctcull); - else fputs("raw data\n", stderr); -#endif + data_prologue(); /* begin output */ if (pctcull >= 0) { - sprintf(cmd, "rttree_reduce -h -a -ff -r 3 -t %f -g %d", + sprintf(cmd, "rttree_reduce%s -h -ff -r 3 -t %f -g %d", + (input_orient>0 ^ output_orient>0) ? "" : " -a", pctcull, samp_order); fflush(stdout); ofp = popen(cmd, "w"); @@ -119,6 +135,9 @@ eval_isotropic(char *funame) SET_FILE_BINARY(ofp); } else fputs("{\n", stdout); + /* need to assign Dx, Dy, Dz? */ + if (funame != NULL) + assignD = (fundefined(funame) < 6); /* run through directions */ for (ix = 0; ix < sqres/2; ix++) { RBFNODE *rbf = NULL; @@ -126,22 +145,57 @@ eval_isotropic(char *funame) iovec[1] = .0; iovec[2] = input_orient * sqrt(1. - iovec[0]*iovec[0]); if (funame == NULL) - rbf = advect_rbf(iovec); - for (ox = 0; ox < sqres; ox++) + rbf = advect_rbf(iovec, lobe_lim); + for (ox = 0; ox < sqres; ox++) { + float last_bsdf = -1; for (oy = 0; oy < sqres; oy++) { SDsquare2disk(iovec+3, (ox+.5)/sqres, (oy+.5)/sqres); iovec[5] = output_orient * sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); if (funame == NULL) - bsdf = eval_rbfrep(rbf, iovec+3) * + bsdf = eval_rbfrep(rbf, iovec+3) * output_orient/iovec[5]; - else - bsdf = funvalue(funame, 6, iovec); + else { + double ssa[3], ssvec[6], sum; + int ssi; + if (assignD) { + varset("Dx", '=', -iovec[3]); + varset("Dy", '=', -iovec[4]); + varset("Dz", '=', -iovec[5]); + ++eclock; + } + bsdf = funvalue(funame, 6, iovec); + if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) { + sum = 0; /* super-sample voxel */ + for (ssi = nssamp; ssi--; ) { + SDmultiSamp(ssa, 3, (ssi+drand48())/nssamp); + ssvec[0] = 2.*(ix+ssa[0])/sqres - 1.; + ssvec[1] = .0; + ssvec[2] = input_orient * + sqrt(1. - ssvec[0]*ssvec[0]); + SDsquare2disk(ssvec+3, (ox+ssa[1])/sqres, + (oy+ssa[2])/sqres); + ssvec[5] = output_orient * + sqrt(1. - ssvec[3]*ssvec[3] - + ssvec[4]*ssvec[4]); + if (assignD) { + varset("Dx", '=', -iovec[3]); + varset("Dy", '=', -iovec[4]); + varset("Dz", '=', -iovec[5]); + ++eclock; + } + sum += funvalue(funame, 6, ssvec); + } + bsdf = sum/nssamp; + } + } if (pctcull >= 0) fwrite(&bsdf, sizeof(bsdf), 1, ofp); else printf("\t%.3e\n", bsdf); + last_bsdf = bsdf; } + } if (rbf != NULL) free(rbf); } @@ -165,18 +219,16 @@ eval_anisotropic(char *funame) { const int sqres = 1<= 0) fprintf(stderr, "data with %.1f%% culling\n", pctcull); - else fputs("raw data\n", stderr); -#endif + data_prologue(); /* begin output */ if (pctcull >= 0) { - sprintf(cmd, "rttree_reduce -h -a -ff -r 4 -t %f -g %d", + sprintf(cmd, "rttree_reduce%s -h -ff -r 4 -t %f -g %d", + (input_orient>0 ^ output_orient>0) ? "" : " -a", pctcull, samp_order); fflush(stdout); ofp = popen(cmd, "w"); @@ -187,31 +239,69 @@ eval_anisotropic(char *funame) } } else fputs("{\n", stdout); + /* need to assign Dx, Dy, Dz? */ + if (funame != NULL) + assignD = (fundefined(funame) < 6); /* run through directions */ for (ix = 0; ix < sqres; ix++) for (iy = 0; iy < sqres; iy++) { RBFNODE *rbf = NULL; /* Klems reversal */ - SDsquare2disk(iovec, (ix+.5)/sqres, (iy+.5)/sqres); - iovec[0] = -iovec[0]; iovec[1] = -iovec[1]; + SDsquare2disk(iovec, 1.-(ix+.5)/sqres, 1.-(iy+.5)/sqres); iovec[2] = input_orient * sqrt(1. - iovec[0]*iovec[0] - iovec[1]*iovec[1]); if (funame == NULL) - rbf = advect_rbf(iovec); - for (ox = 0; ox < sqres; ox++) + rbf = advect_rbf(iovec, lobe_lim); + for (ox = 0; ox < sqres; ox++) { + float last_bsdf = -1; for (oy = 0; oy < sqres; oy++) { SDsquare2disk(iovec+3, (ox+.5)/sqres, (oy+.5)/sqres); iovec[5] = output_orient * sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); if (funame == NULL) - bsdf = eval_rbfrep(rbf, iovec+3) * + bsdf = eval_rbfrep(rbf, iovec+3) * output_orient/iovec[5]; - else - bsdf = funvalue(funame, 6, iovec); + else { + double ssa[4], ssvec[6], sum; + int ssi; + if (assignD) { + varset("Dx", '=', -iovec[3]); + varset("Dy", '=', -iovec[4]); + varset("Dz", '=', -iovec[5]); + ++eclock; + } + bsdf = funvalue(funame, 6, iovec); + if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) { + sum = 0; /* super-sample voxel */ + for (ssi = nssamp; ssi--; ) { + SDmultiSamp(ssa, 4, (ssi+drand48())/nssamp); + SDsquare2disk(ssvec, 1.-(ix+ssa[0])/sqres, + 1.-(iy+ssa[1])/sqres); + ssvec[2] = output_orient * + sqrt(1. - ssvec[0]*ssvec[0] - + ssvec[1]*ssvec[1]); + SDsquare2disk(ssvec+3, (ox+ssa[2])/sqres, + (oy+ssa[3])/sqres); + ssvec[5] = output_orient * + sqrt(1. - ssvec[3]*ssvec[3] - + ssvec[4]*ssvec[4]); + if (assignD) { + varset("Dx", '=', -iovec[3]); + varset("Dy", '=', -iovec[4]); + varset("Dz", '=', -iovec[5]); + ++eclock; + } + sum += funvalue(funame, 6, ssvec); + } + bsdf = sum/nssamp; + } + } if (pctcull >= 0) fwrite(&bsdf, sizeof(bsdf), 1, ofp); else printf("\t%.3e\n", bsdf); + last_bsdf = bsdf; } + } if (rbf != NULL) free(rbf); } @@ -270,18 +360,24 @@ main(int argc, char *argv[]) case 'g': samp_order = atoi(argv[++i]); break; + case 'l': + lobe_lim = atoi(argv[++i]); + break; default: goto userr; } if (single_plane_incident >= 0) { /* function-based BSDF? */ void (*evf)(char *s) = single_plane_incident ? &eval_isotropic : &eval_anisotropic; - if (i != argc-1 || fundefined(argv[i]) != 6) { + if (i != argc-1 || fundefined(argv[i]) < 3) { fprintf(stderr, "%s: need single function with 6 arguments: bsdf(ix,iy,iz,ox,oy,oz)\n", progname); + fprintf(stderr, "\tor 3 arguments using Dx,Dy,Dz: bsdf(ix,iy,iz)\n", + progname); goto userr; } + ++eclock; xml_prologue(argc, argv); /* start XML output */ if (dofwd) { input_orient = -1; @@ -334,7 +430,7 @@ main(int argc, char *argv[]) return(0); userr: fprintf(stderr, - "Usage: %s [-g Nlog2][-t pctcull] [bsdf.sir ..] > bsdf.xml\n", + "Usage: %s [-g Nlog2][-t pctcull][-l maxlobes] [bsdf.sir ..] > bsdf.xml\n", progname); fprintf(stderr, " or: %s -t{3|4} [-g Nlog2][-t pctcull][{+|-}for[ward]][{+|-}b[ackward]][-e expr][-f file] bsdf_func > bsdf.xml\n",