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.9 by greg, Thu Sep 13 17:52:35 2007 UTC vs.
Revision 2.10 by greg, Tue Sep 18 19:51:07 2007 UTC

# Line 17 | Line 17 | extern "C" {
17   #define  IL_COLAVG      0x4             /* use average color */
18   #define  IL_DATCLB      0x8             /* OK to clobber data file */
19  
20 +                                /* up directions */
21 + typedef enum {
22 +        UDzneg=-3,
23 +        UDyneg=-2,
24 +        UDxneg=-1,
25 +        UDunknown=0,
26 +        UDxpos=1,
27 +        UDypos=2,
28 +        UDzpos=3
29 + } UpDir;
30 +
31 + struct BSDF_data {
32 +        double  om_scale;               /* maximum solid angle (sr/256) */
33 +        int     ninc;                   /* number of incoming directions */
34 +        int32   *inc_dir;               /* incoming direction codes */
35 +        BYTE    *inc_rad;               /* incoming radians to neighbor */
36 +        int     nout;                   /* number of outgoing directions */
37 +        int32   *out_dir;               /* outgoing direction codes */
38 +        BYTE    *out_rad;               /* outgoing radians to neighbor */
39 +        float   *bsdf;                  /* scattering distribution data */
40 + };                              /* bidirectional scattering distrib. func. */
41 +
42   struct illum_args {
43          int     flags;                  /* flags from list above */
44 +        UpDir   udir;                   /* up direction */
45          char    matname[MAXSTR];        /* illum material name */
46          char    datafile[MAXSTR];       /* distribution data file name */
47          int     dfnum;                  /* data file number */
48          char    altmat[MAXSTR];         /* alternate material name */
49          int     sampdens;               /* point sample density */
50          int     nsamps;                 /* # of samples in each direction */
51 +        struct BSDF_data
52 +                *sd;                    /* scattering data (if set) */
53          float   minbrt;                 /* minimum average brightness */
54          COLOR   col;                    /* computed average color */
55   };                              /* illum options */
56  
57 < extern void printobj(char *mod, register OBJREC *obj);
58 < extern int average(register struct illum_args *il, COLORV *da, int n);
57 > #define getBSDF_incvec(v,b,i)   decodedir(v, (b)->inc_dir[i])
58 > #define getBSDF_outvec(v,b,o)   decodedir(v, (b)->out_dir[o])
59 > #define getBSDF_incrad(b,i)     ((b)->om_scale*((b)->inc_rad[i] + .5));
60 > #define getBSDF_outrad(b,o)     ((b)->om_scale*((b)->out_rad[o] + .5));
61 > #define BSDF_data(b,i,o)        (b)->bsdf[(o)*(b)->ninc + (i)]
62 >
63 > extern struct BSDF_data *load_BSDF(char *fname);
64 > extern void free_BSDF(struct BSDF_data *b);
65 > extern void r_BSDF_incvec(FVECT v, struct BSDF_data *b, int i,
66 >                                double rv, MAT4 xm);
67 > extern void r_BSDF_outvec(FVECT v, struct BSDF_data *b, int o,
68 >                                double rv, MAT4 xm);
69 >
70 > extern void printobj(char *mod, OBJREC *obj);
71 > extern int average(struct illum_args *il, COLORV *da, int n);
72   extern void flatout(struct illum_args *il, COLORV *da, int n, int m,
73          FVECT u, FVECT v, FVECT w);
74 < extern void illumout(register struct illum_args *il, OBJREC *ob);
74 > extern void illumout(struct illum_args *il, OBJREC *ob);
75   extern void roundout(struct illum_args *il, COLORV *da, int n, int m);
76  
77   extern int my_default(OBJREC *, struct illum_args *, char *);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines