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.6 by greg, Fri Nov 9 02:16:29 2012 UTC vs.
Revision 2.8 by greg, Wed Mar 20 01:00:22 2013 UTC

# Line 173 | Line 173 | price_routes(PRICEMAT *pm, const RBFNODE *from_rbf, co
173              FVECT               vfrom;
174              ovec_from_pos(vfrom, from_rbf->rbfa[i].gx, from_rbf->rbfa[i].gy);
175              for (j = to_rbf->nrbf; j--; ) {
176 <                pricerow(pm,i)[j] = acos(DOT(vfrom, vto[j])) +
176 >                double          dprod = DOT(vfrom, vto[j]);
177 >                pricerow(pm,i)[j] = ((dprod >= 1.) ? .0 : acos(dprod)) +
178                                  fabs(R2ANG(to_rbf->rbfa[j].crad) - from_ang);
179                  psortrow(pm,i)[j] = j;
180              }
# Line 288 | Line 289 | create_migration(RBFNODE *from_rbf, RBFNODE *to_rbf)
289                  if (newmig->rbfv[1] == to_rbf)
290                          return(NULL);
291                                                  /* else allocate */
292 + #ifdef DEBUG
293 +        fprintf(stderr, "Building path from (theta,phi) (%.0f,%.0f) ",
294 +                        get_theta180(from_rbf->invec),
295 +                        get_phi360(from_rbf->invec));
296 +        fprintf(stderr, "to (%.0f,%.0f) with %d x %d matrix\n",
297 +                        get_theta180(to_rbf->invec),
298 +                        get_phi360(to_rbf->invec),
299 +                        from_rbf->nrbf, to_rbf->nrbf);
300 + #endif
301          newmig = new_migration(from_rbf, to_rbf);
302          if (run_subprocess())
303                  return(newmig);                 /* child continues */
# Line 299 | Line 309 | create_migration(RBFNODE *from_rbf, RBFNODE *to_rbf)
309                                  progname);
310                  exit(1);
311          }
302 #ifdef DEBUG
303        fprintf(stderr, "Building path from (theta,phi) (%.0f,%.0f) ",
304                        get_theta180(from_rbf->invec),
305                        get_phi360(from_rbf->invec));
306        fprintf(stderr, "to (%.0f,%.0f) with %d x %d matrix\n",
307                        get_theta180(to_rbf->invec),
308                        get_phi360(to_rbf->invec),
309                        from_rbf->nrbf, to_rbf->nrbf);
310 #endif
312                                                  /* starting quantities */
313          memset(newmig->mtx, 0, sizeof(float)*from_rbf->nrbf*to_rbf->nrbf);
314          for (i = from_rbf->nrbf; i--; )
# Line 437 | Line 438 | mesh_from_edge(MIGRATION *edge)
438                  }
439          }
440   }
441 +
442 + /* Compute minimum BSDF from histogram and clear it */
443 + static void
444 + comp_bsdf_min()
445 + {
446 +        int     cnt;
447 +        int     i, target;
448 +
449 +        cnt = 0;
450 +        for (i = HISTLEN; i--; )
451 +                cnt += bsdf_hist[i];
452 +
453 +        target = cnt/100;                       /* ignore bottom 1% */
454 +        cnt = 0;
455 +        for (i = 0; cnt <= target; i++)
456 +                cnt += bsdf_hist[i];
457 +        bsdf_min = histval(i-1);
458 +        memset(bsdf_hist, 0, sizeof(bsdf_hist));
459 + }
460          
461   /* Build our triangle mesh from recorded RBFs */
462   void
# Line 472 | Line 492 | build_mesh(void)
492                  mesh_from_edge(create_migration(shrt_edj[0], shrt_edj[1]));
493          else
494                  mesh_from_edge(create_migration(shrt_edj[1], shrt_edj[0]));
495 +                                                /* compute minimum BSDF */
496 +        comp_bsdf_min();
497                                                  /* complete migrations */
498          await_children(nchild);
499   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines