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.21 by greg, Sat Apr 19 02:39:44 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 + }  AMBVAL;                      /* ambient value */
32 +
33 + typedef struct ambtree {
34 +        AMBVAL  *alist;         /* ambient value list */
35 +        struct ambtree  *kid;   /* 8 child nodes */
36 + }  AMBTREE;                     /* ambient octree */
37 +
38 + extern double  maxarad;         /* maximum ambient radius */
39 + extern double  minarad;         /* minimum ambient radius */
40 +
41 + #ifndef AVGREFL
42 + #define  AVGREFL        0.5     /* assumed average reflectance */
43 + #endif
44 +
45 + #define  AMBVALSIZ      63      /* number of bytes in portable AMBVAL struct */
46 + #define  AMBMAGIC       558     /* magic number for ambient value files */
47 + #define  AMBFMT         "Radiance_ambval"       /* format id string */
48 +
49 +                                        /* defined in ambient.c */
50 + extern void     setambres(int ar);
51 + extern void     setambacc(double newa);
52 + extern void     setambient(void);
53 + extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
54 + extern void     ambdone(void);
55 + extern void     ambnotify(OBJECT obj);
56 + extern int      ambsync(void);
57 +                                        /* defined in ambcomp.c */
58 + extern int      doambient(COLOR acol, RAY *r, double wt,
59 +                                FVECT uv[2], float rad[2],
60 +                                float gpos[2], float gdir[2]);
61 +                                        /* defined in ambio.c */
62 + extern void     putambmagic(FILE *fp);
63 + extern int      hasambmagic(FILE *fp);
64 + extern int      writambval(AMBVAL *av, FILE *fp);
65 + extern int      readambval(AMBVAL *av, FILE *fp);
66 + extern int      ambvalOK(AMBVAL *av);
67 +
68 + #else /* ! NEWAMB */
69 +
70 + /*
71   * Since we've defined our vectors as float below to save space,
72   * watch out for changes in the definitions of VCOPY() and DOT()
73   * and don't pass these vectors to fvect routines.
74   */
75   typedef struct ambrec {
76 +        struct ambrec  *next;   /* next in list */
77          unsigned long  latick;  /* last accessed tick */
78          float  pos[3];          /* position in space */
79          float  dir[3];          /* normal direction */
80 <        int  lvl;               /* recursion level of parent ray */
80 >        int    lvl;             /* recursion level of parent ray */
81          float  weight;          /* weight of parent ray */
82          float  rad;             /* validity radius */
83          COLOR  val;             /* computed ambient value */
84          float  gpos[3];         /* gradient wrt. position */
85          float  gdir[3];         /* gradient wrt. direction */
28 –        struct ambrec  *next;   /* next in list */
86   }  AMBVAL;                      /* ambient value */
87  
88   typedef struct ambtree {
# Line 34 | Line 91 | typedef struct ambtree {
91   }  AMBTREE;                     /* ambient octree */
92  
93   typedef struct {
94 <        short  t, p;            /* theta, phi indices */
38 <        COLOR  v;               /* value sum */
94 >        COLOR  v;               /* division sum (partial) */
95          float  r;               /* 1/distance sum */
96          float  k;               /* variance for this division */
97 <        int  n;                 /* number of subsamples */
97 >        int    n;               /* number of subsamples */
98 >        unsigned short  t, p;   /* theta, phi indices */
99   }  AMBSAMP;             /* ambient sample division */
100  
101   typedef struct {
102          FVECT  ux, uy, uz;      /* x, y and z axis directions */
103 <        short  nt, np;          /* number of theta and phi directions */
103 >        COLOR  acoef;           /* division contribution coefficient */
104 >        int    ns;              /* number of super-samples */
105 >        int    nt, np;          /* number of theta and phi directions */
106   }  AMBHEMI;             /* ambient sample hemisphere */
107  
108   extern double  maxarad;         /* maximum ambient radius */
109   extern double  minarad;         /* minimum ambient radius */
110  
111 + #ifndef AVGREFL
112   #define  AVGREFL        0.5     /* assumed average reflectance */
113 + #endif
114  
115   #define  AMBVALSIZ      75      /* number of bytes in portable AMBVAL struct */
116   #define  AMBMAGIC       557     /* magic number for ambient value files */
117   #define  AMBFMT         "Radiance_ambval"       /* format id string */
118  
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);
119                                          /* defined in ambient.c */
120   extern void     setambres(int ar);
121   extern void     setambacc(double newa);
122   extern void     setambient(void);
123 + extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
124   extern void     ambdone(void);
125   extern void     ambnotify(OBJECT obj);
71 – extern void     ambient(COLOR acol, RAY *r, FVECT nrm);
72 – extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
73 –                                AMBTREE *at, FVECT c0, double s);
74 – extern double   makeambient(COLOR acol, RAY *r, FVECT rn, int al);
75 – extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
126   extern int      ambsync(void);
127 +                                        /* defined in ambcomp.c */
128 + extern double   doambient(COLOR acol, RAY *r, double wt,
129 +                                        FVECT pg, FVECT dg);
130 + extern void     inithemi(AMBHEMI *hp, COLOR ac, RAY *r, double wt);
131 + extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
132 + extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
133 + extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
134 + extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
135                                          /* defined in ambio.c */
136   extern void     putambmagic(FILE *fp);
137   extern int      hasambmagic(FILE *fp);
138   extern int      writambval(AMBVAL *av, FILE *fp);
139   extern int      ambvalOK(AMBVAL *av);
140   extern int      readambval(AMBVAL *av, FILE *fp);
83 –                                        /* defined in lookamb.c */
84 – extern void     lookamb(FILE *fp);
85 – extern void     writamb(FILE *fp);
141  
142 + #endif  /* ! NEWAMB */
143  
144   #ifdef __cplusplus
145   }

Diff Legend

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