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.13 by greg, Wed May 25 18:06:22 2005 UTC vs.
Revision 2.20 by greg, Fri Apr 11 22:54:34 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 + 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 +
53 + extern double  maxarad;         /* maximum ambient radius */
54 + extern double  minarad;         /* minimum ambient radius */
55 +
56 + #ifndef AVGREFL
57 + #define  AVGREFL        0.5     /* assumed average reflectance */
58 + #endif
59 +
60 + #define  AMBVALSIZ      63      /* number of bytes in portable AMBVAL struct */
61 + #define  AMBMAGIC       558     /* magic number for ambient value files */
62 + #define  AMBFMT         "Radiance_ambval"       /* format id string */
63 +
64 +                                        /* defined in ambient.c */
65 + extern void     setambres(int ar);
66 + extern void     setambacc(double newa);
67 + extern void     setambient(void);
68 + extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
69 + extern void     ambdone(void);
70 + extern void     ambnotify(OBJECT obj);
71 + extern int      ambsync(void);
72 +                                        /* defined in ambcomp.c */
73 + extern int      doambient(COLOR acol, RAY *r, double wt,
74 +                                FVECT uv[2], float rad[2],
75 +                                float gpos[2], float gdir[2]);
76 +                                        /* defined in ambio.c */
77 + extern void     putambmagic(FILE *fp);
78 + extern int      hasambmagic(FILE *fp);
79 + extern int      writambval(AMBVAL *av, FILE *fp);
80 + extern int      readambval(AMBVAL *av, FILE *fp);
81 + extern int      ambvalOK(AMBVAL *av);
82 +
83 + #else /* ! NEWAMB */
84 +
85 + /*
86   * Since we've defined our vectors as float below to save space,
87   * watch out for changes in the definitions of VCOPY() and DOT()
88   * and don't pass these vectors to fvect routines.
89   */
90   typedef struct ambrec {
91 +        struct ambrec  *next;   /* next in list */
92          unsigned long  latick;  /* last accessed tick */
93          float  pos[3];          /* position in space */
94          float  dir[3];          /* normal direction */
95 <        int  lvl;               /* recursion level of parent ray */
95 >        int    lvl;             /* recursion level of parent ray */
96          float  weight;          /* weight of parent ray */
97          float  rad;             /* validity radius */
98          COLOR  val;             /* computed ambient value */
99          float  gpos[3];         /* gradient wrt. position */
100          float  gdir[3];         /* gradient wrt. direction */
28 –        struct ambrec  *next;   /* next in list */
101   }  AMBVAL;                      /* ambient value */
102  
103   typedef struct ambtree {
# Line 34 | Line 106 | typedef struct ambtree {
106   }  AMBTREE;                     /* ambient octree */
107  
108   typedef struct {
109 <        short  t, p;            /* theta, phi indices */
38 <        COLOR  v;               /* value sum */
109 >        COLOR  v;               /* division sum (partial) */
110          float  r;               /* 1/distance sum */
111          float  k;               /* variance for this division */
112 <        int  n;                 /* number of subsamples */
112 >        int    n;               /* number of subsamples */
113 >        unsigned short  t, p;   /* theta, phi indices */
114   }  AMBSAMP;             /* ambient sample division */
115  
116   typedef struct {
45 –        COLOR  acoef;           /* coefficient for rayorigin() */
117          FVECT  ux, uy, uz;      /* x, y and z axis directions */
118 <        short  nt, np;          /* number of theta and phi directions */
118 >        COLOR  acoef;           /* division contribution coefficient */
119 >        int    ns;              /* number of super-samples */
120 >        int    nt, np;          /* number of theta and phi directions */
121   }  AMBHEMI;             /* ambient sample hemisphere */
122  
123   extern double  maxarad;         /* maximum ambient radius */
# Line 65 | Line 138 | extern void    setambient(void);
138   extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
139   extern void     ambdone(void);
140   extern void     ambnotify(OBJECT obj);
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, COLOR ac, FVECT rn, int al);
71 – extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
141   extern int      ambsync(void);
142                                          /* defined in ambcomp.c */
143 < extern double   doambient(COLOR acol, RAY *r, COLOR ac, double wt,
143 > extern double   doambient(COLOR acol, RAY *r, double wt,
144                                          FVECT pg, FVECT dg);
145 < extern int      inithemi(AMBHEMI *hp, RAY *r, COLOR ac, double wt);
145 > extern void     inithemi(AMBHEMI *hp, COLOR ac, RAY *r, double wt);
146   extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
147   extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
148   extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
# Line 84 | Line 153 | extern int     hasambmagic(FILE *fp);
153   extern int      writambval(AMBVAL *av, FILE *fp);
154   extern int      ambvalOK(AMBVAL *av);
155   extern int      readambval(AMBVAL *av, FILE *fp);
87 –                                        /* defined in lookamb.c */
88 – extern void     lookamb(FILE *fp);
89 – extern void     writamb(FILE *fp);
156  
157 + #endif  /* ! NEWAMB */
158  
159   #ifdef __cplusplus
160   }

Diff Legend

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