ViewVC Help

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

root/Development/ray/src/common/tmesh.c

Comparing ray/src/common/tmesh.c (file contents):
Revision 2.1 by greg, Mon Mar 10 19:38:19 2003 UTC vs.
Revision 2.5 by greg, Thu Mar 2 17:16:56 2006 UTC

#	Line 21 | Line 21 | FVECT  v1, v2, v3, n1, n2, n3;
21		double  d1, d2, d3;
22		FVECT   vt1, vt2, vn;
23		/* compute default normal */
24	<	vt1[0] = v2[0] - v1[0]; vt1[1] = v2[1] - v1[1]; vt1[2] = v2[2] - v1[2];
25	<	vt2[0] = v3[0] - v2[0]; vt2[1] = v3[1] - v2[1]; vt2[2] = v3[2] - v2[2];
26	<	fcross(vn, vt1, vt2);
24	>	VSUB(vt1, v2, v1);
25	>	VSUB(vt2, v3, v2);
26	>	VCROSS(vn, vt1, vt2);
27		if (normalize(vn) == 0.0)
28		return(DEGEN);
29		/* compare to supplied normals */
#	Line 42 | Line 42 | FVECT  v1, v2, v3, n1, n2, n3;
42		int
43		comp_baryc(bcm, v1, v2, v3)             /* compute barycentric vectors */
44		register BARYCCM        *bcm;
45	<	FLOAT   *v1, *v2, *v3;
45	>	RREAL                   *v1, *v2, *v3;
46		{
47	<	FLOAT   *vt;
47	>	RREAL   *vt;
48		FVECT   va, vab, vcb;
49		double  d;
50		int     ax0, ax1;
51		register int    i;
52		/* compute major axis */
53	<	for (i = 0; i < 3; i++) {
54	<	vab[i] = v1[i] - v2[i];
55	<	vcb[i] = v3[i] - v2[i];
56	<	}
57	<	fcross(va, vab, vcb);
53	>	VSUB(vab, v1, v2);
54	>	VSUB(vcb, v3, v2);
55	>	VCROSS(va, vab, vcb);
56		bcm->ax = ABS(va[0]) > ABS(va[1]) ? 0 : 1;
57		bcm->ax = ABS(va[bcm->ax]) > ABS(va[2]) ? bcm->ax : 2;
58	<	ax0 = (bcm->ax + 1) % 3;
59	<	ax1 = (bcm->ax + 2) % 3;
58	>	if ((ax0 = bcm->ax + 1) >= 3) ax0 -= 3;
59	>	if ((ax1 = ax0 + 1) >= 3) ax1 -= 3;
60		for (i = 0; i < 2; i++) {
61		vab[0] = v1[ax0] - v2[ax0];
62		vcb[0] = v3[ax0] - v2[ax0];
#	Line 87 | Line 85 | FLOAT  *v1, *v2, *v3;
85		}
86
87
88	<	put_baryc(bcm, com, n)                  /* put barycentric coord. vectors */
88	>	void
89	>	eval_baryc(wt, p, bcm)          /* evaluate barycentric weights at p */
90	>	RREAL   wt[3];
91	>	FVECT   p;
92		register BARYCCM        *bcm;
92	–	register FLOAT  com[][3];
93	–	int     n;
93		{
94	+	double  u, v;
95	+	int     i;
96	+
97	+	if ((i = bcm->ax + 1) >= 3) i -= 3;
98	+	u = p[i];
99	+	if (++i >= 3) i -= 3;
100	+	v = p[i];
101	+	wt[0] = u*bcm->tm[0][0] + v*bcm->tm[0][1] + bcm->tm[0][2];
102	+	wt[1] = u*bcm->tm[1][0] + v*bcm->tm[1][1] + bcm->tm[1][2];
103	+	wt[2] = 1. - wt[1] - wt[0];
104	+	}
105	+
106	+
107	+	int
108	+	get_baryc(wt, p, v1, v2, v3)    /* compute barycentric weights at p */
109	+	RREAL   wt[3];
110	+	FVECT   p;
111	+	FVECT   v1, v2, v3;
112	+	{
113	+	BARYCCM bcm;
114	+
115	+	if (comp_baryc(&bcm, v1, v2, v3) < 0)
116	+	return(-1);
117	+	eval_baryc(wt, p, &bcm);
118	+	return(0);
119	+	}
120	+
121	+
122	+	#if 0
123	+	int
124	+	get_baryc(wt, p, v1, v2, v3)    /* compute barycentric weights at p */
125	+	RREAL   wt[3];
126	+	FVECT   p;
127	+	FVECT   v1, v2, v3;
128	+	{
129	+	FVECT   ac, bc, pc, cros;
130	+	double  normf;
131	+	/* area formula w/o 2-D optimization */
132	+	VSUB(ac, v1, v3);
133	+	VSUB(bc, v2, v3);
134	+	VSUB(pc, p, v3);
135	+	VCROSS(cros, ac, bc);
136	+	normf = DOT(cros,cros)
137	+	if (normf <= 0.0)
138	+	return(-1);
139	+	normf = 1./sqrt(normf);
140	+	VCROSS(cros, bc, pc);
141	+	wt[0] = VLEN(cros) * normf;
142	+	VCROSS(cros, ac, pc);
143	+	wt[1] = VLEN(cros) * normf;
144	+	wt[2] = 1. - wt[1] - wt[0];
145	+	return(0);
146	+	}
147	+	#endif
148	+
149	+
150	+	void
151	+	put_baryc(bcm, com, n)          /* put barycentric coord. vectors */
152	+	register BARYCCM        *bcm;
153	+	register RREAL          com[][3];
154	+	int                     n;
155	+	{
156		double  a, b;
157	<	register int    i, j;
157	>	register int    i;
158
159		printf("%d\t%d\n", 1+3*n, bcm->ax);
160		for (i = 0; i < n; i++) {

Diff Legend

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