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.12 by greg, Tue Apr 19 01:15:06 2005 UTC

# Line 42 | Line 42 | typedef struct {
42   }  AMBSAMP;             /* ambient sample division */
43  
44   typedef struct {
45 +        COLOR  acoef;           /* coefficient for rayorigin() */
46          FVECT  ux, uy, uz;      /* x, y and z axis directions */
47          short  nt, np;          /* number of theta and phi directions */
48   }  AMBHEMI;             /* ambient sample hemisphere */
# Line 57 | Line 58 | extern double  minarad;                /* minimum ambient radius */
58   #define  AMBMAGIC       557     /* magic number for ambient value files */
59   #define  AMBFMT         "Radiance_ambval"       /* format id string */
60  
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);
61                                          /* defined in ambient.c */
62   extern void     setambres(int ar);
63   extern void     setambacc(double newa);
64   extern void     setambient(void);
65 + extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
66   extern void     ambdone(void);
67   extern void     ambnotify(OBJECT obj);
73 – extern void     ambient(COLOR acol, RAY *r, FVECT nrm);
68   extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
69                                  AMBTREE *at, FVECT c0, double s);
70 < extern double   makeambient(COLOR acol, RAY *r, FVECT rn, int al);
70 > extern double   makeambient(COLOR acol, RAY *r, COLOR ac, FVECT rn, int al);
71   extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
72   extern int      ambsync(void);
73 +                                        /* defined in ambcomp.c */
74 + extern double   doambient(COLOR acol, RAY *r, COLOR ac, double wt,
75 +                                        FVECT pg, FVECT dg);
76 + extern int      inithemi(AMBHEMI *hp, RAY *r, COLOR ac, double wt);
77 + extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
78 + extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
79 + extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
80 + extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
81                                          /* defined in ambio.c */
82   extern void     putambmagic(FILE *fp);
83   extern int      hasambmagic(FILE *fp);

Diff Legend

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