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

Comparing ray/src/cv/bsdfrep.h (file contents):
Revision 2.8 by greg, Thu Sep 26 17:05:00 2013 UTC vs.
Revision 2.11 by greg, Sat Nov 9 05:47:49 2013 UTC

# Line 10 | Line 10
10   #define DEBUG           1
11  
12   #ifndef GRIDRES
13 < #define GRIDRES         200             /* grid resolution per side */
13 > #define GRIDRES         (1<<8)          /* grid resolution per side */
14   #endif
15                                          /* convert to/from coded radians */
16   #define ANG2R(r)        (int)((r)*((1<<16)/M_PI))
# Line 18 | Line 18
18  
19   typedef struct {
20          float           vsum;           /* DSF sum */
21 <        unsigned short  nval;           /* number of values in sum */
21 >        unsigned int    nval;           /* number of values in sum */
22          unsigned short  crad;           /* radius (coded angle) */
23   } GRIDVAL;                      /* grid value */
24  
# Line 57 | Line 57 | typedef struct s_rbfnode {
57   #define INP_QUAD3       4               /* 180-270 degree quadrant */
58   #define INP_QUAD4       8               /* 270-360 degree quadrant */
59  
60 +                                /* name and manufacturer if known */
61 + extern char             bsdf_name[];
62 + extern char             bsdf_manuf[];
63                                  /* active grid resolution */
64   extern int              grid_res;
65                                  /* coverage/symmetry using INP_QUAD? flags */
# Line 74 | Line 77 | extern int             output_orient;
77   #define BSDF2BIG        (1./M_PI)
78   #define BSDF2SML        1e-8
79   #define HISTLNR         17.2759509              /* log(BSDF2BIG/BSDF2SML) */
80 < extern int              bsdf_hist[HISTLEN];
80 > extern unsigned long    bsdf_hist[HISTLEN];
81   #define histndx(v)      (int)(log((v)*(1./BSDF2SML))*(HISTLEN/HISTLNR))
82   #define histval(i)      (exp(((i)+.5)*(HISTLNR/HISTLEN))*BSDF2SML)
83  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines