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

Comparing ray/src/cv/bsdf2klems.c (file contents):
Revision 2.10 by greg, Thu Sep 26 17:05:00 2013 UTC vs.
Revision 2.12 by greg, Thu Nov 21 20:09:06 2013 UTC

# Line 58 | Line 58 | xml_header(int ac, char *av[])
58   static void
59   xml_prologue(const SDData *sd)
60   {
61 <        const char      *matn = (sd && sd->matn[0]) ? sd->matn : "Name";
62 <        const char      *makr = (sd && sd->makr[0]) ? sd->makr : "Manufacturer";
61 >        const char      *matn = (sd && sd->matn[0]) ? sd->matn :
62 >                                bsdf_name[0] ? bsdf_name : "Unknown";
63 >        const char      *makr = (sd && sd->makr[0]) ? sd->makr :
64 >                                bsdf_manuf[0] ? bsdf_manuf : "Unknown";
65          ANGLE_BASIS     *abp = get_basis(kbasis);
66          int             i;
67  
# Line 331 | Line 333 | eval_rbf(void)
333                      else
334                          bo_getvec(vout, j+(n+frandom())/npsamps, abp);
335  
336 <                    sum += eval_rbfrep(rbf, vout) / vout[2];
336 >                    sum += eval_rbfrep(rbf, vout);
337                  }
338 <                bsdfarr[j*abp->nangles + i] = sum*output_orient/npsamps;
338 >                fo_getvec(vout, j+.5, abp);     /* use centered secant */
339 >                bsdfarr[j*abp->nangles + i] = sum / (npsamps*vout[2]);
340              }
341              if (rbf != NULL)
342                  free(rbf);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)