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.2 by greg, Sat Oct 20 07:02:00 2012 UTC vs.
Revision 2.10 by greg, Mon Oct 21 18:33:15 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 +                                /* active grid resolution */
61 + extern int              grid_res;
62 +                                /* coverage/symmetry using INP_QUAD? flags */
63   extern int              inp_coverage;
64  
65                                  /* all incident angles in-plane so far? */
# Line 66 | Line 69 | extern int             single_plane_incident;
69   extern int              input_orient;
70   extern int              output_orient;
71  
72 +                                /* log BSDF histogram */
73 + #define HISTLEN         256
74 + #define BSDF2BIG        (1./M_PI)
75 + #define BSDF2SML        1e-8
76 + #define HISTLNR         17.2759509              /* log(BSDF2BIG/BSDF2SML) */
77 + extern unsigned long    bsdf_hist[HISTLEN];
78 + #define histndx(v)      (int)(log((v)*(1./BSDF2SML))*(HISTLEN/HISTLNR))
79 + #define histval(i)      (exp(((i)+.5)*(HISTLNR/HISTLEN))*BSDF2SML)
80 +
81 +                                /* BSDF value for boundary regions */
82 + extern double           bsdf_min;
83 +
84                                  /* processed incident DSF measurements */
85   extern RBFNODE          *dsf_list;
86  
87                                  /* RBF-linking matrices (edges) */
88   extern MIGRATION        *mig_list;
89  
90 <                                /* migration edges drawn in raster fashion */
91 < extern MIGRATION        *mig_grid[GRIDRES][GRIDRES];
77 <
78 < #define mtx_nrows(m)    ((m)->rbfv[0]->nrbf)
79 < #define mtx_ncols(m)    ((m)->rbfv[1]->nrbf)
90 > #define mtx_nrows(m)    (m)->rbfv[0]->nrbf
91 > #define mtx_ncols(m)    (m)->rbfv[1]->nrbf
92   #define mtx_coef(m,i,j) (m)->mtx[(i)*mtx_ncols(m) + (j)]
93   #define is_src(rbf,m)   ((rbf) == (m)->rbfv[0])
94   #define is_dest(rbf,m)  ((rbf) == (m)->rbfv[1])
# Line 91 | Line 103 | extern MIGRATION       *mig_grid[GRIDRES][GRIDRES];
103   extern char             *progname;
104  
105                                  /* get theta value in degrees [0,180) range */
106 < #define get_theta180(v) (180./M_PI)*acos((v)[2])
106 > #define get_theta180(v) ((180./M_PI)*acos((v)[2]))
107                                  /* get phi value in degrees, [0,360) range */
108 < #define get_phi360(v)   ((180./M_PI)*atan2((v)[1],(v)[0]) + 180.)
108 > #define get_phi360(v)   ((180./M_PI)*atan2((v)[1],(v)[0]) + 360.*((v)[1]<0))
109  
110                                  /* our loaded grid for this incident angle */
111   extern double           theta_in_deg, phi_in_deg;
# Line 114 | Line 126 | extern void            rev_symmetry(FVECT vec, int sym);
126   /* Reverse symmetry for an RBF distribution */
127   extern void             rev_rbf_symmetry(RBFNODE *rbf, int sym);
128  
129 + /* Rotate RBF to correspond to given incident vector */
130 + extern void             rotate_rbf(RBFNODE *rbf, const FVECT invec);
131 +
132   /* Compute volume associated with Gaussian lobe */
133   extern double           rbf_volume(const RBFVAL *rbfp);
134  
# Line 143 | Line 158 | extern int             is_rev_tri(const FVECT v1,
158   /* Find vertices completing triangles on either side of the given edge */
159   extern int              get_triangles(RBFNODE *rbfv[2], const MIGRATION *mig);
160  
161 + /* Clear our BSDF representation and free memory */
162 + extern void             clear_bsdf_rep(void);
163 +
164   /* Write our BSDF mesh interpolant out to the given binary stream */
165   extern void             save_bsdf_rep(FILE *ofp);
166  
# Line 162 | Line 180 | extern RBFNODE *       make_rbfrep(void);
180   /* Build our triangle mesh from recorded RBFs */
181   extern void             build_mesh(void);
182  
165 – /* Draw edge list into mig_grid array */
166 – extern void             draw_edges(void);
167 –
183   /* Find edge(s) for interpolating the given vector, applying symmetry */
184   extern int              get_interp(MIGRATION *miga[3], FVECT invec);
185  
186   /* Partially advect between recorded incident angles and allocate new RBF */
187 < extern RBFNODE *        advect_rbf(const FVECT invec);
187 > extern RBFNODE *        advect_rbf(const FVECT invec, int lobe_lim);

Diff Legend

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