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.1 by greg, Fri Oct 19 04:14:29 2012 UTC vs.
Revision 2.17 by greg, Wed Mar 19 19:48:57 2014 UTC

# Line 7 | Line 7
7  
8   #include "bsdf.h"
9  
10 < #define DEBUG           1
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))
17   #define R2ANG(c)        (((c)+.5)*(M_PI/(1<<16)))
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) */
19 > typedef union {
20 >        struct {
21 >                float           v;              /* DSF sum */
22 >                unsigned int    n;              /* number of values in sum */
23 >        }       sum;                    /* sum for averaging */
24 >        float   val[2];                 /* comparison values */
25   } GRIDVAL;                      /* grid value */
26  
27   typedef struct {
# Line 57 | Line 59 | typedef struct s_rbfnode {
59   #define INP_QUAD3       4               /* 180-270 degree quadrant */
60   #define INP_QUAD4       8               /* 270-360 degree quadrant */
61  
62 +                                /* name and manufacturer if known */
63 + extern char             bsdf_name[];
64 + extern char             bsdf_manuf[];
65 +                                /* active grid resolution */
66 + extern int              grid_res;
67 +                                /* coverage/symmetry using INP_QUAD? flags */
68   extern int              inp_coverage;
69  
70                                  /* all incident angles in-plane so far? */
# Line 66 | Line 74 | extern int             single_plane_incident;
74   extern int              input_orient;
75   extern int              output_orient;
76  
77 +                                /* log BSDF histogram */
78 + #define HISTLEN         256
79 + #define BSDF2BIG        (1./M_PI)
80 + #define BSDF2SML        1e-8
81 + #define HISTLNR         17.2759509              /* log(BSDF2BIG/BSDF2SML) */
82 + extern unsigned long    bsdf_hist[HISTLEN];
83 + #define histndx(v)      (int)(log((v)*(1./BSDF2SML))*(HISTLEN/HISTLNR))
84 + #define histval(i)      (exp(((i)+.5)*(HISTLNR/HISTLEN))*BSDF2SML)
85 +
86 +                                /* BSDF value for boundary regions */
87 + extern double           bsdf_min;
88 +
89                                  /* processed incident DSF measurements */
90   extern RBFNODE          *dsf_list;
91  
92                                  /* RBF-linking matrices (edges) */
93   extern MIGRATION        *mig_list;
94  
95 <                                /* migration edges drawn in raster fashion */
96 < extern MIGRATION        *mig_grid[GRIDRES][GRIDRES];
97 <
78 < #define mtx_nrows(m)    ((m)->rbfv[0]->nrbf)
79 < #define mtx_ncols(m)    ((m)->rbfv[1]->nrbf)
80 < #define mtx_ndx(m,i,j)  ((i)*mtx_ncols(m) + (j))
95 > #define mtx_nrows(m)    (m)->rbfv[0]->nrbf
96 > #define mtx_ncols(m)    (m)->rbfv[1]->nrbf
97 > #define mtx_coef(m,i,j) (m)->mtx[(i)*mtx_ncols(m) + (j)]
98   #define is_src(rbf,m)   ((rbf) == (m)->rbfv[0])
99   #define is_dest(rbf,m)  ((rbf) == (m)->rbfv[1])
100   #define nextedge(rbf,m) (m)->enxt[is_dest(rbf,m)]
# Line 85 | Line 102 | extern MIGRATION       *mig_grid[GRIDRES][GRIDRES];
102  
103   #define round(v)        (int)((v) + .5 - ((v) < -.5))
104  
105 < #define BSDFREP_FMT     "binary_RBF_BSDF_mesh"
105 > #define BSDFREP_FMT     "BSDF_RBFmesh"
106  
107                                  /* global argv[0] */
108   extern char             *progname;
109  
110                                  /* get theta value in degrees [0,180) range */
111 < #define get_theta180(v) (180./M_PI)*acos((v)[2])
111 > #define get_theta180(v) ((180./M_PI)*Acos((v)[2]))
112                                  /* get phi value in degrees, [0,360) range */
113 < #define get_phi360(v)   ((180./M_PI)*atan2((v)[1],(v)[0]) + 180.)
113 > #define get_phi360(v)   ((180./M_PI)*atan2((v)[1],(v)[0]) + 360.*((v)[1]<0))
114  
115                                  /* our loaded grid for this incident angle */
116   extern double           theta_in_deg, phi_in_deg;
# Line 114 | Line 131 | extern void            rev_symmetry(FVECT vec, int sym);
131   /* Reverse symmetry for an RBF distribution */
132   extern void             rev_rbf_symmetry(RBFNODE *rbf, int sym);
133  
134 + /* Rotate RBF to correspond to given incident vector */
135 + extern void             rotate_rbf(RBFNODE *rbf, const FVECT invec);
136 +
137   /* Compute volume associated with Gaussian lobe */
138   extern double           rbf_volume(const RBFVAL *rbfp);
139  
# Line 143 | Line 163 | extern int             is_rev_tri(const FVECT v1,
163   /* Find vertices completing triangles on either side of the given edge */
164   extern int              get_triangles(RBFNODE *rbfv[2], const MIGRATION *mig);
165  
166 + /* Clear our BSDF representation and free memory */
167 + extern void             clear_bsdf_rep(void);
168 +
169   /* Write our BSDF mesh interpolant out to the given binary stream */
170   extern void             save_bsdf_rep(FILE *ofp);
171  
# Line 162 | Line 185 | extern RBFNODE *       make_rbfrep(void);
185   /* Build our triangle mesh from recorded RBFs */
186   extern void             build_mesh(void);
187  
165 /* Draw edge list into mig_grid array */
166 extern void             draw_edges(void);
167
188   /* Find edge(s) for interpolating the given vector, applying symmetry */
189   extern int              get_interp(MIGRATION *miga[3], FVECT invec);
190  
191 + /* Advect and allocate new RBF along edge (internal call) */
192 + extern RBFNODE *        e_advect_rbf(const MIGRATION *mig,
193 +                                        const FVECT invec, int lobe_lim);
194 +
195   /* Partially advect between recorded incident angles and allocate new RBF */
196 < extern RBFNODE *        advect_rbf(const FVECT invec);
196 > extern RBFNODE *        advect_rbf(const FVECT invec, int lobe_lim);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines