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.14 by greg, Sat Mar 8 06:37:59 2014 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 */
22 <        unsigned short  crad;           /* radius (coded angle) */
21 >        unsigned int    nval;           /* number of values in sum */
22   } GRIDVAL;                      /* grid value */
23  
24   typedef struct {
# Line 57 | Line 56 | typedef struct s_rbfnode {
56   #define INP_QUAD3       4               /* 180-270 degree quadrant */
57   #define INP_QUAD4       8               /* 270-360 degree quadrant */
58  
59 +                                /* name and manufacturer if known */
60 + extern char             bsdf_name[];
61 + extern char             bsdf_manuf[];
62                                  /* active grid resolution */
63   extern int              grid_res;
64                                  /* coverage/symmetry using INP_QUAD? flags */
# Line 74 | Line 76 | extern int             output_orient;
76   #define BSDF2BIG        (1./M_PI)
77   #define BSDF2SML        1e-8
78   #define HISTLNR         17.2759509              /* log(BSDF2BIG/BSDF2SML) */
79 < extern int              bsdf_hist[HISTLEN];
79 > extern unsigned long    bsdf_hist[HISTLEN];
80   #define histndx(v)      (int)(log((v)*(1./BSDF2SML))*(HISTLEN/HISTLNR))
81   #define histval(i)      (exp(((i)+.5)*(HISTLNR/HISTLEN))*BSDF2SML)
82  
# Line 103 | Line 105 | extern MIGRATION       *mig_list;
105   extern char             *progname;
106  
107                                  /* get theta value in degrees [0,180) range */
108 < #define get_theta180(v) ((180./M_PI)*acos((v)[2]))
108 > #define get_theta180(v) ((180./M_PI)*Acos((v)[2]))
109                                  /* get phi value in degrees, [0,360) range */
110   #define get_phi360(v)   ((180./M_PI)*atan2((v)[1],(v)[0]) + 360.*((v)[1]<0))
111  
# Line 182 | Line 184 | extern void            build_mesh(void);
184  
185   /* Find edge(s) for interpolating the given vector, applying symmetry */
186   extern int              get_interp(MIGRATION *miga[3], FVECT invec);
187 +
188 + /* Advect and allocate new RBF along edge (internal call) */
189 + extern RBFNODE *        e_advect_rbf(const MIGRATION *mig,
190 +                                        const FVECT invec, int lobe_lim);
191  
192   /* Partially advect between recorded incident angles and allocate new RBF */
193   extern RBFNODE *        advect_rbf(const FVECT invec, int lobe_lim);

Diff Legend

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