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.7 by greg, Tue Sep 7 23:10:50 2010 UTC vs.
Revision 2.9 by greg, Mon Jan 3 19:27:00 2011 UTC

# Line 61 | Line 61 | static ANGLE_BASIS     abase_list[MAXABASES] = {
61  
62   static int      nabases = 3;    /* current number of defined bases */
63  
64 < #define  FEQ(a,b)       ((a)-(b) <= 1e-7 && (b)-(a) <= 1e-7)
64 > #define  FEQ(a,b)       ((a)-(b) <= 1e-6 && (b)-(a) <= 1e-6)
65  
66 + static int
67 + fequal(double a, double b)
68 + {
69 +        if (b != .0)
70 +                a = a/b - 1.;
71 +        return((a <= 1e-6) & (a >= -1e-6));
72 + }
73 +
74   // returns the name of the given tag
75   #ifdef ezxml_name
76   #undef ezxml_name
# Line 227 | Line 235 | load_angle_basis(      /* load custom BSDF angle basis */
235                  if (!i)
236                          abase_list[nabases].lat[i].tmin =
237                                          -abase_list[nabases].lat[i+1].tmin;
238 <                else if (!FEQ(atof(ezxml_txt(ezxml_child(ezxml_child(wbb,
238 >                else if (!fequal(atof(ezxml_txt(ezxml_child(ezxml_child(wbb,
239                                          "ThetaBounds"), "LowerTheta"))),
240                                  abase_list[nabases].lat[i].tmin))
241                          error(WARNING, "theta values disagree in custom basis");
# Line 249 | Line 257 | to_meters(             /* return factor to convert given unit to
257          if (!strcasecmp(unit, "Foot")) return(.3048);
258          if (!strcasecmp(unit, "Inch")) return(.0254);
259          if (!strcasecmp(unit, "Centimeter")) return(.01);
260 +        if (!strcasecmp(unit, "Millimeter")) return(.001);
261          sprintf(errmsg, "unknown dimensional unit '%s'", unit);
262          error(USER, errmsg);
263   }
# Line 445 | Line 454 | check_bsdf_data(       /* check that BSDF data is sane */
454                                  BSDF_value(dp,i,o) = .0f;
455                          }
456                  }
457 <                if (hemi_total > 1.02) {
457 >                if (hemi_total > 1.01) {
458                          sprintf(errmsg,
459                          "incoming BSDF direction %d passes %.1f%% of light",
460                                          i, 100.*hemi_total);
# Line 462 | Line 471 | check_bsdf_data(       /* check that BSDF data is sane */
471                  for (i = dp->ninc; i--; )
472                          hemi_total += BSDF_value(dp,i,o) * omega_iarr[i];
473  
474 <                if (hemi_total > 1.02) {
474 >                if (hemi_total > 1.01) {
475                          sprintf(errmsg,
476                          "outgoing BSDF direction %d collects %.1f%% of light",
477                                          o, 100.*hemi_total);
# Line 471 | Line 480 | check_bsdf_data(       /* check that BSDF data is sane */
480                  full_total += hemi_total*omega_oarr[o];
481          }
482          full_total /= PI;
483 <        if (full_total > 1.02) {
484 <                sprintf(errmsg, "BSDF transfers %.1f%% of light",
483 >        if (full_total > 1.00001) {
484 >                sprintf(errmsg, "BSDF transfers %.4f%% of light",
485                                  100.*full_total);
486                  error(WARNING, errmsg);
487          }

Diff Legend

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