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.18 by greg, Thu Sep 22 02:15:56 2011 UTC vs.
Revision 2.27 by greg, Wed Nov 15 18:02:52 2023 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
# Line 11 | Line 12 | extern "C" {
12   #endif
13  
14   /*
15 < * Since we've defined our vectors as float below to save space,
15 < * watch out for changes in the definitions of VCOPY() and DOT()
16 < * and don't pass these vectors to fvect routines.
15 > * Normal and u-vector directions encoded using dircode.c
16   */
17   typedef struct ambrec {
18          struct ambrec  *next;   /* next in list */
20        unsigned long  latick;  /* last accessed tick */
19          float  pos[3];          /* position in space */
20 <        float  dir[3];          /* normal direction */
21 <        int    lvl;             /* recursion level of parent ray */
20 >        int32  ndir;            /* encoded surface normal */
21 >        int32  udir;            /* u-vector direction */
22 >        short  lvl;             /* recursion level of parent ray */
23          float  weight;          /* weight of parent ray */
24 <        float  rad;             /* validity radius */
25 <        COLOR  val;             /* computed ambient value */
26 <        float  gpos[3];         /* gradient wrt. position */
27 <        float  gdir[3];         /* gradient wrt. direction */
24 >        float  rad[2];          /* anisotropic radii (rad[0] <= rad[1]) */
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 33 | Line 33 | typedef struct ambtree {
33          struct ambtree  *kid;   /* 8 child nodes */
34   }  AMBTREE;                     /* ambient octree */
35  
36 typedef struct {
37        COLOR  v;               /* division sum (partial) */
38        float  r;               /* 1/distance sum */
39        float  k;               /* variance for this division */
40        int    n;               /* number of subsamples */
41        unsigned short  t, p;   /* theta, phi indices */
42 }  AMBSAMP;             /* ambient sample division */
43
44 typedef struct {
45        FVECT  ux, uy, uz;      /* x, y and z axis directions */
46        COLOR  acoef;           /* division contribution coefficient */
47        int    ns;              /* number of super-samples */
48        int    nt, np;          /* number of theta and phi directions */
49 }  AMBHEMI;             /* ambient sample hemisphere */
50
36   extern double  maxarad;         /* maximum ambient radius */
37   extern double  minarad;         /* minimum ambient radius */
38  
# Line 55 | Line 40 | extern double  minarad;                /* minimum ambient radius */
40   #define  AVGREFL        0.5     /* assumed average reflectance */
41   #endif
42  
43 < #define  AMBVALSIZ      75      /* number of bytes in portable AMBVAL struct */
44 < #define  AMBMAGIC       557     /* 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);
69 extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
70                                AMBTREE *at, FVECT c0, double s);
71 extern double   makeambient(COLOR acol, RAY *r, FVECT rn, int al);
72 extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
54   extern int      ambsync(void);
55                                          /* defined in ambcomp.c */
56 < extern double   doambient(COLOR acol, RAY *r, double wt,
57 <                                        FVECT pg, FVECT dg);
58 < extern void     inithemi(AMBHEMI *hp, COLOR ac, RAY *r, double wt);
78 < extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
79 < extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
80 < extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
81 < extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
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);
86 extern int      ambvalOK(AMBVAL *av);
66   extern int      readambval(AMBVAL *av, FILE *fp);
67 <                                        /* defined in lookamb.c */
89 < extern void     lookamb(FILE *fp);
90 < extern void     writamb(FILE *fp);
91 <
67 > extern int      ambvalOK(AMBVAL *av);
68  
69   #ifdef __cplusplus
70   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines