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

Comparing src/cv/bsdfrep.h (file contents):
Revision 2.3 by greg, Tue Oct 23 05:10:42 2012 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 */
66   extern int              inp_coverage;
67  
# Line 67 | Line 72 | extern int             single_plane_incident;
72   extern int              input_orient;
73   extern int              output_orient;
74  
75 +                                /* log BSDF histogram */
76 + #define HISTLEN         256
77 + #define BSDF2BIG        (1./M_PI)
78 + #define BSDF2SML        1e-8
79 + #define HISTLNR         17.2759509              /* log(BSDF2BIG/BSDF2SML) */
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 +
84 +                                /* BSDF value for boundary regions */
85 + extern double           bsdf_min;
86 +
87                                  /* processed incident DSF measurements */
88   extern RBFNODE          *dsf_list;
89  
# Line 91 | Line 108 | extern char            *progname;
108                                  /* get theta value in degrees [0,180) range */
109   #define get_theta180(v) ((180./M_PI)*acos((v)[2]))
110                                  /* get phi value in degrees, [0,360) range */
111 < #define get_phi360(v)   ((180./M_PI)*atan2((v)[1],(v)[0]) + 180.)
111 > #define get_phi360(v)   ((180./M_PI)*atan2((v)[1],(v)[0]) + 360.*((v)[1]<0))
112  
113                                  /* our loaded grid for this incident angle */
114   extern double           theta_in_deg, phi_in_deg;
# Line 112 | Line 129 | extern void            rev_symmetry(FVECT vec, int sym);
129   /* Reverse symmetry for an RBF distribution */
130   extern void             rev_rbf_symmetry(RBFNODE *rbf, int sym);
131  
132 + /* Rotate RBF to correspond to given incident vector */
133 + extern void             rotate_rbf(RBFNODE *rbf, const FVECT invec);
134 +
135   /* Compute volume associated with Gaussian lobe */
136   extern double           rbf_volume(const RBFVAL *rbfp);
137  
# Line 167 | Line 187 | extern void            build_mesh(void);
187   extern int              get_interp(MIGRATION *miga[3], FVECT invec);
188  
189   /* Partially advect between recorded incident angles and allocate new RBF */
190 < extern RBFNODE *        advect_rbf(const FVECT invec);
190 > extern RBFNODE *        advect_rbf(const FVECT invec, int lobe_lim);

Diff Legend

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