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

Comparing ray/src/common/bsdf_m.c (file contents):
Revision 3.15 by greg, Wed Apr 27 20:03:25 2011 UTC vs.
Revision 3.18 by greg, Thu Jul 7 15:25:09 2011 UTC

# Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11   *
12   */
13  
14 + #define _USE_MATH_DEFINES
15   #include "rtio.h"
16   #include <stdlib.h>
17   #include <math.h>
# Line 86 | Line 87 | fequal(double a, double b)
87          return (a <= 1e-6) & (a >= -1e-6);
88   }
89  
89 – /* Returns the name of the given tag */
90 – #ifdef ezxml_name
91 – #undef ezxml_name
92 – static char *
93 – ezxml_name(ezxml_t xml)
94 – {
95 –        if (xml == NULL)
96 –                return NULL;
97 –        return xml->name;
98 – }
99 – #endif
100 –
90   /* Returns the given tag's character content or empty string if none */
91   #ifdef ezxml_txt
92   #undef ezxml_txt
# Line 189 | Line 178 | fo_getndx(const FVECT v, void *p)
178   {
179          ANGLE_BASIS     *ab = (ANGLE_BASIS *)p;
180          int     li, ndx;
181 <        double  pol, azi, d;
181 >        double  pol, azi;
182  
183          if (v == NULL)
184                  return -1;
# Line 528 | Line 517 | load_bsdf_data(SDData *sd, ezxml_t wdb, int rowinc)
517                  if (*sdnext == ',') sdnext++;
518                  if (rowinc) {
519                          int     r = i/dp->nout;
520 <                        int     c = i - c*dp->nout;
520 >                        int     c = i - r*dp->nout;
521                          mBSDF_value(dp,r,c) = atof(sdata);
522                  } else
523                          dp->bsdf[i] = atof(sdata);
# Line 609 | Line 598 | SDloadMtx(SDData *sd, ezxml_t wtl)
598                                  sd->name);
599                  return SDEsupport;
600          }
601 <                                        /* get angle basis */
602 <        rval = load_angle_basis(ezxml_child(ezxml_child(wtl,
603 <                                "DataDefinition"), "AngleBasis"));
604 <        if (rval < 0)
605 <                return convert_errcode(rval);
601 >                                        /* get angle bases */
602 >        for (wld = ezxml_child(ezxml_child(wtl, "DataDefinition"), "AngleBasis");
603 >                                wld != NULL; wld = wld->next) {
604 >                rval = load_angle_basis(wld);
605 >                if (rval < 0)
606 >                        return convert_errcode(rval);
607 >        }
608                                          /* load BSDF components */
609          for (wld = ezxml_child(wtl, "WavelengthData");
610                                  wld != NULL; wld = wld->next) {
# Line 648 | Line 639 | SDgetMtxBSDF(float coef[SDmaxCh], const FVECT outVec,
639          i_ndx = mBSDF_incndx(dp, inVec);
640          o_ndx = mBSDF_outndx(dp, outVec);
641                                          /* try reciprocity if necessary */
642 <        if ((i_ndx < 0) & (o_ndx < 0)) {
642 >        if ((i_ndx < 0) & (o_ndx < 0) && dp->ninc == dp->nout) {
643                  i_ndx = mBSDF_incndx(dp, outVec);
644                  o_ndx = mBSDF_outndx(dp, inVec);
645          }
# Line 757 | Line 748 | SDgetMtxCDist(const FVECT inVec, SDComponent *sdc)
748                  myCD.ob_vec = dp->ob_vec;
749                  myCD.calen = dp->nout;
750                  reverse = 0;
751 <        } else {                        /* try reciprocity */
751 >        } else if (dp->ninc == dp->nout) {      /* try reciprocity */
752                  myCD.indx = mBSDF_outndx(dp, inVec);
753                  if (myCD.indx < 0)
754                          return NULL;
# Line 807 | Line 798 | SDsampMtxCDist(FVECT ioVec, double randX, const SDCDst
798                                          /* binary search to find index */
799          ilower = 0; iupper = mcd->calen;
800          while ((i = (iupper + ilower) >> 1) != ilower)
801 <                if ((long)target >= (long)mcd->carr[i])
801 >                if (target >= mcd->carr[i])
802                          ilower = i;
803                  else
804                          iupper = i;

Diff Legend

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