ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/bsdfrep.c
(Generate patch)

Comparing ray/src/cv/bsdfrep.c (file contents):
Revision 2.30 by greg, Sat Jan 30 01:31:57 2016 UTC vs.
Revision 2.31 by greg, Wed Feb 3 18:53:14 2016 UTC

# Line 310 | Line 310 | eval_rbfcol(SDValue *sv, const RBFNODE *rp, const FVEC
310                  }
311                  res += val;
312          }
313 <        if ((rbf_colorimetry == RBCtristimulus) & (res > 1e-6)) {
313 >        sv->cieY = res / COSF(outvec[2]);
314 >        if (sv->cieY < bsdf_min) {      /* never return less than bsdf_min */
315 >                sv->cieY = bsdf_min;
316 >        } else if (rbf_colorimetry == RBCtristimulus) {
317                  C_CHROMA        cres = (int)(usum/res + frandom());
318                  cres |= (int)(vsum/res + frandom()) << 8;
319                  c_decodeChroma(&sv->spec, cres);
320          }
318 –        sv->cieY = res / COSF(outvec[2]);
319 –        if (sv->cieY < bsdf_min)        /* never return less than bsdf_min */
320 –                sv->cieY = bsdf_min;
321          return(SDEnone);
322   }
323  
# Line 582 | Line 582 | clear_bsdf_rep(void)
582          input_orient = output_orient = 0;
583          rbf_colorimetry = RBCunknown;
584          grid_res = GRIDRES;
585 +        memset(bsdf_hist, 0, sizeof(bsdf_hist));
586          bsdf_min = 0;
587          bsdf_spec_val = 0;
588          bsdf_spec_rad = 0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines