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

Comparing ray/src/cv/pabopto2bsdf.c (file contents):
Revision 2.17 by greg, Tue Mar 18 19:08:24 2014 UTC vs.
Revision 2.18 by greg, Wed Mar 19 00:19:11 2014 UTC

# Line 25 | Line 25 | typedef struct {
25          long            dstart;         /* data start offset in file */
26   } PGINPUT;
27  
28 < const double    ANGLE_EPS = 180./2./GRIDRES;
28 > double          angle_eps = 0;  /* epsilon for angle comparisons */
29  
30   PGINPUT         *inpfile;       /* input files sorted by incidence */
31   int             ninpfiles;      /* number of input files */
# Line 37 | Line 37 | cmp_inang(const void *p1, const void *p2)
37          const PGINPUT   *inp1 = (const PGINPUT *)p1;
38          const PGINPUT   *inp2 = (const PGINPUT *)p2;
39          
40 <        if (inp1->theta > inp2->theta+ANGLE_EPS)
40 >        if (inp1->theta > inp2->theta+angle_eps)
41                  return(1);
42 <        if (inp1->theta < inp2->theta-ANGLE_EPS)
42 >        if (inp1->theta < inp2->theta-angle_eps)
43                  return(-1);
44 <        if (inp1->phi > inp2->phi+ANGLE_EPS)
44 >        if (inp1->phi > inp2->phi+angle_eps)
45                  return(1);
46 <        if (inp1->phi < inp2->phi-ANGLE_EPS)
46 >        if (inp1->phi < inp2->phi-angle_eps)
47                  return(-1);
48          return(0);
49   }
# Line 124 | Line 124 | add_pabopto_inp(const int i)
124                  return(0);
125          }
126                                          /* prepare input grid */
127 +        angle_eps = 180./2./GRIDRES;
128          if (!i || cmp_inang(&inpfile[i-1], &inpfile[i])) {
129                  if (i)                  /* need to process previous incidence */
130                          make_rbfrep();
# Line 183 | Line 184 | main(int argc, char *argv[])
184          for (i = 0; i < ninpfiles; i++)
185                  if (!init_pabopto_inp(i, argv[i+1]))
186                          return(1);
187 +        angle_eps = 0;
188          qsort(inpfile, ninpfiles, sizeof(PGINPUT), &cmp_inang);
189                                                  /* compile measurements */
190          for (i = 0; i < ninpfiles; i++)

Diff Legend

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