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.22 by greg, Wed May 7 01:16:03 2014 UTC vs.
Revision 2.27 by greg, Wed Nov 15 18:02:52 2023 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]) */
28 –        COLOR  val;             /* computed ambient value */
25          float  gpos[2];         /* (u,v) gradient wrt. position */
26          float  gdir[2];         /* (u,v) gradient wrt. direction */
27          uint32  corral;         /* potential light leak direction flags */
28 +        SCOLOR  val;            /* computed indirect irradiance (last!) */
29   }  AMBVAL;                      /* ambient value */
30  
31   typedef struct ambtree {
# Line 43 | Line 40 | extern double  minarad;                /* minimum ambient radius */
40   #define  AVGREFL        0.5     /* assumed average reflectance */
41   #endif
42  
43 < #define  AMBVALSIZ      67      /* number of bytes in portable AMBVAL struct */
44 < #define  AMBMAGIC       559     /* magic number for ambient value files */
43 > #define  AMBVALSIZ      (64+AMB_CNDX[3])        /* number of bytes in portable AMBVAL */
44 > #define  AMBMAGIC       561                     /* magic number for ambient value file */
45   #define  AMBFMT         "Radiance_ambval"       /* format id string */
46  
47                                          /* defined in ambient.c */
48   extern void     setambres(int ar);
49   extern void     setambacc(double newa);
50   extern void     setambient(void);
51 < extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
51 > extern void     multambient(SCOLOR aval, RAY *r, FVECT nrm);
52   extern void     ambdone(void);
53   extern void     ambnotify(OBJECT obj);
54   extern int      ambsync(void);
55                                          /* defined in ambcomp.c */
56 < extern int      doambient(COLOR acol, RAY *r, double wt,
56 > extern int      doambient(SCOLOR acol, RAY *r, double wt,
57                                  FVECT uv[2], float rad[2],
58                                  float gpos[2], float gdir[2], uint32 *crlp);
59                                          /* defined in ambio.c */
60 + extern int      *AMB_CNDX;      /* open ambient file RGBE indices */
61 + extern float    *AMB_WLPART;    /* open ambient file spectral range */
62 + extern int      amb_headline(char *hl, void *p);
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 */
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 */
87 – }  AMBVAL;                      /* ambient value */
88 –
89 – typedef struct ambtree {
90 –        AMBVAL  *alist;         /* ambient value list */
91 –        struct ambtree  *kid;   /* 8 child nodes */
92 – }  AMBTREE;                     /* ambient octree */
93 –
94 – typedef struct {
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 */
99 –        unsigned short  t, p;   /* theta, phi indices */
100 – }  AMBSAMP;             /* ambient sample division */
101 –
102 – typedef struct {
103 –        FVECT  ux, uy, uz;      /* x, y and z axis 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 */
110 – extern double  minarad;         /* minimum ambient radius */
111 –
112 – #ifndef AVGREFL
113 – #define  AVGREFL        0.5     /* assumed average reflectance */
114 – #endif
115 –
116 – #define  AMBVALSIZ      75      /* number of bytes in portable AMBVAL struct */
117 – #define  AMBMAGIC       557     /* magic number for ambient value files */
118 – #define  AMBFMT         "Radiance_ambval"       /* format id string */
119 –
120 –                                        /* defined in ambient.c */
121 – extern void     setambres(int ar);
122 – extern void     setambacc(double newa);
123 – 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);
127 – extern int      ambsync(void);
128 –                                        /* defined in ambcomp.c */
129 – extern double   doambient(COLOR acol, RAY *r, double wt,
130 –                                        FVECT pg, FVECT dg);
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);
135 – extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
136 –                                        /* defined in ambio.c */
137 – extern void     putambmagic(FILE *fp);
138 – 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);
142 –
143 – #endif  /* ! NEWAMB */
68  
69   #ifdef __cplusplus
70   }

Diff Legend

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