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

Comparing ray/src/cv/bsdfmesh.c (file contents):
Revision 2.12 by greg, Sun Oct 27 20:16:06 2013 UTC vs.
Revision 2.13 by greg, Fri Nov 1 18:23:50 2013 UTC

# Line 176 | Line 176 | price_routes(PRICEMAT *pm, const RBFNODE *from_rbf, co
176              pm->prow = pricerow(pm,i);
177              srow = psortrow(pm,i);
178              for (j = to_rbf->nrbf; j--; ) {
179 <                double          dprod = DOT(vfrom, vto[j]);
180 <                pm->prow[j] = ((dprod >= 1.) ? .0 : acos(dprod)) +
181 <                                fabs(R2ANG(to_rbf->rbfa[j].crad) - from_ang);
179 >                double          d;              /* quadratic cost function */
180 >                d = DOT(vfrom, vto[j]);
181 >                d = (d >= 1.) ? .0 : acos(d);
182 >                pm->prow[j] = d*d;
183 >                d = R2ANG(to_rbf->rbfa[j].crad) - from_ang;
184 >                pm->prow[j] += d*d;    
185                  srow[j] = j;
186              }
187              qsort_r(srow, pm->ncols, sizeof(short), pm, &msrt_cmp);

Diff Legend

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