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

Comparing ray/src/cv/bsdfrbf.c (file contents):
Revision 2.13 by greg, Mon Oct 21 21:48:42 2013 UTC vs.
Revision 2.19 by greg, Sun Mar 2 01:56:03 2014 UTC

# Line 35 | Line 35 | static const char RCSid[] = "$Id$";
35   #define SMOOTH_MSE      5e-5            /* acceptable mean squared error */
36   #endif
37   #ifndef SMOOTH_MSER
38 < #define SMOOTH_MSER     0.07            /* acceptable relative MSE */
38 > #define SMOOTH_MSER     0.03            /* acceptable relative MSE */
39   #endif
40   #define MAX_RAD         (GRIDRES/8)     /* maximum lobe radius */
41  
# Line 91 | Line 91 | add_bsdf_data(double theta_out, double phi_out, double
91   static void
92   comp_bsdf_min()
93   {
94 <        int     cnt;
95 <        int     i, target;
94 >        unsigned long   cnt, target;
95 >        int             i;
96  
97          cnt = 0;
98          for (i = HISTLEN; i--; )
# Line 147 | Line 147 | smooth_region(int x0, int x1, int y0, int y1)
147                          xvec[2] += z;
148                  }
149          rMtx[1][0] = rMtx[0][1];
150 +        rMtx[2][0] = rMtx[0][2];
151          rMtx[2][1] = rMtx[1][2];
152          nvs = rMtx[2][2];
153          if (SDinvXform(rMtx, rMtx) != SDEnone)
154 <                return(0);
154 >                return(1);              /* colinear values */
155          A = DOT(rMtx[0], xvec);
156          B = DOT(rMtx[1], xvec);
157          C = DOT(rMtx[2], xvec);
# Line 223 | Line 224 | build_rbfrep(RBFVAL **arp, int *np, int x0, int x1, in
224          if (!nleaves)                   /* nothing but branches? */
225                  return(nadded);
226                                          /* combine 4 leaves into 1? */
227 <        if (nleaves == 4 && x1-x0 < MAX_RAD && smooth_region(x0, x1, y0, y1))
227 >        if ((nleaves == 4) & (x1-x0 <= MAX_RAD) &&
228 >                        smooth_region(x0, x1, y0, y1))
229                  return(0);
230                                          /* need more array space? */
231          if ((*np+nleaves-1)>>RBFALLOCB != (*np-1)>>RBFALLOCB) {

Diff Legend

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