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.14 by greg, Sat May 28 22:27:54 2005 UTC vs.
Revision 2.18 by greg, Thu Sep 22 02:15:56 2011 UTC

# Line 16 | Line 16 | extern "C" {
16   * and don't pass these vectors to fvect routines.
17   */
18   typedef struct ambrec {
19 +        struct ambrec  *next;   /* next in list */
20          unsigned long  latick;  /* last accessed tick */
21          float  pos[3];          /* position in space */
22          float  dir[3];          /* normal direction */
# Line 25 | Line 26 | typedef struct ambrec {
26          COLOR  val;             /* computed ambient value */
27          float  gpos[3];         /* gradient wrt. position */
28          float  gdir[3];         /* gradient wrt. direction */
28 –        struct ambrec  *next;   /* next in list */
29   }  AMBVAL;                      /* ambient value */
30  
31   typedef struct ambtree {
# Line 34 | Line 34 | typedef struct ambtree {
34   }  AMBTREE;                     /* ambient octree */
35  
36   typedef struct {
37 <        short  t, p;            /* theta, phi indices */
38 <        COLOR  v;               /* value sum */
37 >        COLOR  v;               /* division sum (partial) */
38          float  r;               /* 1/distance sum */
39          float  k;               /* variance for this division */
40 <        int  n;                 /* number of subsamples */
40 >        int    n;               /* number of subsamples */
41 >        unsigned short  t, p;   /* theta, phi indices */
42   }  AMBSAMP;             /* ambient sample division */
43  
44   typedef struct {
45 –        COLOR  acoef;           /* ambient contribution coefficient */
46 –        float  drc;             /* daughter ray coefficient */
45          FVECT  ux, uy, uz;      /* x, y and z axis directions */
46 <        short  nt, np;          /* number of theta and phi directions */
46 >        COLOR  acoef;           /* division contribution coefficient */
47          int    ns;              /* number of super-samples */
48 +        int    nt, np;          /* number of theta and phi directions */
49   }  AMBHEMI;             /* ambient sample hemisphere */
50  
51   extern double  maxarad;         /* maximum ambient radius */
# Line 67 | Line 66 | extern void    setambient(void);
66   extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
67   extern void     ambdone(void);
68   extern void     ambnotify(OBJECT obj);
69 < extern double   sumambient(COLOR acol, RAY *r, double rw, FVECT rn, int al,
69 > extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
70                                  AMBTREE *at, FVECT c0, double s);
71 < extern double   makeambient(COLOR acol, RAY *r, COLOR ac, FVECT rn, int al);
71 > extern double   makeambient(COLOR acol, RAY *r, FVECT rn, int al);
72   extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
73   extern int      ambsync(void);
74                                          /* defined in ambcomp.c */
75 < extern double   doambient(COLOR acol, RAY *r, COLOR ac, double wt,
75 > extern double   doambient(COLOR acol, RAY *r, double wt,
76                                          FVECT pg, FVECT dg);
77 < extern void     inithemi(AMBHEMI *hp, RAY *r, COLOR ac, double wt);
77 > extern void     inithemi(AMBHEMI *hp, COLOR ac, RAY *r, double wt);
78   extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
79   extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
80   extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);

Diff Legend

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