--- ray/src/cv/bsdfrep.c 2012/10/20 07:02:00 2.2 +++ ray/src/cv/bsdfrep.c 2013/03/20 01:00:22 2.12 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: bsdfrep.c,v 2.2 2012/10/20 07:02:00 greg Exp $"; +static const char RCSid[] = "$Id: bsdfrep.c,v 2.12 2013/03/20 01:00:22 greg Exp $"; #endif /* * Support BSDF representation as radial basis functions. @@ -14,7 +14,10 @@ static const char RCSid[] = "$Id: bsdfrep.c,v 2.2 2012 #include "rtio.h" #include "resolu.h" #include "bsdfrep.h" - /* which quadrants are represented */ + /* active grid resolution */ +int grid_res = GRIDRES; + + /* coverage/symmetry using INP_QUAD? flags */ int inp_coverage = 0; /* all incident angles in-plane so far? */ int single_plane_incident = -1; @@ -23,6 +26,12 @@ int single_plane_incident = -1; int input_orient = 0; int output_orient = 0; + /* BSDF histogram */ +int bsdf_hist[HISTLEN]; + + /* BSDF value for boundary regions */ +double bsdf_min = 0; + /* processed incident DSF measurements */ RBFNODE *dsf_list = NULL; @@ -53,6 +62,8 @@ new_input_direction(double new_theta, double new_phi) new_theta = -new_theta; new_phi += 180.; } + if ((theta_in_deg = new_theta) < 1.0) + return(1); /* don't rely on phi near normal */ while (new_phi < 0) new_phi += 360.; while (new_phi >= 360.) @@ -61,7 +72,6 @@ new_input_direction(double new_theta, double new_phi) single_plane_incident = (round(new_phi) == round(phi_in_deg)); else if (single_plane_incident < 0) single_plane_incident = 1; - theta_in_deg = new_theta; /* assume it's OK */ phi_in_deg = new_phi; if ((1. < new_phi) & (new_phi < 89.)) inp_coverage |= INP_QUAD1; @@ -78,7 +88,7 @@ new_input_direction(double new_theta, double new_phi) int use_symmetry(FVECT vec) { - double phi = get_phi360(vec); + const double phi = get_phi360(vec); switch (inp_coverage) { case INP_QUAD1|INP_QUAD2|INP_QUAD3|INP_QUAD4: @@ -168,12 +178,33 @@ rev_rbf_symmetry(RBFNODE *rbf, int sym) rev_symmetry(rbf->invec, sym); if (sym & MIRROR_X) for (n = rbf->nrbf; n-- > 0; ) - rbf->rbfa[n].gx = GRIDRES-1 - rbf->rbfa[n].gx; + rbf->rbfa[n].gx = grid_res-1 - rbf->rbfa[n].gx; if (sym & MIRROR_Y) for (n = rbf->nrbf; n-- > 0; ) - rbf->rbfa[n].gy = GRIDRES-1 - rbf->rbfa[n].gy; + rbf->rbfa[n].gy = grid_res-1 - rbf->rbfa[n].gy; } +/* Rotate RBF to correspond to given incident vector */ +void +rotate_rbf(RBFNODE *rbf, const FVECT invec) +{ + static const FVECT vnorm = {.0, .0, 1.}; + const double phi = atan2(invec[1],invec[0]) - + atan2(rbf->invec[1],rbf->invec[0]); + FVECT outvec; + int pos[2]; + int n; + + for (n = ((-.01 > phi) | (phi > .01))*rbf->nrbf; n-- > 0; ) { + ovec_from_pos(outvec, rbf->rbfa[n].gx, rbf->rbfa[n].gy); + spinvector(outvec, outvec, vnorm, phi); + pos_from_vec(pos, outvec); + rbf->rbfa[n].gx = pos[0]; + rbf->rbfa[n].gy = pos[1]; + } + VCOPY(rbf->invec, invec); +} + /* Compute volume associated with Gaussian lobe */ double rbf_volume(const RBFVAL *rbfp) @@ -190,7 +221,7 @@ ovec_from_pos(FVECT vec, int xpos, int ypos) double uv[2]; double r2; - SDsquare2disk(uv, (1./GRIDRES)*(xpos+.5), (1./GRIDRES)*(ypos+.5)); + SDsquare2disk(uv, (xpos+.5)/grid_res, (ypos+.5)/grid_res); /* uniform hemispherical projection */ r2 = uv[0]*uv[0] + uv[1]*uv[1]; vec[0] = vec[1] = sqrt(2. - r2); @@ -208,22 +239,25 @@ pos_from_vec(int pos[2], const FVECT vec) SDdisk2square(sq, vec[0]*norm, vec[1]*norm); - pos[0] = (int)(sq[0]*GRIDRES); - pos[1] = (int)(sq[1]*GRIDRES); + pos[0] = (int)(sq[0]*grid_res); + pos[1] = (int)(sq[1]*grid_res); } /* Evaluate RBF for DSF at the given normalized outgoing direction */ double eval_rbfrep(const RBFNODE *rp, const FVECT outvec) { - double res = .0; + double res = 0; const RBFVAL *rbfp; FVECT odir; double sig2; int n; - - if (rp == NULL) - return(.0); + /* use minimum if no information avail. */ + if (rp == NULL) { + if (outvec[2] > 0 ^ output_orient > 0) + return(.0); + return(bsdf_min*output_orient*outvec[2]); + } rbfp = rp->rbfa; for (n = rp->nrbf; n--; rbfp++) { ovec_from_pos(odir, rbfp->gx, rbfp->gy); @@ -281,7 +315,7 @@ get_dsf(int ord) RBFNODE *rbf; for (rbf = dsf_list; rbf != NULL; rbf = rbf->next) - if (rbf->ord == ord); + if (rbf->ord == ord) return(rbf); return(NULL); } @@ -312,17 +346,17 @@ is_rev_tri(const FVECT v1, const FVECT v2, const FVECT int get_triangles(RBFNODE *rbfv[2], const MIGRATION *mig) { - const MIGRATION *ej, *ej2; + const MIGRATION *ej1, *ej2; RBFNODE *tv; rbfv[0] = rbfv[1] = NULL; if (mig == NULL) return(0); - for (ej = mig->rbfv[0]->ejl; ej != NULL; - ej = nextedge(mig->rbfv[0],ej)) { - if (ej == mig) + for (ej1 = mig->rbfv[0]->ejl; ej1 != NULL; + ej1 = nextedge(mig->rbfv[0],ej1)) { + if (ej1 == mig) continue; - tv = opp_rbf(mig->rbfv[0],ej); + tv = opp_rbf(mig->rbfv[0],ej1); for (ej2 = tv->ejl; ej2 != NULL; ej2 = nextedge(tv,ej2)) if (opp_rbf(tv,ej2) == mig->rbfv[1]) { rbfv[is_rev_tri(mig->rbfv[0]->invec, @@ -334,6 +368,26 @@ get_triangles(RBFNODE *rbfv[2], const MIGRATION *mig) return((rbfv[0] != NULL) + (rbfv[1] != NULL)); } +/* Clear our BSDF representation and free memory */ +void +clear_bsdf_rep(void) +{ + while (mig_list != NULL) { + MIGRATION *mig = mig_list; + mig_list = mig->next; + free(mig); + } + while (dsf_list != NULL) { + RBFNODE *rbf = dsf_list; + dsf_list = rbf->next; + free(rbf); + } + inp_coverage = 0; + single_plane_incident = -1; + input_orient = output_orient = 0; + grid_res = GRIDRES; +} + /* Write our BSDF mesh interpolant out to the given binary stream */ void save_bsdf_rep(FILE *ofp) @@ -344,6 +398,8 @@ save_bsdf_rep(FILE *ofp) /* finish header */ fprintf(ofp, "SYMMETRY=%d\n", !single_plane_incident * inp_coverage); fprintf(ofp, "IO_SIDES= %d %d\n", input_orient, output_orient); + fprintf(ofp, "GRIDRES=%d\n", grid_res); + fprintf(ofp, "BSDFMIN=%g\n", bsdf_min); fputformat(BSDFREP_FMT, ofp); fputc('\n', ofp); /* write each DSF */ @@ -370,8 +426,8 @@ save_bsdf_rep(FILE *ofp) /* write out as sparse data */ n = mtx_nrows(mig) * mtx_ncols(mig); for (i = 0; i < n; i++) { - if (zerocnt >= 0xff) { - putint(zerocnt, 1, ofp); zerocnt = 0; + if (zerocnt == 0xff) { + putint(0xff, 1, ofp); zerocnt = 0; } if (mig->mtx[i] != 0) { putint(zerocnt, 1, ofp); zerocnt = 0; @@ -405,6 +461,14 @@ headline(char *s, void *p) sscanf(s+9, "%d %d", &input_orient, &output_orient); return(0); } + if (!strncmp(s, "GRIDRES=", 8)) { + sscanf(s+8, "%d", &grid_res); + return(0); + } + if (!strncmp(s, "BSDFMIN=", 8)) { + sscanf(s+8, "%lf", &bsdf_min); + return(0); + } if (formatval(fmt, s) && strcmp(fmt, BSDFREP_FMT)) return(-1); return(0); @@ -417,16 +481,10 @@ load_bsdf_rep(FILE *ifp) RBFNODE rbfh; int from_ord, to_ord; int i; -#ifdef DEBUG - if ((dsf_list != NULL) | (mig_list != NULL)) { - fprintf(stderr, - "%s: attempt to load BSDF interpolant over existing\n", - progname); + + clear_bsdf_rep(); + if (ifp == NULL) return(0); - } -#endif - input_orient = output_orient = 0; - single_plane_incident = -1; if (getheader(ifp, headline, NULL) < 0 || single_plane_incident < 0 | !input_orient | !output_orient) { fprintf(stderr, "%s: missing/bad format for BSDF interpolant\n", @@ -441,14 +499,17 @@ load_bsdf_rep(FILE *ifp) rbfh.invec[0] = getflt(ifp); rbfh.invec[1] = getflt(ifp); rbfh.invec[2] = getflt(ifp); - rbfh.nrbf = getint(4, ifp); - if (!new_input_vector(rbfh.invec)) + if (normalize(rbfh.invec) == 0) { + fprintf(stderr, "%s: zero incident vector\n", progname); return(0); + } + rbfh.vtotal = getflt(ifp); + rbfh.nrbf = getint(4, ifp); newrbf = (RBFNODE *)malloc(sizeof(RBFNODE) + sizeof(RBFVAL)*(rbfh.nrbf-1)); if (newrbf == NULL) goto memerr; - memcpy(newrbf, &rbfh, sizeof(RBFNODE)); + memcpy(newrbf, &rbfh, sizeof(RBFNODE)-sizeof(RBFVAL)); for (i = 0; i < rbfh.nrbf; i++) { newrbf->rbfa[i].peak = getflt(ifp); newrbf->rbfa[i].crad = getint(2, ifp) & 0xffff; @@ -487,12 +548,10 @@ load_bsdf_rep(FILE *ifp) memset(newmig->mtx, 0, sizeof(float)*n); for (i = 0; ; ) { /* read sparse data */ int zc = getint(1, ifp) & 0xff; - if (zc == 0xff) { - i += 0xff; - continue; - } if ((i += zc) >= n) break; + if (zc == 0xff) + continue; newmig->mtx[i++] = getflt(ifp); } if (feof(ifp))