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

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.16 by greg, Sat Feb 19 01:48:59 2011 UTC vs.
Revision 2.18 by greg, Fri Apr 8 23:23:28 2011 UTC

# Line 85 | Line 85 | SDloadGeometry(SDData *sd, ezxml_t wdb)
85  
86          if (wdb == NULL)                /* no geometry section? */
87                  return SDEnone;
88 –        sprintf(SDerrorDetail, "Negative size in \"%s\"", sd->name);
88          sd->dim[0] = sd->dim[1] = sd->dim[2] = .0;
89          if ((geom = ezxml_child(wdb, "Width")) != NULL)
90                  sd->dim[0] = atof(ezxml_txt(geom)) *
# Line 96 | Line 95 | SDloadGeometry(SDData *sd, ezxml_t wdb)
95          if ((geom = ezxml_child(wdb, "Thickness")) != NULL)
96                  sd->dim[2] = atof(ezxml_txt(geom)) *
97                                  to_meters(ezxml_attr(geom, "unit"));
98 <        if ((sd->dim[0] < .0) | (sd->dim[1] < .0) | (sd->dim[2] < .0))
98 >        if ((sd->dim[0] < .0) | (sd->dim[1] < .0) | (sd->dim[2] < .0)) {
99 >                sprintf(SDerrorDetail, "Negative size in \"%s\"", sd->name);
100                  return SDEdata;
101 +        }
102          if ((geom = ezxml_child(wdb, "Geometry")) == NULL ||
103                          (mgfstr = ezxml_txt(geom)) == NULL)
104                  return SDEnone;
# Line 450 | Line 451 | SDmultiSamp(double t[], int n, double randX)
451          bitmask_t       ndx, coord[MS_MAXDIM];
452          
453          while (n > MS_MAXDIM)           /* punt for higher dimensions */
454 <                t[--n] = drand48();
454 >                t[--n] = rand()*(1./RAND_MAX);
455          nBits = (8*sizeof(bitmask_t) - 1) / n;
456          ndx = randX * (double)((bitmask_t)1 << (nBits*n));
457                                          /* get coordinate on Hilbert curve */
# Line 458 | Line 459 | SDmultiSamp(double t[], int n, double randX)
459                                          /* convert back to [0,1) range */
460          scale = 1. / (double)((bitmask_t)1 << nBits);
461          while (n--)
462 <                t[n] = scale * ((double)coord[n] + drand48());
462 >                t[n] = scale * ((double)coord[n] + rand()*(1./RAND_MAX));
463   }
464  
465   #undef MS_MAXDIM
# Line 488 | Line 489 | SDsizeBSDF(double *projSA, const FVECT vec, int qflags
489          if ((projSA == NULL) | (vec == NULL) | (sd == NULL))
490                  return SDEargument;
491                                          /* initialize extrema */
492 <        switch (qflags & SDqueryMin+SDqueryMax) {
492 >        switch (qflags) {
493          case SDqueryMax:
494                  projSA[0] = .0;
495                  break;
# Line 518 | Line 519 | SDsizeBSDF(double *projSA, const FVECT vec, int qflags
519                  if (ec)
520                          return ec;
521          }
522 <        return ec;
522 >        if (ec) {                       /* all diffuse? */
523 >                projSA[0] = M_PI;
524 >                if (qflags == SDqueryMin+SDqueryMax)
525 >                        projSA[1] = M_PI;
526 >        }
527 >        return SDEnone;
528   }
529  
530   /* Return BSDF for the given incident and scattered ray vectors */

Diff Legend

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