ViewVC Help

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

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

Comparing ray/src/cv/bsdfinterp.c (file contents):
Revision 2.4 by greg, Tue Oct 23 21:09:29 2012 UTC vs.
Revision 2.9 by greg, Fri Dec 14 22:41:44 2012 UTC

#	Line 126 | Line 126 | in_tri(const RBFNODE *v1, const RBFNODE *v2, const RBF
126		return(sgn2 == sgn3);
127		}
128
129	<	/* Test and set for edge */
129	>	/* Test (and set) bitmap for edge */
130		static int
131		check_edge(unsigned char *emap, int nedges, const MIGRATION *mig, int mark)
132		{
#	Line 151 | Line 151 | static int
151		in_mesh(MIGRATION *miga[3], unsigned char *emap, int nedges,
152		const FVECT ivec, MIGRATION *mig)
153		{
154	<	MIGRATION       *ej1, *ej2;
155	<	RBFNODE         *tv;
154	>	RBFNODE         *tv[2];
155	>	MIGRATION       *sej[2], *dej[2];
156	>	int             i;
157		/* check visitation record */
158		if (!check_edge(emap, nedges, mig, 1))
159		return(0);
#	Line 160 | Line 161 | in_mesh(MIGRATION *miga[3], unsigned char *emap, int n
161		miga[0] = mig;                  /* close enough to edge */
162		return(1);
163		}
164	<	/* do triangles either side */
165	<	for (ej1 = mig->rbfv[0]->ejl; ej1 != NULL;
166	<	ej1 = nextedge(mig->rbfv[0],ej1)) {
167	<	if (ej1 == mig)
168	<	continue;
169	<	tv = opp_rbf(mig->rbfv[0],ej1);
170	<	for (ej2 = tv->ejl; ej2 != NULL; ej2 = nextedge(tv,ej2))
171	<	if (opp_rbf(tv,ej2) == mig->rbfv[1]) {
172	<	int     do_ej1 = check_edge(emap, nedges, ej1, 0);
173	<	int     do_ej2 = check_edge(emap, nedges, ej2, 0);
174	<	if (do_ej1 && in_mesh(miga, emap, nedges, ivec, ej1))
175	<	return(1);
176	<	if (do_ej2 && in_mesh(miga, emap, nedges, ivec, ej2))
177	<	return(1);
178	<	/* check just once */
178	<	if (do_ej1 & do_ej2 && in_tri(mig->rbfv[0],
179	<	mig->rbfv[1], tv, ivec)) {
180	<	miga[0] = mig;
181	<	miga[1] = ej1;
182	<	miga[2] = ej2;
183	<	return(1);
164	>	if (!get_triangles(tv, mig))            /* do triangles either side? */
165	>	return(0);
166	>	for (i = 2; i--; ) {                    /* identify edges to check */
167	>	MIGRATION       *ej;
168	>	sej[i] = dej[i] = NULL;
169	>	if (tv[i] == NULL)
170	>	continue;
171	>	for (ej = tv[i]->ejl; ej != NULL; ej = nextedge(tv[i],ej)) {
172	>	RBFNODE *rbfop = opp_rbf(tv[i],ej);
173	>	if (rbfop == mig->rbfv[0]) {
174	>	if (check_edge(emap, nedges, ej, 0))
175	>	sej[i] = ej;
176	>	} else if (rbfop == mig->rbfv[1]) {
177	>	if (check_edge(emap, nedges, ej, 0))
178	>	dej[i] = ej;
179		}
180		}
181		}
182	+	for (i = 2; i--; ) {                    /* check triangles just once */
183	+	if (sej[i] != NULL && in_mesh(miga, emap, nedges, ivec, sej[i]))
184	+	return(1);
185	+	if (dej[i] != NULL && in_mesh(miga, emap, nedges, ivec, dej[i]))
186	+	return(1);
187	+	if ((sej[i] == NULL) | (dej[i] == NULL))
188	+	continue;
189	+	if (in_tri(mig->rbfv[0], mig->rbfv[1], tv[i], ivec)) {
190	+	miga[0] = mig;
191	+	miga[1] = sej[i];
192	+	miga[2] = dej[i];
193	+	return(1);
194	+	}
195	+	}
196		return(0);                              /* not near this edge */
197		}
198
#	Line 202 | Line 211 | get_interp(MIGRATION *miga[3], FVECT invec)
211		input_orient*invec[2]) {
212		for (miga[0] = rbf->ejl; miga[0] != NULL;
213		miga[0] = nextedge(rbf,miga[0]))
214	<	if (opp_rbf(rbf,miga[0]) == rbf->next)
214	>	if (opp_rbf(rbf,miga[0]) == rbf->next) {
215	>	double  nf = 1.-rbf->invec[2]*rbf->invec[2];
216	>	if (nf > FTINY) {
217	>	nf = sqrt((1.-invec[2]*invec[2])/nf);
218	>	invec[0] = nf*rbf->invec[0];
219	>	invec[1] = nf*rbf->invec[1];
220	>	}
221		return(0);
222	+	}
223		break;
224		}
225		}
#	Line 224 | Line 240 | get_interp(MIGRATION *miga[3], FVECT invec)
240		exit(1);
241		}
242		/* identify intersection  */
243	<	if (!in_mesh(miga, emap, nedges, invec, mig_list))
243	>	if (!in_mesh(miga, emap, nedges, invec, mig_list)) {
244	>	#ifdef DEBUG
245	>	fprintf(stderr,
246	>	"Incident angle (%.1f,%.1f) deg. outside mesh\n",
247	>	get_theta180(invec), get_phi360(invec));
248	>	#endif
249		sym = -1;               /* outside mesh */
250	<	else if (miga[1] != NULL &&
250	>	} else if (miga[1] != NULL &&
251		(miga[2] == NULL || !order_triangle(miga))) {
252		#ifdef DEBUG
253		fputs("Munged triangle in get_interp()\n", stderr);
#	Line 247 | Line 268 | e_advect_rbf(const MIGRATION *mig, const FVECT invec)
268		double          t, full_dist;
269		/* get relative position */
270		t = acos(DOT(invec, mig->rbfv[0]->invec));
271	<	if (t < M_PI/GRIDRES) {                 /* near first DSF */
271	>	if (t < M_PI/grid_res) {                /* near first DSF */
272		n = sizeof(RBFNODE) + sizeof(RBFVAL)*(mig->rbfv[0]->nrbf-1);
273		rbf = (RBFNODE *)malloc(n);
274		if (rbf == NULL)
275		goto memerr;
276		memcpy(rbf, mig->rbfv[0], n);   /* just duplicate */
277	+	rbf->next = NULL; rbf->ejl = NULL;
278		return(rbf);
279		}
280		full_dist = acos(DOT(mig->rbfv[0]->invec, mig->rbfv[1]->invec));
281	<	if (t > full_dist-M_PI/GRIDRES) {       /* near second DSF */
281	>	if (t > full_dist-M_PI/grid_res) {      /* near second DSF */
282		n = sizeof(RBFNODE) + sizeof(RBFVAL)*(mig->rbfv[1]->nrbf-1);
283		rbf = (RBFNODE *)malloc(n);
284		if (rbf == NULL)
285		goto memerr;
286		memcpy(rbf, mig->rbfv[1], n);   /* just duplicate */
287	+	rbf->next = NULL; rbf->ejl = NULL;
288		return(rbf);
289		}
290		t /= full_dist;
#	Line 332 | Line 355 | advect_rbf(const FVECT invec)
355		return(NULL);
356		if (miga[1] == NULL) {                  /* advect along edge? */
357		rbf = e_advect_rbf(miga[0], sivec);
358	<	rev_rbf_symmetry(rbf, sym);
358	>	if (single_plane_incident)
359	>	rotate_rbf(rbf, invec);
360	>	else
361	>	rev_rbf_symmetry(rbf, sym);
362		return(rbf);
363		}
364		#ifdef DEBUG
#	Line 400 | Line 426 | advect_rbf(const FVECT invec)
426		float               mc = mtx_coef(miga[2],i,k);
427		const RBFVAL        *rbf2k;
428		double              rad2k;
403	–	FVECT               vout;
429		int                 pos[2];
430		if ((mb <= FTINY) & (mc <= FTINY))
431		continue;
#	Line 409 | Line 434 | advect_rbf(const FVECT invec)
434		rad2k = R2ANG(rbf2k->crad);
435		rbf->rbfa[n].crad = ANG2R(sqrt(srad2 + t*rad2k*rad2k));
436		ovec_from_pos(v2, rbf2k->gx, rbf2k->gy);
437	<	geodesic(vout, v1, v2, t, GEOD_REL);
438	<	pos_from_vec(pos, vout);
437	>	geodesic(v2, v1, v2, t, GEOD_REL);
438	>	pos_from_vec(pos, v2);
439		rbf->rbfa[n].gx = pos[0];
440		rbf->rbfa[n].gy = pos[1];
441		++n;

Diff Legend

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