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

Comparing ray/src/cv/bsdfrep.h (file contents):
Revision 2.12 by greg, Wed Feb 19 05:16:06 2014 UTC vs.
Revision 2.15 by greg, Sat Mar 8 18:16:49 2014 UTC

# Line 16 | Line 16
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 int    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 106 | Line 108 | extern MIGRATION       *mig_list;
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]) + 360.*((v)[1]<0))
114  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)