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.9 by schorsch, Sat Jun 7 00:54:58 2003 UTC vs.
Revision 2.13 by greg, Wed May 25 18:06:22 2005 UTC

# Line 10 | Line 10
10   extern "C" {
11   #endif
12  
13
14 #include "copyright.h"
15
13   /*
14   * Since we've defined our vectors as float below to save space,
15   * watch out for changes in the definitions of VCOPY() and DOT()
# Line 45 | 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 52 | Line 50 | typedef struct {
50   extern double  maxarad;         /* maximum ambient radius */
51   extern double  minarad;         /* minimum ambient radius */
52  
53 + #ifndef AVGREFL
54   #define  AVGREFL        0.5     /* assumed average reflectance */
55 + #endif
56  
57   #define  AMBVALSIZ      75      /* number of bytes in portable AMBVAL struct */
58   #define  AMBMAGIC       557     /* magic number for ambient value files */
59   #define  AMBFMT         "Radiance_ambval"       /* format id string */
60  
61                                        /* defined in ambcomp.c */
62 extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
63 extern double   doambient(COLOR acol, RAY *r, double wt, FVECT pg, FVECT dg);
64 extern void     inithemi(AMBHEMI *hp, RAY *r, double wt);
65 extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
66 extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
67 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);
68 < extern void     ambient(COLOR acol, RAY *r, FVECT nrm);
75 < extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
68 > extern double   sumambient(COLOR acol, RAY *r, double rw, 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