ViewVC Help

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

root/Development/ray/src/cv/bsdfrbf.c

Comparing ray/src/cv/bsdfrbf.c (file contents):
Revision 2.9 by greg, Thu Oct 17 19:09:11 2013 UTC vs.
Revision 2.10 by greg, Fri Oct 18 02:49:30 2013 UTC

#	Line 15 | Line 15 | static const char RCSid[] = "$Id$";
15		#include "bsdfrep.h"
16
17		#ifndef MINRSCA
18	<	#define MINRSCA         0.15            /* minimum radius scaling factor */
18	>	#define MINRSCA         0.5             /* minimum radius scaling factor */
19		#endif
20		#ifndef MAXRSCA
21		#define MAXRSCA         2.7             /* maximum radius scaling factor */
22		#endif
23	+	#ifndef DIFFTHRESH
24	+	#define DIFFTHRESH      0.2             /* culling difference threshold */
25	+	#endif
26		#ifndef MAXFRAC
27		#define MAXFRAC         0.5             /* maximum contribution to neighbor */
28		#endif
#	Line 72 | Line 75 | add_bsdf_data(double theta_out, double phi_out, double
75		dsf_grid[pos[0]][pos[1]].nval++;
76		}
77
78	+	/* Check if the two DSF values are significantly different */
79	+	static int
80	+	big_diff(double ref, double tst)
81	+	{
82	+	if (ref > 0) {
83	+	tst = tst/ref - 1.;
84	+	if (tst < 0) tst = -tst;
85	+	} else
86	+	tst *= 50.;
87	+	return(tst > DIFFTHRESH);
88	+	}
89	+
90		/* Compute radii for non-empty bins */
91		/* (distance to furthest empty bin for which non-empty test bin is closest) */
92		static void
#	Line 84 | Line 99 | compute_radii(void)
99		double          ang2, lastang2;
100		int             r, i, j, jn, ii, jj, inear, jnear;
101
87	–	for (i = 0; i < GRIDRES; i++)           /* initialize minimum radii */
88	–	for (j = 0; j < GRIDRES; j++)
89	–	if (dsf_grid[i][j].nval)
90	–	dsf_grid[i][j].crad = cradmin;
91	–
102		r = GRIDRES/2;                          /* proceed in zig-zag */
103		for (i = 0; i < GRIDRES; i++)
104		for (jn = 0; jn < GRIDRES; jn++) {
#	Line 127 | Line 137 | compute_radii(void)
137		/* next search radius */
138		r = ang2*(2.*GRIDRES/M_PI) + 3;
139		}
140	+	for (i = 0; i < GRIDRES; i++)           /* grow radii where uniform */
141	+	for (j = 0; j < GRIDRES; j++) {
142	+	double  midmean;
143	+	if (!dsf_grid[i][j].nval)
144	+	continue;
145	+	midmean = dsf_grid[i][j].vsum / (double)dsf_grid[i][j].nval;
146	+	r = R2ANG(dsf_grid[i][j].crad)*(MAXRSCA*GRIDRES/M_PI);
147	+	while (++r < GRIDRES) {         /* attempt to grow perimeter */
148	+	for (ii = i-r; ii <= i+r; ii++) {
149	+	int     jstep = 1;
150	+	if (ii < 0) continue;
151	+	if (ii >= GRIDRES) break;
152	+	if ((i-r < ii) & (ii < i+r))
153	+	jstep = r<<1;
154	+	for (jj = j-r; jj <= j+r; jj += jstep) {
155	+	if (jj < 0) continue;
156	+	if (jj >= GRIDRES) break;
157	+	if (dsf_grid[ii][jj].nval && big_diff(midmean,
158	+	dsf_grid[ii][jj].vsum /
159	+	(double)dsf_grid[ii][jj].nval))
160	+	goto hit_diff;
161	+	}
162	+	}
163	+	}
164	+	hit_diff:       --r;
165	+	dsf_grid[i][j].crad = ANG2R(r*(M_PI/MAXRSCA/GRIDRES));
166	+	if (dsf_grid[i][j].crad < cradmin)
167	+	dsf_grid[i][j].crad = cradmin;
168	+	}
169		/* blur radii over hemisphere */
170		memset(fill_grid, 0, sizeof(fill_grid));
171		memset(fill_cnt, 0, sizeof(fill_cnt));
#	Line 171 | Line 210 | cull_values(void)
210		continue;               /* shouldn't happen */
211		ovec_from_pos(ovec0, i, j);
212		maxang = 2.*R2ANG(dsf_grid[i][j].crad);
213	<	if (maxang > ovec0[2])          /* clamp near horizon */
214	<	maxang = ovec0[2];
213	>	/* clamp near horizon */
214	>	if (maxang > output_orient*ovec0[2])
215	>	maxang = output_orient*ovec0[2];
216		r = maxang*(2.*GRIDRES/M_PI) + 1;
217		maxang2 = maxang*maxang;
218		for (ii = i-r; ii <= i+r; ii++) {

Diff Legend

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