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

Comparing ray/src/rt/ambient.h (file contents):
Revision 2.19 by greg, Fri Apr 11 20:31:37 2014 UTC vs.
Revision 2.24 by greg, Thu May 21 12:25:53 2015 UTC

# Line 11 | Line 11
11   extern "C" {
12   #endif
13  
14 < #ifdef NEWAMB
14 > #ifndef OLDAMB
15  
16   /*
17   * Normal and u-vector directions encoded using dircode.c
# Line 22 | Line 22 | typedef struct ambrec {
22          float  pos[3];          /* position in space */
23          int32  ndir;            /* encoded surface normal */
24          int32  udir;            /* u-vector direction */
25 <        int    lvl;             /* recursion level of parent ray */
25 >        short  lvl;             /* recursion level of parent ray */
26          float  weight;          /* weight of parent ray */
27          float  rad[2];          /* anisotropic radii (rad[0] <= rad[1]) */
28          COLOR  val;             /* computed ambient value */
29          float  gpos[2];         /* (u,v) gradient wrt. position */
30          float  gdir[2];         /* (u,v) gradient wrt. direction */
31 +        uint32  corral;         /* potential light leak direction flags */
32   }  AMBVAL;                      /* ambient value */
33  
34   typedef struct ambtree {
# Line 35 | Line 36 | typedef struct ambtree {
36          struct ambtree  *kid;   /* 8 child nodes */
37   }  AMBTREE;                     /* ambient octree */
38  
38 – typedef struct {
39 –        COLOR  v;               /* division sum (partial) */
40 –        float  r;               /* 1/distance sum */
41 –        float  k;               /* variance for this division */
42 –        int    n;               /* number of subsamples */
43 –        unsigned short  t, p;   /* theta, phi indices */
44 – }  AMBSAMP;             /* ambient sample division */
45 –
46 – typedef struct {
47 –        FVECT  ux, uy, uz;      /* x, y and z axis directions */
48 –        COLOR  acoef;           /* division contribution coefficient */
49 –        int    ns;              /* number of super-samples */
50 –        int    nt, np;          /* number of theta and phi directions */
51 – }  AMBHEMI;             /* ambient sample hemisphere */
52 –
39   extern double  maxarad;         /* maximum ambient radius */
40   extern double  minarad;         /* minimum ambient radius */
41  
# Line 57 | Line 43 | extern double  minarad;                /* minimum ambient radius */
43   #define  AVGREFL        0.5     /* assumed average reflectance */
44   #endif
45  
46 < #define  AMBVALSIZ      63      /* number of bytes in portable AMBVAL struct */
47 < #define  AMBMAGIC       558     /* magic number for ambient value files */
46 > #define  AMBVALSIZ      67      /* number of bytes in portable AMBVAL struct */
47 > #define  AMBMAGIC       559     /* magic number for ambient value files */
48   #define  AMBFMT         "Radiance_ambval"       /* format id string */
49  
50                                          /* defined in ambient.c */
# Line 68 | Line 54 | extern void    setambient(void);
54   extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
55   extern void     ambdone(void);
56   extern void     ambnotify(OBJECT obj);
71 – extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
72 –                                AMBTREE *at, FVECT c0, double s);
73 – extern int      makeambient(COLOR acol, RAY *r, FVECT rn, int al);
74 – extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
57   extern int      ambsync(void);
58                                          /* defined in ambcomp.c */
59   extern int      doambient(COLOR acol, RAY *r, double wt,
60                                  FVECT uv[2], float rad[2],
61 <                                float gpos[2], float gdir[2]);
80 < extern void     inithemi(AMBHEMI *hp, COLOR ac, RAY *r, double wt);
81 < extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
82 < extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
83 < extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
84 < extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
61 >                                float gpos[2], float gdir[2], uint32 *crlp);
62                                          /* defined in ambio.c */
63   extern void     putambmagic(FILE *fp);
64   extern int      hasambmagic(FILE *fp);
65   extern int      writambval(AMBVAL *av, FILE *fp);
89 – extern int      ambvalOK(AMBVAL *av);
66   extern int      readambval(AMBVAL *av, FILE *fp);
67 + extern int      ambvalOK(AMBVAL *av);
68  
69   #else /* ! NEWAMB */
70  
# Line 101 | Line 78 | typedef struct ambrec {
78          unsigned long  latick;  /* last accessed tick */
79          float  pos[3];          /* position in space */
80          float  dir[3];          /* normal direction */
81 <        int    lvl;             /* recursion level of parent ray */
81 >        short  lvl;             /* recursion level of parent ray */
82          float  weight;          /* weight of parent ray */
83          float  rad;             /* validity radius */
84          COLOR  val;             /* computed ambient value */
# Line 147 | Line 124 | extern void    setambient(void);
124   extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
125   extern void     ambdone(void);
126   extern void     ambnotify(OBJECT obj);
150 – extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
151 –                                AMBTREE *at, FVECT c0, double s);
152 – extern double   makeambient(COLOR acol, RAY *r, FVECT rn, int al);
153 – extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
127   extern int      ambsync(void);
128                                          /* defined in ambcomp.c */
129   extern double   doambient(COLOR acol, RAY *r, double wt,

Diff Legend

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