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

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.29 by greg, Fri Jun 3 18:12:58 2011 UTC vs.
Revision 2.36 by greg, Sat Sep 17 22:09:33 2011 UTC

# Line 10 | Line 10 | static const char RCSid[] = "$Id$";
10   *
11   */
12  
13 + #define _USE_MATH_DEFINES
14   #include <stdio.h>
15   #include <stdlib.h>
16 + #include <string.h>
17   #include <math.h>
18 + #include <ctype.h>
19   #include "ezxml.h"
20   #include "hilbert.h"
21   #include "bsdf.h"
# Line 106 | Line 109 | SDloadGeometry(SDData *sd, ezxml_t wdb)
109          if ((geom = ezxml_child(wdb, "Geometry")) == NULL ||
110                          (mgfstr = ezxml_txt(geom)) == NULL)
111                  return SDEnone;
112 +        while (isspace(*mgfstr))
113 +                ++mgfstr;
114 +        if (!*mgfstr)
115 +                return SDEnone;
116          if ((fmt = ezxml_attr(geom, "format")) != NULL &&
117                          strcasecmp(fmt, "MGF")) {
118                  sprintf(SDerrorDetail,
# Line 164 | Line 171 | SDloadFile(SDData *sd, const char *fname)
171          }
172                                  /* load geometry if present */
173          lastErr = SDloadGeometry(sd, ezxml_child(wtl, "Material"));
174 <        if (lastErr)
174 >        if (lastErr) {
175 >                ezxml_free(fl);
176                  return lastErr;
177 +        }
178                                  /* try loading variable resolution data */
179          lastErr = SDloadTre(sd, wtl);
180                                  /* check our result */
# Line 243 | Line 252 | SDfreeSpectralDF(SDSpectralDF *df)
252                  return;
253          SDfreeCumulativeCache(df);
254          for (n = df->ncomp; n-- > 0; )
255 <                (*df->comp[n].func->freeSC)(df->comp[n].dist);
255 >                if (df->comp[n].dist != NULL)
256 >                        (*df->comp[n].func->freeSC)(df->comp[n].dist);
257          free(df);
258   }
259  
# Line 415 | Line 425 | SDsampComponent(SDValue *sv, FVECT ioVec, double randX
425          cd = (*sdc->func->getCDist)(inVec, sdc);
426          if (cd == NULL)
427                  return SDEmemory;
428 <        if (cd->cTotal <= 1e-7) {       /* anything to sample? */
428 >        if (cd->cTotal <= 1e-6) {       /* anything to sample? */
429                  sv->spec = c_dfcolor;
430                  sv->cieY = .0;
431                  memset(ioVec, 0, 3*sizeof(double));
# Line 677 | Line 687 | SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
687                  }
688                  sv->cieY += cdarr[i]->cTotal;
689          }
690 <        if (sv->cieY <= 1e-7) {         /* anything to sample? */
690 >        if (sv->cieY <= 1e-6) {         /* anything to sample? */
691                  sv->cieY = .0;
692                  memset(ioVec, 0, 3*sizeof(double));
693                  return SDEnone;
# Line 807 | Line 817 | SDmapDir(FVECT resVec, RREAL vMtx[3][3], const FVECT i
817  
818   #include "standard.h"
819   #include "paths.h"
810 – #include <ctype.h>
820  
821   #define MAXLATS         46              /* maximum number of latitudes */
822  
# Line 927 | Line 936 | ab_getndx(             /* get index corresponding to the given ve
936   {
937          ANGLE_BASIS  *ab = (ANGLE_BASIS *)p;
938          int     li, ndx;
939 <        double  pol, azi, d;
939 >        double  pol, azi;
940  
941          if ((v[2] < -1.0) | (v[2] > 1.0))
942                  return(-1);
# Line 1167 | Line 1176 | check_bsdf_data(       /* check that BSDF data is sane */
1176   )
1177   {
1178          double          *omega_iarr, *omega_oarr;
1179 <        double          dom, contrib, hemi_total, full_total;
1179 >        double          dom, hemi_total, full_total;
1180          int             nneg;
1181          FVECT           v;
1182          int             i, o;
# Line 1317 | Line 1326 | load_BSDF(             /* load BSDF data from file */
1326                  error(WARNING, errmsg);
1327                  ezxml_free(fl);
1328                  return(NULL);
1329 <        }              
1330 <        load_angle_basis(ezxml_child(ezxml_child(wtl,
1331 <                                "DataDefinition"), "AngleBasis"));
1329 >        }
1330 >        for (wld = ezxml_child(ezxml_child(wtl,
1331 >                                "DataDefinition"), "AngleBasis");
1332 >                        wld != NULL; wld = wld->next)
1333 >                load_angle_basis(wld);
1334          dp = (struct BSDF_data *)calloc(1, sizeof(struct BSDF_data));
1335          load_geometry(dp, ezxml_child(wtl, "Material"));
1336          for (wld = ezxml_child(wtl, "WavelengthData");

Diff Legend

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