--- ray/src/common/bsdf_t.c 2011/05/01 16:34:37 3.12 +++ ray/src/common/bsdf_t.c 2013/04/23 17:25:23 3.27 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: bsdf_t.c,v 3.12 2011/05/01 16:34:37 greg Exp $"; +static const char RCSid[] = "$Id: bsdf_t.c,v 3.27 2013/04/23 17:25:23 greg Exp $"; #endif /* * bsdf_t.c @@ -10,6 +10,7 @@ static const char RCSid[] = "$Id: bsdf_t.c,v 3.12 2011 * */ +#define _USE_MATH_DEFINES #include "rtio.h" #include #include @@ -25,13 +26,18 @@ typedef int SDtreCallback(float val, const double *cmi /* reference width maximum (1.0) */ static const unsigned iwbits = sizeof(unsigned)*4; -static const unsigned iwmax = (1<<(sizeof(unsigned)*4))-1; +static const unsigned iwmax = 1<<(sizeof(unsigned)*4); /* maximum cumulative value */ static const unsigned cumlmax = ~0; + /* constant z-vector */ +static const FVECT zvec = {.0, .0, 1.}; + /* quantization value */ +static double quantum = 1./256.; /* Struct used for our distribution-building callback */ typedef struct { - int nic; /* number of input coordinates */ + short nic; /* number of input coordinates */ + short rev; /* reversing query */ unsigned alen; /* current array length */ unsigned nall; /* number of allocated entries */ unsigned wmin; /* minimum square size so far */ @@ -91,7 +97,7 @@ SDfreeTre(SDNode *st) return; for (n = (st->log2GR < 0) << st->ndim; n--; ) SDfreeTre(st->u.t[n]); - free((void *)st); + free(st); } /* Free a variable-resolution BSDF */ @@ -125,13 +131,13 @@ fill_grid_branch(float *dptr, const float *sptr, int n static float * grid_branch_start(SDNode *st, int n) { - unsigned skipsiz = 1 << st->log2GR; + unsigned skipsiz = 1 << (st->log2GR - 1); float *vptr = st->u.v; int i; - for (i = 0; i < st->ndim; skipsiz <<= st->log2GR) - if (1<> 1; + for (i = st->ndim; i--; skipsiz <<= st->log2GR) + if (1<ndim; i--; ) { if (bmin[i] >= 1.) return .0; - if (bmax[i] <= .0) + if (bmax[i] <= 0) return .0; if (bmin[i] >= bmax[i]) return .0; @@ -222,7 +229,6 @@ SDavgTreBox(const SDNode *st, const double *bmin, cons if (st->log2GR < 0) { /* iterate on subtree */ double sum = .0, wsum = 1e-20; double sbmin[SD_MAXDIM], sbmax[SD_MAXDIM], w; - for (n = 1 << st->ndim; n--; ) { w = 1.; for (i = st->ndim; i--; ) { @@ -234,6 +240,10 @@ SDavgTreBox(const SDNode *st, const double *bmin, cons } if (sbmin[i] < .0) sbmin[i] = .0; if (sbmax[i] > 1.) sbmax[i] = 1.; + if (sbmin[i] >= sbmax[i]) { + w = .0; + break; + } w *= sbmax[i] - sbmin[i]; } if (w > 1e-10) { @@ -242,19 +252,22 @@ SDavgTreBox(const SDNode *st, const double *bmin, cons } } return sum / wsum; + } else { /* iterate over leaves */ + int imin[SD_MAXDIM], imax[SD_MAXDIM]; + + n = 1; + for (i = st->ndim; i--; ) { + imin[i] = (bmin[i] <= 0) ? 0 : + (int)((1 << st->log2GR)*bmin[i]); + imax[i] = (bmax[i] >= 1.) ? (1 << st->log2GR) : + (int)((1 << st->log2GR)*bmax[i] + .999999); + n *= imax[i] - imin[i]; + } + if (n) + return SDiterSum(st->u.v, st->ndim, + st->log2GR, imin, imax) / (double)n; } - n = 1; /* iterate over leaves */ - for (i = st->ndim; i--; ) { - imin[i] = (bmin[i] <= 0) ? 0 - : (int)((1 << st->log2GR)*bmin[i]); - imax[i] = (bmax[i] >= 1.) ? (1 << st->log2GR) - : (int)((1 << st->log2GR)*bmax[i] + .999999); - n *= imax[i] - imin[i]; - } - if (!n) - return .0; - - return SDiterSum(st->u.v, st->ndim, st->log2GR, imin, imax) / (double)n; + return .0; } /* Recursive call for SDtraverseTre() */ @@ -269,18 +282,19 @@ SDdotravTre(const SDNode *st, const double *pos, int c /* in branches? */ if (st->log2GR < 0) { unsigned skipmask = 0; - csiz *= .5; for (i = st->ndim; i--; ) if (1<ndim; n--; ) + for (n = 1 << st->ndim; n--; ) { if (n & 1<ndim; n--; ) + for (n = 1 << st->ndim; n--; ) { if (!(n & 1<ndim; n--; ) { if (1<log2GR; } - /* fill in unused dimensions */ - for (i = SD_MAXDIM; i-- > st->ndim; ) { - clim[i][0] = 0; clim[i][1] = 1; - } #if (SD_MAXDIM == 4) bmin[0] = cmin[0] + csiz*clim[0][0]; for (cpos[0] = clim[0][0]; cpos[0] < clim[0][1]; cpos[0]++) { bmin[1] = cmin[1] + csiz*clim[1][0]; for (cpos[1] = clim[1][0]; cpos[1] < clim[1][1]; cpos[1]++) { bmin[2] = cmin[2] + csiz*clim[2][0]; - for (cpos[2] = clim[2][0]; cpos[2] < clim[2][1]; cpos[2]++) { - bmin[3] = cmin[3] + csiz*(cpos[3] = clim[3][0]); + if (st->ndim == 3) { + cpos[2] = clim[2][0]; n = cpos[0]; - for (i = 1; i < st->ndim; i++) + for (i = 1; i < 3; i++) n = (n << st->log2GR) + cpos[i]; - for ( ; cpos[3] < clim[3][1]; cpos[3]++) { + for ( ; cpos[2] < clim[2][1]; cpos[2]++) { rval += rv = (*cf)(st->u.v[n++], bmin, csiz, cptr); if (rv < 0) return rv; - bmin[3] += csiz; + bmin[2] += csiz; } - bmin[2] += csiz; + } else { + for (cpos[2] = clim[2][0]; cpos[2] < clim[2][1]; cpos[2]++) { + bmin[3] = cmin[3] + csiz*(cpos[3] = clim[3][0]); + n = cpos[0]; + for (i = 1; i < 4; i++) + n = (n << st->log2GR) + cpos[i]; + for ( ; cpos[3] < clim[3][1]; cpos[3]++) { + rval += rv = (*cf)(st->u.v[n++], bmin, csiz, cptr); + if (rv < 0) + return rv; + bmin[3] += csiz; + } + bmin[2] += csiz; + } } bmin[1] += csiz; } @@ -410,29 +433,41 @@ SDlookupTre(const SDNode *st, const double *pos, doubl static float SDqueryTre(const SDTre *sdt, const FVECT outVec, const FVECT inVec, double *hc) { - static const FVECT zvec = {.0, .0, 1.}; - FVECT rOutVec; - double gridPos[4]; + const RREAL *vtmp; + FVECT rOutVec; + double gridPos[4]; switch (sdt->sidef) { /* whose side are you on? */ - case SD_UFRONT: + case SD_FREFL: if ((outVec[2] < 0) | (inVec[2] < 0)) return -1.; break; - case SD_UBACK: + case SD_BREFL: if ((outVec[2] > 0) | (inVec[2] > 0)) return -1.; break; - case SD_XMIT: - if ((outVec[2] > 0) == (inVec[2] > 0)) + case SD_FXMIT: + if (outVec[2] > 0) { + if (inVec[2] > 0) + return -1.; + vtmp = outVec; outVec = inVec; inVec = vtmp; + } else if (inVec[2] < 0) return -1.; break; + case SD_BXMIT: + if (inVec[2] > 0) { + if (outVec[2] > 0) + return -1.; + vtmp = outVec; outVec = inVec; inVec = vtmp; + } else if (outVec[2] < 0) + return -1.; + break; default: return -1.; } /* convert vector coordinates */ if (sdt->st->ndim == 3) { - spinvector(rOutVec, outVec, zvec, -atan2(inVec[1],inVec[0])); + spinvector(rOutVec, outVec, zvec, -atan2(-inVec[1],-inVec[0])); gridPos[0] = .5 - .5*sqrt(inVec[0]*inVec[0] + inVec[1]*inVec[1]); SDdisk2square(gridPos+1, rOutVec[0], rOutVec[1]); } else if (sdt->st->ndim == 4) { @@ -464,9 +499,16 @@ build_scaffold(float val, const double *cmin, double c { SDdistScaffold *sp = (SDdistScaffold *)cptr; int wid = csiz*(double)iwmax + .5; + double revcmin[2]; bitmask_t bmin[2], bmax[2]; - cmin += sp->nic; /* skip to output coords */ + if (sp->rev) { /* need to reverse sense? */ + revcmin[0] = 1. - cmin[0] - csiz; + revcmin[1] = 1. - cmin[1] - csiz; + cmin = revcmin; + } else { + cmin += sp->nic; /* else skip to output coords */ + } if (wid < sp->wmin) /* new minimum width? */ sp->wmin = wid; if (wid > sp->wmax) /* new maximum? */ @@ -512,9 +554,11 @@ sscmp(const void *p1, const void *p2) /* Create a new cumulative distribution for the given input direction */ static SDTreCDst * -make_cdist(const SDTre *sdt, const double *pos) +make_cdist(const SDTre *sdt, const double *invec, int rev) { SDdistScaffold myScaffold; + double pos[4]; + int cmask; SDTreCDst *cd; struct outdir_s *sp; double scale, cursum; @@ -523,14 +567,20 @@ make_cdist(const SDTre *sdt, const double *pos) myScaffold.wmin = iwmax; myScaffold.wmax = 0; myScaffold.nic = sdt->st->ndim - 2; + myScaffold.rev = rev; myScaffold.alen = 0; myScaffold.nall = 512; myScaffold.darr = (struct outdir_s *)malloc(sizeof(struct outdir_s) * myScaffold.nall); if (myScaffold.darr == NULL) return NULL; + /* set up traversal */ + cmask = (1<st, pos, (1<st, pos, cmask, &build_scaffold, &myScaffold) < 0) { free(myScaffold.darr); return NULL; @@ -545,6 +595,7 @@ make_cdist(const SDTre *sdt, const double *pos) free(myScaffold.darr); return NULL; } + cd->isodist = (myScaffold.nic == 1); /* sort the distribution */ qsort(myScaffold.darr, cd->calen = myScaffold.alen, sizeof(struct outdir_s), &sscmp); @@ -552,12 +603,19 @@ make_cdist(const SDTre *sdt, const double *pos) /* record input range */ scale = myScaffold.wmin / (double)iwmax; for (i = myScaffold.nic; i--; ) { - cd->clim[i][0] = floor(pos[i]/scale) * scale; + cd->clim[i][0] = floor(pos[i+2*rev]/scale) * scale; cd->clim[i][1] = cd->clim[i][0] + scale; } + if (cd->isodist) { /* avoid issue in SDqueryTreProjSA() */ + cd->clim[1][0] = cd->clim[0][0]; + cd->clim[1][1] = cd->clim[0][1]; + } cd->max_psa = myScaffold.wmax / (double)iwmax; cd->max_psa *= cd->max_psa * M_PI; - cd->sidef = sdt->sidef; + if (rev) + cd->sidef = (sdt->sidef==SD_BXMIT) ? SD_FXMIT : SD_BXMIT; + else + cd->sidef = sdt->sidef; cd->cTotal = 1e-20; /* compute directional total */ sp = myScaffold.darr; for (i = myScaffold.alen; i--; sp++) @@ -584,22 +642,52 @@ SDgetTreCDist(const FVECT inVec, SDComponent *sdc) { const SDTre *sdt; double inCoord[2]; - int vflags; int i; + int mode; SDTreCDst *cd, *cdlast; /* check arguments */ if ((inVec == NULL) | (sdc == NULL) || (sdt = (SDTre *)sdc->dist) == NULL) return NULL; - if (sdt->st->ndim == 3) /* isotropic BSDF? */ + switch (mode = sdt->sidef) { /* check direction */ + case SD_FREFL: + if (inVec[2] < 0) + return NULL; + break; + case SD_BREFL: + if (inVec[2] > 0) + return NULL; + break; + case SD_FXMIT: + if (inVec[2] < 0) + mode = SD_BXMIT; + break; + case SD_BXMIT: + if (inVec[2] > 0) + mode = SD_FXMIT; + break; + default: + return NULL; + } + if (sdt->st->ndim == 3) { /* isotropic BSDF? */ + if (mode != sdt->sidef) /* XXX unhandled reciprocity */ + return &SDemptyCD; inCoord[0] = .5 - .5*sqrt(inVec[0]*inVec[0] + inVec[1]*inVec[1]); - else if (sdt->st->ndim == 4) - SDdisk2square(inCoord, -inVec[0], -inVec[1]); - else + } else if (sdt->st->ndim == 4) { + if (mode != sdt->sidef) /* use reciprocity? */ + SDdisk2square(inCoord, inVec[0], inVec[1]); + else + SDdisk2square(inCoord, -inVec[0], -inVec[1]); + } else return NULL; /* should be internal error */ + /* quantize to avoid f.p. errors */ + for (i = sdt->st->ndim - 2; i--; ) + inCoord[i] = floor(inCoord[i]/quantum)*quantum + .5*quantum; cdlast = NULL; /* check for direction in cache list */ for (cd = (SDTreCDst *)sdc->cdList; cd != NULL; - cdlast = cd, cd = (SDTreCDst *)cd->next) { + cdlast = cd, cd = cd->next) { + if (cd->sidef != mode) + continue; for (i = sdt->st->ndim - 2; i--; ) if ((cd->clim[i][0] > inCoord[i]) | (inCoord[i] >= cd->clim[i][1])) @@ -608,10 +696,10 @@ SDgetTreCDist(const FVECT inVec, SDComponent *sdc) break; /* means we have a match */ } if (cd == NULL) /* need to create new entry? */ - cdlast = cd = make_cdist(sdt, inCoord); + cdlast = cd = make_cdist(sdt, inCoord, mode != sdt->sidef); if (cdlast != NULL) { /* move entry to head of cache list */ cdlast->next = cd->next; - cd->next = sdc->cdList; + cd->next = (SDTreCDst *)sdc->cdList; sdc->cdList = (SDCDst *)cd; } return (SDCDst *)cd; /* ready to go */ @@ -674,20 +762,22 @@ SDsampTreCDist(FVECT ioVec, double randX, const SDCDst const SDTreCDst *cd = (const SDTreCDst *)cdp; const unsigned target = randX*cumlmax; bitmask_t hndx, hcoord[2]; - double gpos[3]; + double gpos[3], rotangle; int i, iupper, ilower; /* check arguments */ if ((ioVec == NULL) | (cd == NULL)) return SDEargument; + if (!cd->sidef) + return SDEnone; /* XXX should never happen */ if (ioVec[2] > 0) { - if (!(cd->sidef & SD_UFRONT)) + if ((cd->sidef != SD_FREFL) & (cd->sidef != SD_FXMIT)) return SDEargument; - } else if (!(cd->sidef & SD_UBACK)) + } else if ((cd->sidef != SD_BREFL) & (cd->sidef != SD_BXMIT)) return SDEargument; /* binary search to find position */ ilower = 0; iupper = cd->calen; while ((i = (iupper + ilower) >> 1) != ilower) - if ((long)target >= (long)cd->carr[i].cuml) + if (target >= cd->carr[i].cuml) ilower = i; else iupper = i; @@ -708,9 +798,14 @@ SDsampTreCDist(FVECT ioVec, double randX, const SDCDst if (gpos[2] > 0) /* paranoia, I hope */ gpos[2] = sqrt(gpos[2]); /* emit from back? */ - if (ioVec[2] > 0 ^ cd->sidef != SD_XMIT) + if ((cd->sidef == SD_BREFL) | (cd->sidef == SD_FXMIT)) gpos[2] = -gpos[2]; - VCOPY(ioVec, gpos); + if (cd->isodist) { /* rotate isotropic result */ + rotangle = atan2(-ioVec[1],-ioVec[0]); + VCOPY(ioVec, gpos); + spinvector(ioVec, ioVec, zvec, rotangle); + } else + VCOPY(ioVec, gpos); return SDEnone; } @@ -780,7 +875,7 @@ load_tree_data(char **spp, int nd) } else { /* else load value grid */ int bsiz; n = count_values(*spp); /* see how big the grid is */ - for (bsiz = 0; bsiz < 8*sizeof(size_t)-1; bsiz += nd) + for (bsiz = 0; bsiz < 8*sizeof(size_t); bsiz += nd) if (1<= 8*sizeof(size_t)) { @@ -813,6 +908,8 @@ get_extrema(SDSpectralDF *df) double stepWidth, dhemi, bmin[4], bmax[4]; stepWidth = SDsmallestLeaf(st); + if (quantum > stepWidth) /* adjust quantization factor */ + quantum = stepWidth; df->minProjSA = M_PI*stepWidth*stepWidth; if (stepWidth < .03125) stepWidth = .03125; /* 1/32 resolution good enough */ @@ -852,7 +949,6 @@ load_bsdf_data(SDData *sd, ezxml_t wdb, int ndim) SDSpectralDF *df; SDTre *sdt; char *sdata; - int i; /* allocate BSDF component */ sdata = ezxml_txt(ezxml_child(wdb, "WavelengthDataDirection")); if (!sdata) @@ -860,20 +956,26 @@ load_bsdf_data(SDData *sd, ezxml_t wdb, int ndim) /* * Remember that front and back are reversed from WINDOW 6 orientations */ - if (!strcasecmp(sdata, "Transmission")) { + if (!strcasecmp(sdata, "Transmission Front")) { + if (sd->tb != NULL) + SDfreeSpectralDF(sd->tb); + if ((sd->tb = SDnewSpectralDF(1)) == NULL) + return SDEmemory; + df = sd->tb; + } else if (!strcasecmp(sdata, "Transmission Back")) { if (sd->tf != NULL) SDfreeSpectralDF(sd->tf); if ((sd->tf = SDnewSpectralDF(1)) == NULL) return SDEmemory; df = sd->tf; } else if (!strcasecmp(sdata, "Reflection Front")) { - if (sd->rb != NULL) /* note back-front reversal */ + if (sd->rb != NULL) SDfreeSpectralDF(sd->rb); if ((sd->rb = SDnewSpectralDF(1)) == NULL) return SDEmemory; df = sd->rb; } else if (!strcasecmp(sdata, "Reflection Back")) { - if (sd->rf != NULL) /* note front-back reversal */ + if (sd->rf != NULL) SDfreeSpectralDF(sd->rf); if ((sd->rf = SDnewSpectralDF(1)) == NULL) return SDEmemory; @@ -893,11 +995,13 @@ load_bsdf_data(SDData *sd, ezxml_t wdb, int ndim) if (sdt == NULL) return SDEmemory; if (df == sd->rf) - sdt->sidef = SD_UFRONT; + sdt->sidef = SD_FREFL; else if (df == sd->rb) - sdt->sidef = SD_UBACK; - else - sdt->sidef = SD_XMIT; + sdt->sidef = SD_BREFL; + else if (df == sd->tf) + sdt->sidef = SD_FXMIT; + else /* df == sd->tb */ + sdt->sidef = SD_BXMIT; sdt->st = NULL; df->comp[0].cspec[0] = c_dfcolor; /* XXX monochrome for now */ df->comp[0].dist = sdt; @@ -957,7 +1061,8 @@ SDsubtractTreVal(SDNode *st, float val) SDsubtractTreVal(st->u.t[n], val); } else { for (n = 1<<(st->ndim*st->log2GR); n--; ) - st->u.v[n] -= val; + if ((st->u.v[n] -= val) < 0) + st->u.v[n] = .0f; } } @@ -971,7 +1076,7 @@ subtract_min(SDNode *st) int n; vmin = 1./M_PI; if (st->log2GR < 0) { - for (n = 0; n < 4; n++) { + for (n = 0; n < 8; n += 2) { float v = SDgetTreMin(st->u.t[n]); if (v < vmin) vmin = v; @@ -1058,7 +1163,10 @@ SDloadTre(SDData *sd, ezxml_t wtl) /* separate diffuse components */ extract_diffuse(&sd->rLambFront, sd->rf); extract_diffuse(&sd->rLambBack, sd->rb); - extract_diffuse(&sd->tLamb, sd->tf); + if (sd->tf != NULL) + extract_diffuse(&sd->tLamb, sd->tf); + if (sd->tb != NULL) + extract_diffuse(&sd->tLamb, sd->tb); /* return success */ return SDEnone; }