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.33 by greg, Sat Dec 28 18:05:14 2019 UTC

# Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9  
10   #define _USE_MATH_DEFINES
11   #include <stdlib.h>
12 – #include <string.h>
12   #include <math.h>
13   #include "rtio.h"
14   #include "resolu.h"
# Line 310 | Line 309 | eval_rbfcol(SDValue *sv, const RBFNODE *rp, const FVEC
309                  }
310                  res += val;
311          }
312 <        if ((rbf_colorimetry == RBCtristimulus) & (res > 1e-6)) {
312 >        sv->cieY = res / COSF(outvec[2]);
313 >        if (sv->cieY < bsdf_min) {      /* never return less than bsdf_min */
314 >                sv->cieY = bsdf_min;
315 >        } else if (rbf_colorimetry == RBCtristimulus) {
316                  C_CHROMA        cres = (int)(usum/res + frandom());
317                  cres |= (int)(vsum/res + frandom()) << 8;
318                  c_decodeChroma(&sv->spec, cres);
319          }
318 –        sv->cieY = res / COSF(outvec[2]);
319 –        if (sv->cieY < bsdf_min)        /* never return less than bsdf_min */
320 –                sv->cieY = bsdf_min;
320          return(SDEnone);
321   }
322  
# Line 582 | Line 581 | clear_bsdf_rep(void)
581          input_orient = output_orient = 0;
582          rbf_colorimetry = RBCunknown;
583          grid_res = GRIDRES;
584 +        memset(bsdf_hist, 0, sizeof(bsdf_hist));
585          bsdf_min = 0;
586          bsdf_spec_val = 0;
587          bsdf_spec_rad = 0;
# Line 658 | Line 658 | save_bsdf_rep(FILE *ofp)
658   static int
659   headline(char *s, void *p)
660   {
661 <        char    fmt[64];
661 >        char    fmt[MAXFMTLEN];
662          int     i;
663  
664          if (!strncmp(s, "NAME=", 5)) {

Diff Legend

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