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

Comparing ray/src/cv/bsdfmesh.c (file contents):
Revision 2.30 by greg, Thu Aug 21 10:33:48 2014 UTC vs.
Revision 2.32 by greg, Thu Aug 21 19:31:23 2014 UTC

# Line 72 | Line 72 | est_DSFrad(const RBFNODE *rbf, const FVECT outvec)
72          double          DSFoutside = eval_DSFsurround(rbf, outvec, outside_rad);
73   #define interp_rad      inside_rad + (outside_rad-inside_rad) * \
74                                  (DSFtarget-DSFinside) / (DSFoutside-DSFinside)
75 <                                                /* interpolation search */
76 <        while (outside_rad-inside_rad > rad_epsilon) {
75 >                                                /* Newton's method (sort of) */
76 >        do {
77                  double  test_rad = interp_rad;
78 <                double  DSFtest = eval_DSFsurround(rbf, outvec, test_rad);
79 <                if (DSFtarget < DSFtest) {
78 >                double  DSFtest;
79 >                if (test_rad >= outside_rad)
80 >                        return(test_rad);
81 >                if (test_rad <= inside_rad)
82 >                        return(test_rad*(test_rad>0));
83 >                DSFtest = eval_DSFsurround(rbf, outvec, test_rad);
84 >                if (DSFtest > DSFtarget) {
85                          inside_rad = test_rad;
86                          DSFinside = DSFtest;
87                  } else {
88                          outside_rad = test_rad;
89                          DSFoutside = DSFtest;
90                  }
91 <        }
91 >                if (DSFoutside >= DSFinside)
92 >                        return(test_rad);
93 >        } while (outside_rad-inside_rad > rad_epsilon);
94          return(interp_rad);
95   #undef interp_rad
96   }
# Line 100 | Line 107 | comp_bsdf_spec(void)
107  
108          if (dsf_list == NULL) {
109                  bsdf_spec_peak = 0;
110 <                bsdf_spec_crad = 0;
110 >                bsdf_spec_rad = 0;
111                  return;
112          }
113          for (rbf = dsf_list; rbf != NULL; rbf = rbf->next) {
# Line 112 | Line 119 | comp_bsdf_spec(void)
119                  ++n;
120          }
121          bsdf_spec_peak = peak_sum/(double)n;
122 <        bsdf_spec_crad = ANG2R( rad_sum/(double)n );
122 >        bsdf_spec_rad = rad_sum/(double)n;
123   }
124  
125   /* Create a new migration holder (sharing memory for multiprocessing) */

Diff Legend

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