ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.15 by greg, Tue May 31 18:01:09 2005 UTC

# Line 35 | Line 35 | typedef struct ambtree {
35  
36   typedef struct {
37          short  t, p;            /* theta, phi indices */
38 <        COLOR  v;               /* value sum */
38 >        COLOR  v;               /* division sum (partial) */
39          float  r;               /* 1/distance sum */
40          float  k;               /* variance for this division */
41          int  n;                 /* number of subsamples */
42   }  AMBSAMP;             /* ambient sample division */
43  
44   typedef struct {
45 <        COLOR  acoef;           /* ambient contribution coefficient */
46 <        float  drc;             /* daughter ray coefficient */
45 >        COLOR  acoef;           /* division contribution coefficient */
46          FVECT  ux, uy, uz;      /* x, y and z axis directions */
47          short  nt, np;          /* number of theta and phi directions */
48          int    ns;              /* number of super-samples */
# 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 (old)
> Changed lines (new)