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.10 by greg, Fri Jun 27 06:53:22 2003 UTC vs.
Revision 2.14 by greg, Sat May 28 22:27:54 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 42 | Line 42 | typedef struct {
42   }  AMBSAMP;             /* ambient sample division */
43  
44   typedef struct {
45 +        COLOR  acoef;           /* ambient contribution coefficient */
46 +        float  drc;             /* daughter ray coefficient */
47          FVECT  ux, uy, uz;      /* x, y and z axis directions */
48          short  nt, np;          /* number of theta and phi directions */
49 +        int    ns;              /* number of super-samples */
50   }  AMBHEMI;             /* ambient sample hemisphere */
51  
52   extern double  maxarad;         /* maximum ambient radius */
53   extern double  minarad;         /* minimum ambient radius */
54  
55 + #ifndef AVGREFL
56   #define  AVGREFL        0.5     /* assumed average reflectance */
57 + #endif
58  
59   #define  AMBVALSIZ      75      /* number of bytes in portable AMBVAL struct */
60   #define  AMBMAGIC       557     /* magic number for ambient value files */
61   #define  AMBFMT         "Radiance_ambval"       /* format id string */
62  
58                                        /* defined in ambcomp.c */
59 extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
60 extern double   doambient(COLOR acol, RAY *r, double wt, FVECT pg, FVECT dg);
61 extern void     inithemi(AMBHEMI *hp, RAY *r, double wt);
62 extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
63 extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
64 extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
63                                          /* defined in ambient.c */
64   extern void     setambres(int ar);
65   extern void     setambacc(double newa);
66   extern void     setambient(void);
67 + extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
68   extern void     ambdone(void);
69   extern void     ambnotify(OBJECT obj);
70 < extern void     ambient(COLOR acol, RAY *r, FVECT nrm);
72 < extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
70 > extern double   sumambient(COLOR acol, RAY *r, double rw, FVECT rn, int al,
71                                  AMBTREE *at, FVECT c0, double s);
72 < extern double   makeambient(COLOR acol, RAY *r, FVECT rn, int al);
72 > extern double   makeambient(COLOR acol, RAY *r, COLOR ac, FVECT rn, int al);
73   extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
74   extern int      ambsync(void);
75 +                                        /* defined in ambcomp.c */
76 + extern double   doambient(COLOR acol, RAY *r, COLOR ac, double wt,
77 +                                        FVECT pg, FVECT dg);
78 + extern void     inithemi(AMBHEMI *hp, RAY *r, COLOR ac, double wt);
79 + extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
80 + extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
81 + extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
82 + extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
83                                          /* defined in ambio.c */
84   extern void     putambmagic(FILE *fp);
85   extern int      hasambmagic(FILE *fp);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines