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

Comparing ray/src/gen/mkillum.h (file contents):
Revision 2.13 by greg, Wed Dec 5 20:07:34 2007 UTC vs.
Revision 2.14 by greg, Sat Dec 8 01:43:09 2007 UTC

# Line 7 | Line 7
7  
8   #include  "ray.h"
9   #include  "otypes.h"
10 + #include  "random.h"
11  
12   #ifdef __cplusplus
13   extern "C" {
# Line 29 | Line 30 | typedef enum {
30   } UpDir;
31                                  /* BSDF coordinate calculation routines */
32                                  /* vectors always point away from surface */
33 < typedef int     b_vecf(FVECT, int, char *);
34 < typedef int     b_ndxf(FVECT, char *);
35 < typedef double  b_radf(int, char *);
33 > typedef int     b_vecf(FVECT, int, void *);
34 > typedef int     b_ndxf(FVECT, void *);
35 > typedef double  b_radf(int, void *);
36  
37   /* Bidirectional Scattering Distribution Function */
38   struct BSDF_data {
39          int     ninc;                   /* number of incoming directions */
40          int     nout;                   /* number of outgoing directions */
41 <        char    ib_priv[32];            /* input basis private data */
41 >        void    *ib_priv;               /* input basis private data */
42          b_vecf  *ib_vec;                /* get input vector from index */
43          b_ndxf  *ib_ndx;                /* get input index from vector */
44 <        b_radf  *ib_rad;                /* get input radius for index */
45 <        char    ob_priv[32];            /* output basis private data */
44 >        b_radf  *ib_ohm;                /* get input radius for index */
45 >        void    *ob_priv;               /* output basis private data */
46          b_vecf  *ob_vec;                /* get output vector from index */
47          b_ndxf  *ob_ndx;                /* get output index from vector */
48 <        b_radf  *ob_rad;                /* get output radius for index */
48 >        b_radf  *ob_ohm;                /* get output radius for index */
49          float   *bsdf;                  /* scattering distribution data */
50   };                              /* bidirectional scattering distrib. func. */
51  
# Line 66 | Line 67 | struct illum_args {
67  
68   #define getBSDF_incvec(v,b,i)   (*(b)->ib_vec)(v,i,(b)->ib_priv)
69   #define getBSDF_incndx(b,v)     (*(b)->ib_ndx)(v,(b)->ib_priv)
70 < #define getBSDF_incrad(b,i)     (*(b)->ib_rad)(i,(b)->ib_priv)
70 > #define getBSDF_incohm(b,i)     (*(b)->ib_ohm)(i,(b)->ib_priv)
71   #define getBSDF_outvec(v,b,o)   (*(b)->ob_vec)(v,o,(b)->ob_priv)
72   #define getBSDF_outndx(b,v)     (*(b)->ob_ndx)(v,(b)->ob_priv)
73 < #define getBSDF_outrad(b,o)     (*(b)->ob_rad)(o,(b)->ob_priv)
73 > #define getBSDF_outohm(b,o)     (*(b)->ob_ohm)(o,(b)->ob_priv)
74   #define BSDF_visible(b,i,o)     (b)->bsdf[(o)*(b)->ninc + (i)]
75  
76   extern struct BSDF_data *load_BSDF(char *fname);
77   extern void free_BSDF(struct BSDF_data *b);
78 < extern void r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
78 > extern int r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
79                                  double rv, MAT4 xm);
80 < extern void r_BSDF_outvec(FVECT v, struct BSDF_data *b, int o,
80 > extern int r_BSDF_outvec(FVECT v, struct BSDF_data *b, int o,
81                                  double rv, MAT4 xm);
82   extern int getBSDF_xfm(MAT4 xm, FVECT nrm, UpDir ud);
83   extern void redistribute(struct BSDF_data *b, int nalt, int nazi,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines