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.9 by greg, Fri Jun 28 23:18:51 2013 UTC vs.
Revision 2.10 by greg, Thu Sep 26 14:57:18 2013 UTC

# Line 27 | Line 27 | typedef struct {
27          int             nrows, ncols;   /* array size (matches migration) */
28          float           *price;         /* migration prices */
29          short           *sord;          /* sort for each row, low to high */
30 +        float           *prow;          /* current price row */
31   } PRICEMAT;                     /* sorted pricing matrix */
32  
33   #define pricerow(p,i)   ((p)->price + (i)*(p)->ncols)
# Line 139 | Line 140 | static int
140   msrt_cmp(void *b, const void *p1, const void *p2)
141   {
142          PRICEMAT        *pm = (PRICEMAT *)b;
143 <        int             ri = ((const short *)p1 - pm->sord) / pm->ncols;
144 <        float           c1 = pricerow(pm,ri)[*(const short *)p1];
144 <        float           c2 = pricerow(pm,ri)[*(const short *)p2];
143 >        float           c1 = pm->prow[*(const short *)p1];
144 >        float           c2 = pm->prow[*(const short *)p2];
145  
146          if (c1 > c2) return(1);
147          if (c1 < c2) return(-1);
# Line 171 | Line 171 | price_routes(PRICEMAT *pm, const RBFNODE *from_rbf, co
171          for (i = from_rbf->nrbf; i--; ) {
172              const double        from_ang = R2ANG(from_rbf->rbfa[i].crad);
173              FVECT               vfrom;
174 +            short               *srow;
175              ovec_from_pos(vfrom, from_rbf->rbfa[i].gx, from_rbf->rbfa[i].gy);
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 <                pricerow(pm,i)[j] = ((dprod >= 1.) ? .0 : acos(dprod)) +
180 >                pm->prow[j] = ((dprod >= 1.) ? .0 : acos(dprod)) +
181                                  fabs(R2ANG(to_rbf->rbfa[j].crad) - from_ang);
182 <                psortrow(pm,i)[j] = j;
182 >                srow[j] = j;
183              }
184 <            qsort_r(psortrow(pm,i), pm->ncols, sizeof(short), pm, &msrt_cmp);
184 >            qsort_r(srow, pm->ncols, sizeof(short), pm, &msrt_cmp);
185          }
186          free(vto);
187   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines