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.11 by greg, Wed Feb 23 18:18:21 2005 UTC vs.
Revision 2.25 by greg, Tue May 14 17:39:10 2019 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 */
19          unsigned long  latick;  /* last accessed tick */
20          float  pos[3];          /* position in space */
21 <        float  dir[3];          /* normal direction */
22 <        int  lvl;               /* recursion level of parent ray */
21 >        int32  ndir;            /* encoded surface normal */
22 >        int32  udir;            /* u-vector direction */
23 >        short  lvl;             /* recursion level of parent ray */
24          float  weight;          /* weight of parent ray */
25 <        float  rad;             /* validity radius */
25 >        float  rad[2];          /* anisotropic radii (rad[0] <= rad[1]) */
26          COLOR  val;             /* computed ambient value */
27 <        float  gpos[3];         /* gradient wrt. position */
28 <        float  gdir[3];         /* gradient wrt. direction */
29 <        struct ambrec  *next;   /* next in list */
27 >        float  gpos[2];         /* (u,v) gradient wrt. position */
28 >        float  gdir[2];         /* (u,v) gradient wrt. direction */
29 >        uint32  corral;         /* potential light leak direction flags */
30   }  AMBVAL;                      /* ambient value */
31  
32   typedef struct ambtree {
# Line 33 | Line 34 | typedef struct ambtree {
34          struct ambtree  *kid;   /* 8 child nodes */
35   }  AMBTREE;                     /* ambient octree */
36  
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        FVECT  ux, uy, uz;      /* x, y and z axis directions */
46        short  nt, np;          /* number of theta and phi directions */
47 }  AMBHEMI;             /* ambient sample hemisphere */
48
37   extern double  maxarad;         /* maximum ambient radius */
38   extern double  minarad;         /* minimum ambient radius */
39  
# Line 53 | Line 41 | extern double  minarad;                /* minimum ambient radius */
41   #define  AVGREFL        0.5     /* assumed average reflectance */
42   #endif
43  
44 < #define  AMBVALSIZ      75      /* number of bytes in portable AMBVAL struct */
45 < #define  AMBMAGIC       557     /* magic number for ambient value files */
44 > #define  AMBVALSIZ      67      /* number of bytes in portable AMBVAL struct */
45 > #define  AMBMAGIC       559     /* magic number for ambient value files */
46   #define  AMBFMT         "Radiance_ambval"       /* format id string */
47  
60                                        /* defined in ambcomp.c */
61 extern int      divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
62 extern double   doambient(COLOR acol, RAY *r, double wt, FVECT pg, FVECT dg);
63 extern void     inithemi(AMBHEMI *hp, RAY *r, double wt);
64 extern void     comperrs(AMBSAMP *da, AMBHEMI *hp);
65 extern void     posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
66 extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
48                                          /* defined in ambient.c */
49   extern void     setambres(int ar);
50   extern void     setambacc(double newa);
51   extern void     setambient(void);
52 + extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
53   extern void     ambdone(void);
54   extern void     ambnotify(OBJECT obj);
73 extern void     ambient(COLOR acol, RAY *r, FVECT nrm);
74 extern double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
75                                AMBTREE *at, FVECT c0, double s);
76 extern double   makeambient(COLOR acol, RAY *r, FVECT rn, int al);
77 extern void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
55   extern int      ambsync(void);
56 +                                        /* defined in ambcomp.c */
57 + extern int      doambient(COLOR acol, RAY *r, double wt,
58 +                                FVECT uv[2], float rad[2],
59 +                                float gpos[2], float gdir[2], uint32 *crlp);
60                                          /* defined in ambio.c */
61   extern void     putambmagic(FILE *fp);
62   extern int      hasambmagic(FILE *fp);
63   extern int      writambval(AMBVAL *av, FILE *fp);
83 extern int      ambvalOK(AMBVAL *av);
64   extern int      readambval(AMBVAL *av, FILE *fp);
65 <                                        /* defined in lookamb.c */
86 < extern void     lookamb(FILE *fp);
87 < extern void     writamb(FILE *fp);
88 <
65 > extern int      ambvalOK(AMBVAL *av);
66  
67   #ifdef __cplusplus
68   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines