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.11 by greg, Wed Feb 23 18:18:21 2005 UTC vs.
Revision 2.15 by greg, Tue May 31 18:01:09 2005 UTC

# Line 19 | Line 19 | typedef struct ambrec {
19          unsigned long  latick;  /* last accessed tick */
20          float  pos[3];          /* position in space */
21          float  dir[3];          /* normal direction */
22 <        int  lvl;               /* recursion level of parent ray */
22 >        int    lvl;             /* recursion level of parent ray */
23          float  weight;          /* weight of parent ray */
24          float  rad;             /* validity radius */
25          COLOR  val;             /* computed ambient value */
# 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;           /* 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 */
49   }  AMBHEMI;             /* ambient sample hemisphere */
50  
51   extern double  maxarad;         /* maximum ambient radius */
# Line 57 | Line 59 | extern double  minarad;                /* minimum ambient radius */
59   #define  AMBMAGIC       557     /* magic number for ambient value files */
60   #define  AMBFMT         "Radiance_ambval"       /* format id string */
61  
60                                        /* defined in ambcomp.c */
61 extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
62 extern double   doambient(COLOR acol, RAY *r, double wt, FVECT pg, FVECT dg);
63 extern void     inithemi(AMBHEMI *hp, RAY *r, double wt);
64 extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
65 extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
66 extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
62                                          /* defined in ambient.c */
63   extern void     setambres(int ar);
64   extern void     setambacc(double newa);
65   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);
73 extern void     ambient(COLOR acol, RAY *r, FVECT nrm);
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, 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, double wt,
76 +                                        FVECT pg, FVECT dg);
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);
81 + extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
82                                          /* defined in ambio.c */
83   extern void     putambmagic(FILE *fp);
84   extern int      hasambmagic(FILE *fp);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines