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.26 by greg, Mon Mar 7 17:52:14 2022 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 <        unsigned long  latick;  /* last accessed tick */
18 >        struct ambrec  *next;   /* next in list */
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 */
24 >        float  rad[2];          /* anisotropic radii (rad[0] <= rad[1]) */
25          COLOR  val;             /* computed ambient value */
26 <        float  gpos[3];         /* gradient wrt. position */
27 <        float  gdir[3];         /* gradient wrt. direction */
28 <        struct ambrec  *next;   /* next in list */
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 33 | Line 33 | typedef struct ambtree {
33          struct ambtree  *kid;   /* 8 child nodes */
34   }  AMBTREE;                     /* ambient octree */
35  
36 – typedef struct {
37 –        short  t, p;            /* theta, phi indices */
38 –        COLOR  v;               /* value sum */
39 –        float  r;               /* 1/distance sum */
40 –        float  k;               /* variance for this division */
41 –        int  n;                 /* number of subsamples */
42 – }  AMBSAMP;             /* ambient sample division */
43 –
44 – typedef struct {
45 –        COLOR  acoef;           /* coefficient for rayorigin() */
46 –        FVECT  ux, uy, uz;      /* x, y and z axis directions */
47 –        short  nt, np;          /* number of theta and phi directions */
48 – }  AMBHEMI;             /* ambient sample hemisphere */
49 –
36   extern double  maxarad;         /* maximum ambient radius */
37   extern double  minarad;         /* minimum ambient radius */
38  
# Line 54 | 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      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 65 | 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);
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);
54   extern int      ambsync(void);
55                                          /* defined in ambcomp.c */
56 < extern double   doambient(COLOR acol, RAY *r, COLOR ac, double wt,
57 <                                        FVECT pg, FVECT dg);
58 < extern int      inithemi(AMBHEMI *hp, RAY *r, COLOR ac, double wt);
77 < extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
78 < extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
79 < extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
80 < extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
56 > extern int      doambient(COLOR 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 void     putambmagic(FILE *fp);
61   extern int      hasambmagic(FILE *fp);
62   extern int      writambval(AMBVAL *av, FILE *fp);
85 – extern int      ambvalOK(AMBVAL *av);
63   extern int      readambval(AMBVAL *av, FILE *fp);
64 <                                        /* defined in lookamb.c */
88 < extern void     lookamb(FILE *fp);
89 < extern void     writamb(FILE *fp);
90 <
64 > extern int      ambvalOK(AMBVAL *av);
65  
66   #ifdef __cplusplus
67   }

Diff Legend

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