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.19 by greg, Fri Apr 11 20:31:37 2014 UTC vs.
Revision 2.26 by greg, Mon Mar 7 17:52:14 2022 UTC

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

Diff Legend

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