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.12 by greg, Tue Apr 19 01:15:06 2005 UTC vs.
Revision 2.22 by greg, Wed May 7 01:16:03 2014 UTC

# Line 4 | Line 4
4   *
5   * Include after ray.h
6   */
7 +
8   #ifndef _RAD_AMBIENT_H_
9   #define _RAD_AMBIENT_H_
10   #ifdef __cplusplus
11   extern "C" {
12   #endif
13  
14 + #ifdef NEWAMB
15 +
16   /*
17 + * Normal and u-vector directions encoded using dircode.c
18 + */
19 + typedef struct ambrec {
20 +        struct ambrec  *next;   /* next in list */
21 +        unsigned long  latick;  /* last accessed tick */
22 +        float  pos[3];          /* position in space */
23 +        int32  ndir;            /* encoded surface normal */
24 +        int32  udir;            /* u-vector direction */
25 +        int  lvl;               /* recursion level of parent ray */
26 +        float  weight;          /* weight of parent ray */
27 +        float  rad[2];          /* anisotropic radii (rad[0] <= rad[1]) */
28 +        COLOR  val;             /* computed ambient value */
29 +        float  gpos[2];         /* (u,v) gradient wrt. position */
30 +        float  gdir[2];         /* (u,v) gradient wrt. direction */
31 +        uint32  corral;         /* potential light leak direction flags */
32 + }  AMBVAL;                      /* ambient value */
33 +
34 + typedef struct ambtree {
35 +        AMBVAL  *alist;         /* ambient value list */
36 +        struct ambtree  *kid;   /* 8 child nodes */
37 + }  AMBTREE;                     /* ambient octree */
38 +
39 + extern double  maxarad;         /* maximum ambient radius */
40 + extern double  minarad;         /* minimum ambient radius */
41 +
42 + #ifndef AVGREFL
43 + #define  AVGREFL        0.5     /* assumed average reflectance */
44 + #endif
45 +
46 + #define  AMBVALSIZ      67      /* number of bytes in portable AMBVAL struct */
47 + #define  AMBMAGIC       559     /* magic number for ambient value files */
48 + #define  AMBFMT         "Radiance_ambval"       /* format id string */
49 +
50 +                                        /* defined in ambient.c */
51 + extern void     setambres(int ar);
52 + extern void     setambacc(double newa);
53 + extern void     setambient(void);
54 + extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
55 + extern void     ambdone(void);
56 + extern void     ambnotify(OBJECT obj);
57 + extern int      ambsync(void);
58 +                                        /* defined in ambcomp.c */
59 + extern int      doambient(COLOR acol, RAY *r, double wt,
60 +                                FVECT uv[2], float rad[2],
61 +                                float gpos[2], float gdir[2], uint32 *crlp);
62 +                                        /* defined in ambio.c */
63 + extern void     putambmagic(FILE *fp);
64 + extern int      hasambmagic(FILE *fp);
65 + extern int      writambval(AMBVAL *av, FILE *fp);
66 + extern int      readambval(AMBVAL *av, FILE *fp);
67 + extern int      ambvalOK(AMBVAL *av);
68 +
69 + #else /* ! NEWAMB */
70 +
71 + /*
72   * Since we've defined our vectors as float below to save space,
73   * watch out for changes in the definitions of VCOPY() and DOT()
74   * and don't pass these vectors to fvect routines.
75   */
76   typedef struct ambrec {
77 +        struct ambrec  *next;   /* next in list */
78          unsigned long  latick;  /* last accessed tick */
79          float  pos[3];          /* position in space */
80          float  dir[3];          /* normal direction */
81 <        int  lvl;               /* recursion level of parent ray */
81 >        int    lvl;             /* recursion level of parent ray */
82          float  weight;          /* weight of parent ray */
83          float  rad;             /* validity radius */
84          COLOR  val;             /* computed ambient value */
85          float  gpos[3];         /* gradient wrt. position */
86          float  gdir[3];         /* gradient wrt. direction */
28 –        struct ambrec  *next;   /* next in list */
87   }  AMBVAL;                      /* ambient value */
88  
89   typedef struct ambtree {
# Line 34 | Line 92 | typedef struct ambtree {
92   }  AMBTREE;                     /* ambient octree */
93  
94   typedef struct {
95 <        short  t, p;            /* theta, phi indices */
38 <        COLOR  v;               /* value sum */
95 >        COLOR  v;               /* division sum (partial) */
96          float  r;               /* 1/distance sum */
97          float  k;               /* variance for this division */
98 <        int  n;                 /* number of subsamples */
98 >        int    n;               /* number of subsamples */
99 >        unsigned short  t, p;   /* theta, phi indices */
100   }  AMBSAMP;             /* ambient sample division */
101  
102   typedef struct {
45 –        COLOR  acoef;           /* coefficient for rayorigin() */
103          FVECT  ux, uy, uz;      /* x, y and z axis directions */
104 <        short  nt, np;          /* number of theta and phi directions */
104 >        COLOR  acoef;           /* division contribution coefficient */
105 >        int    ns;              /* number of super-samples */
106 >        int    nt, np;          /* number of theta and phi directions */
107   }  AMBHEMI;             /* ambient sample hemisphere */
108  
109   extern double  maxarad;         /* maximum ambient radius */
# Line 65 | Line 124 | extern void    setambient(void);
124   extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
125   extern void     ambdone(void);
126   extern void     ambnotify(OBJECT obj);
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, COLOR ac, FVECT rn, int al);
71 – extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
127   extern int      ambsync(void);
128                                          /* defined in ambcomp.c */
129 < extern double   doambient(COLOR acol, RAY *r, COLOR ac, double wt,
129 > extern double   doambient(COLOR acol, RAY *r, double wt,
130                                          FVECT pg, FVECT dg);
131 < extern int      inithemi(AMBHEMI *hp, RAY *r, COLOR ac, double wt);
131 > extern void     inithemi(AMBHEMI *hp, COLOR ac, RAY *r, double wt);
132   extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
133   extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
134   extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
# Line 84 | Line 139 | extern int     hasambmagic(FILE *fp);
139   extern int      writambval(AMBVAL *av, FILE *fp);
140   extern int      ambvalOK(AMBVAL *av);
141   extern int      readambval(AMBVAL *av, FILE *fp);
87 –                                        /* defined in lookamb.c */
88 – extern void     lookamb(FILE *fp);
89 – extern void     writamb(FILE *fp);
142  
143 + #endif  /* ! NEWAMB */
144  
145   #ifdef __cplusplus
146   }

Diff Legend

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