ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/ambient.h

Comparing ray/src/rt/ambient.h (file contents):
Revision 2.20 by greg, Fri Apr 11 22:54:34 2014 UTC vs.
Revision 2.25 by greg, Tue May 14 17:39:10 2019 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		*/
#	Line 22 | Line 20 | typedef struct ambrec {
20		float  pos[3];          /* position in space */
21		int32  ndir;            /* encoded surface normal */
22		int32  udir;            /* u-vector direction */
23	<	int    lvl;             /* recursion level of parent ray */
23	>	short  lvl;             /* recursion level of parent ray */
24		float  weight;          /* weight of parent ray */
25		float  rad[2];          /* anisotropic radii (rad[0] <= rad[1]) */
26		COLOR  val;             /* computed ambient value */
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 35 | Line 34 | typedef struct ambtree {
34		struct ambtree  *kid;   /* 8 child nodes */
35		}  AMBTREE;                     /* ambient octree */
36
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	–
37		extern double  maxarad;         /* maximum ambient radius */
38		extern double  minarad;         /* minimum ambient radius */
39
#	Line 57 | Line 41 | extern double  minarad;                /* minimum ambient radius */
41		#define  AVGREFL        0.5     /* assumed average reflectance */
42		#endif
43
44	<	#define  AMBVALSIZ      63      /* number of bytes in portable AMBVAL struct */
45	<	#define  AMBMAGIC       558     /* 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
48		/* defined in ambient.c */
#	Line 72 | Line 56 | 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]);
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);
64		extern int      readambval(AMBVAL *av, FILE *fp);
65		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 */
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 */
101	–	}  AMBVAL;                      /* ambient value */
102	–
103	–	typedef struct ambtree {
104	–	AMBVAL  *alist;         /* ambient value list */
105	–	struct ambtree  *kid;   /* 8 child nodes */
106	–	}  AMBTREE;                     /* ambient octree */
107	–
108	–	typedef struct {
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 */
113	–	unsigned short  t, p;   /* theta, phi indices */
114	–	}  AMBSAMP;             /* ambient sample division */
115	–
116	–	typedef struct {
117	–	FVECT  ux, uy, uz;      /* x, y and z axis 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 */
124	–	extern double  minarad;         /* minimum ambient radius */
125	–
126	–	#ifndef AVGREFL
127	–	#define  AVGREFL        0.5     /* assumed average reflectance */
128	–	#endif
129	–
130	–	#define  AMBVALSIZ      75      /* number of bytes in portable AMBVAL struct */
131	–	#define  AMBMAGIC       557     /* magic number for ambient value files */
132	–	#define  AMBFMT         "Radiance_ambval"       /* format id string */
133	–
134	–	/* defined in ambient.c */
135	–	extern void     setambres(int ar);
136	–	extern void     setambacc(double newa);
137	–	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);
141	–	extern int      ambsync(void);
142	–	/* defined in ambcomp.c */
143	–	extern double   doambient(COLOR acol, RAY *r, double wt,
144	–	FVECT pg, FVECT dg);
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);
149	–	extern void     dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
150	–	/* defined in ambio.c */
151	–	extern void     putambmagic(FILE *fp);
152	–	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);
156	–
157	–	#endif  /* ! NEWAMB */
66
67		#ifdef __cplusplus
68		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)