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

Comparing ray/src/common/bsdf_t.h (file contents):
Revision 3.7 by greg, Wed Apr 27 20:03:25 2011 UTC vs.
Revision 3.13 by greg, Fri Jan 5 21:00:24 2018 UTC

# Line 29 | Line 29 | typedef struct SDNode_s {
29          } u;                    /* subtrees or values (extends struct) */
30   } SDNode;
31  
32 < #define SD_UFRONT       0x1     /* flag for BSDF uses front side */
33 < #define SD_UBACK        0x2     /* flag for BSDF uses back side */
34 < #define SD_XMIT         0x3     /* combine the two for transmission */
32 > #define SD_FREFL        1       /* component reflects off front side */
33 > #define SD_BREFL        2       /* component reflects off back side */
34 > #define SD_FXMIT        3       /* component transmits through front side */
35 > #define SD_BXMIT        4       /* component transmits through back side */
36  
37   /* Variable-resolution BSDF holder */
38   typedef struct {
39 <        int     sidef;          /* transmitted component? */
40 <        SDNode  *st;            /* BSDF tree */
39 >        int     sidef;          /* which component */
40 >        SDNode  *stc[3];        /* BSDF (Y,u,v) trees */
41   } SDTre;
42  
43   /* Holder for cumulative distribution (sum of BSDF * projSA) */
44 < typedef struct {
45 <        SD_CDIST_BASE;          /* base fields; must come first */
44 > typedef struct SDTreCDst_s {
45 >                                /* base fields; must come first */
46 >        SD_CDIST_BASE(SDTreCDst_s);
47          double  clim[2][2];     /* input coordinate limits */
48          double  max_psa;        /* maximum projected solid angle */
49 <        int     sidef;          /* which side(s) to use */
49 >        short   sidef;          /* which mode is in play */
50 >        short   isodist;        /* isotropic distribution? */
51          int     calen;          /* cumulative array length */
52          struct {
53                  unsigned        hndx;   /* hilbert index */
54                  unsigned        cuml;   /* cumulative value */
55 <        }               carr[1];        /* cumulative array (extends struct) */
55 >        }       carr[1];        /* cumulative array (extends struct) */
56   } SDTreCDst;    
57  
58   #ifdef _EZXML_H
# Line 58 | Line 61 | extern SDError         SDloadTre(SDData *sd, ezxml_t wtl);
61   #endif
62  
63   /* Our matrix handling routines */
64 < extern SDFunc   SDhandleTre;
64 > extern const SDFunc     SDhandleTre;
65  
66   #ifdef __cplusplus
67   }

Diff Legend

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