ViewVC Help

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

root/Development/ray/src/hd/holo.c

Comparing ray/src/hd/holo.c (file contents):
Revision 3.1 by gregl, Fri Oct 31 10:23:29 1997 UTC vs.
Revision 3.5 by gregl, Tue Nov 11 15:14:02 1997 UTC

#	Line 16 | Line 16 | float  hd_depthmap[DCINF-DCLIN];
16
17		static double   logstep;
18
19	+	static int      wg0[6] = {1,1,2,2,0,0};
20	+	static int      wg1[6] = {2,2,0,0,1,1};
21
22	+
23		hdcompgrid(hp)                  /* compute derived grid vector and index */
24		register HOLO   *hp;
25		{
#	Line 59 | Line 62 | register HOLO  *hp;
62		for (i = 1; i < 6; i++) {
63		hp->wi[i] = 0;
64		for (j = i; j < 6; j++)
65	<	hp->wi[i] += hp->grid[((j>>1)+1)%3] *
66	<	hp->grid[((j>>1)+2)%3];
64	<	hp->wi[i] *= hp->grid[(((i-1)>>1)+1)%3] *
65	<	hp->grid[(((i-1)>>1)+2)%3];
65	>	hp->wi[i] += hp->grid[wg0[j]] * hp->grid[wg1[j]];
66	>	hp->wi[i] *= hp->grid[wg0[i-1]] * hp->grid[wg1[i-1]];
67		hp->wi[i] += hp->wi[i-1];
68		}
69		}
#	Line 103 | Line 104 | HDGRID *hproto;
104
105
106		hdbcoord(gc, hp, i)             /* compute beam coordinates from index */
107	<	BCOORD  gc;             /* returned */
107	>	GCOORD  gc[2];          /* returned */
108		register HOLO   *hp;
109		register int    i;
110		{
111		register int    j, n;
112		int     n2, reverse;
113	<	BCOORD  g2;
113	>	GCOORD  g2[2];
114		/* check range */
115		if (i < 1 | i > nbeams(hp))
116		return(0);
#	Line 120 | Line 121 | register int   i;
121		break;
122		i -= hp->wi[gc[0].w=j];
123		/* find w1 */
124	<	n2 = hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
124	>	n2 = hp->grid[wg0[j]] * hp->grid[wg1[j]];
125		while (++j < 5) {
126	<	n = n2 * hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
126	>	n = n2 * hp->grid[wg0[j]] * hp->grid[wg1[j]];
127		if (n > i)
128		break;
129		i -= n;
130		}
131		gc[1].w = j;
132		/* find position on w0 */
133	<	n2 = hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
133	>	n2 = hp->grid[wg0[j]] * hp->grid[wg1[j]];
134		n = i / n2;
135	<	gc[0].i[1] = n / hp->grid[((gc[0].w>>1)+1)%3];
136	<	gc[0].i[0] = n - gc[0].i[1]*hp->grid[((gc[0].w>>1)+1)%3];
135	>	gc[0].i[1] = n / hp->grid[wg0[gc[0].w]];
136	>	gc[0].i[0] = n - gc[0].i[1]*hp->grid[wg0[gc[0].w]];
137		i -= n*n2;
138		/* find position on w1 */
139	<	gc[1].i[1] = i / hp->grid[((gc[1].w>>1)+1)%3];
140	<	gc[1].i[0] = i - gc[1].i[1]*hp->grid[((gc[1].w>>1)+1)%3];
139	>	gc[1].i[1] = i / hp->grid[wg0[gc[1].w]];
140	>	gc[1].i[0] = i - gc[1].i[1]*hp->grid[wg0[gc[1].w]];
141		if (reverse) {
142		copystruct(g2, gc+1);
143		copystruct(gc+1, gc);
#	Line 149 | Line 150 | register int   i;
150		int
151		hdbindex(hp, gc)                /* compute index from beam coordinates */
152		register HOLO   *hp;
153	<	register BCOORD gc;
153	>	register GCOORD gc[2];
154		{
155	<	BCOORD  g2;
155	>	GCOORD  g2[2];
156		int     reverse;
157		register int    i, j;
158		/* check ordering and limits */
#	Line 165 | Line 166 | register BCOORD        gc;
166		return(0);
167		i = 0;                          /* compute index */
168		for (j = gc[0].w+1; j < gc[1].w; j++)
169	<	i += hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
170	<	i *= hp->grid[((gc[0].w>>1)+1)%3] * hp->grid[((gc[0].w>>1)+2)%3];
169	>	i += hp->grid[wg0[j]] * hp->grid[wg1[j]];
170	>	i *= hp->grid[wg0[gc[0].w]] * hp->grid[wg1[gc[0].w]];
171		i += hp->wi[gc[0].w];
172	<	i += (hp->grid[((gc[0].w>>1)+1)%3]*gc[0].i[1] + gc[0].i[0]) *
173	<	hp->grid[((gc[1].w>>1)+1)%3] *
174	<	hp->grid[((gc[1].w>>1)+2)%3] ;
174	<	i += hp->grid[((gc[1].w>>1)+1)%3]*gc[1].i[1] + gc[1].i[0];
172	>	i += (hp->grid[wg0[gc[0].w]]*gc[0].i[1] + gc[0].i[0]) *
173	>	hp->grid[wg0[gc[1].w]] * hp->grid[wg1[gc[1].w]] ;
174	>	i += hp->grid[wg0[gc[1].w]]*gc[1].i[1] + gc[1].i[0];
175		if (reverse)
176		i += hp->wi[5] - 1;
177		return(i);
178		}
179
180
181	+	hdcell(cp, hp, gc)              /* compute cell coordinates */
182	+	register FVECT  cp[4];  /* returned (may be passed as FVECT cp[2][2]) */
183	+	register HOLO   *hp;
184	+	register GCOORD *gc;
185	+	{
186	+	register FLOAT  *v;
187	+	double  d;
188	+	/* compute common component */
189	+	VCOPY(cp[0], hp->orig);
190	+	if (gc->w & 1) {
191	+	v = hp->xv[gc->w>>1];
192	+	cp[0][0] += v[0]; cp[0][1] += v[1]; cp[0][2] += v[2];
193	+	}
194	+	v = hp->xv[wg0[gc->w]];
195	+	d = (double)gc->i[0] / hp->grid[wg0[gc->w]];
196	+	VSUM(cp[0], cp[0], v, d);
197	+	v = hp->xv[wg1[gc->w]];
198	+	d = (double)gc->i[1] / hp->grid[wg1[gc->w]];
199	+	VSUM(cp[0], cp[0], v, d);
200	+	/* compute x1 sums */
201	+	v = hp->xv[wg0[gc->w]];
202	+	d = 1.0 / hp->grid[wg0[gc->w]];
203	+	VSUM(cp[1], cp[0], v, d);
204	+	VSUM(cp[3], cp[0], v, d);
205	+	/* compute y1 sums */
206	+	v = hp->xv[wg1[gc->w]];
207	+	d = 1.0 / hp->grid[wg1[gc->w]];
208	+	VSUM(cp[2], cp[0], v, d);
209	+	VSUM(cp[3], cp[3], v, d);
210	+	}
211	+
212	+
213		hdlseg(lseg, hp, i)                     /* compute line segment for beam */
214	<	int     lseg[2][3];
214	>	register int    lseg[2][3];
215		register HOLO   *hp;
216		int     i;
217		{
218	<	BCOORD  gc;
218	>	GCOORD  gc[2];
219		register int    k;
220
221	<	if (!hdbcoord(gc, hp, i))
221	>	if (!hdbcoord(gc, hp, i))               /* compute grid coordinates */
222		return(0);
223	<	for (k = 0; k < 2; k++)         /* compute line segment */
224	<	switch (gc[k].w>>1) {
225	<	case 0:
226	<	lseg[k][0] = (gc[k].w & 1) * (hp->grid[0]-1);
227	<	lseg[k][1] = gc[k].i[0];
196	<	lseg[k][2] = gc[k].i[1];
197	<	break;
198	<	case 1:
199	<	lseg[k][0] = gc[k].i[1];
200	<	lseg[k][1] = (gc[k].w & 1) * (hp->grid[1]-1);
201	<	lseg[k][2] = gc[k].i[0];
202	<	break;
203	<	case 2:
204	<	lseg[k][0] = gc[k].i[0];
205	<	lseg[k][1] = gc[k].i[1];
206	<	lseg[k][2] = (gc[k].w & 1) * (hp->grid[2]-1);
207	<	break;
208	<	}
223	>	for (k = 0; k < 2; k++) {               /* compute end points */
224	>	lseg[k][gc[k].w>>1] = gc[k].w&1 ? hp->grid[gc[k].w>>1]-1 : 0 ;
225	>	lseg[k][wg0[gc[k].w]] = gc[k].i[0];
226	>	lseg[k][wg1[gc[k].w]] = gc[k].i[1];
227	>	}
228		return(1);
229		}
230
#	Line 232 | Line 251 | double d;
251		double
252		hdray(ro, rd, hp, gc, r)        /* compute ray within a beam */
253		FVECT   ro, rd;         /* returned */
254	<	register HOLO   *hp;
255	<	register BCOORD gc;
254	>	HOLO    *hp;
255	>	GCOORD  gc[2];
256		BYTE    r[2][2];
257		{
258	<	FVECT   p[2];
259	<	register int    i;
260	<	register FLOAT  *v;
242	<	double  d;
258	>	FVECT   cp[4], p[2];
259	>	register int    i, j;
260	>	double  d0, d1;
261		/* compute entry and exit points */
262		for (i = 0; i < 2; i++) {
263	<	VCOPY(p[i], hp->orig);
264	<	if (gc[i].w & 1) {
265	<	v = hp->xv[gc[i].w>>1];
266	<	p[i][0] += *v++; p[i][1] += *v++; p[i][2] += *v;
267	<	}
268	<	d = ( gc[i].i[0] + (1./256.)*(r[i][0]+.5) ) /
251	<	hp->grid[((gc[i].w>>1)+1)%3];
252	<	v = hp->xv[((gc[i].w>>1)+1)%3];
253	<	p[i][0] += d * *v++; p[i][1] += d * *v++; p[i][2] += d * *v;
254	<	d = (gc[i].i[1] + (1./256.)*(r[i][1]+.5)) /
255	<	hp->grid[((gc[i].w>>1)+2)%3];
256	<	v = hp->xv[((gc[i].w>>1)+2)%3];
257	<	p[i][0] += d * *v++; p[i][1] += d * *v++; p[i][2] += d * *v;
263	>	hdcell(cp, hp, gc+i);
264	>	d0 = (1./256.)*(r[i][0]+.5);
265	>	d1 = (1./256.)*(r[i][1]+.5);
266	>	for (j = 0; j < 3; j++)
267	>	p[i][j] = (1.-d0-d1)*cp[0][j] +
268	>	d0*cp[1][j] + d1*cp[2][j];
269		}
270		VCOPY(ro, p[0]);                /* assign ray origin and direction */
271		rd[0] = p[1][0] - p[0][0];
#	Line 266 | Line 277 | BYTE   r[2][2];
277
278		double
279		hdinter(gc, r, hp, ro, rd)      /* compute ray intersection with section */
280	<	register BCOORD gc;     /* returned */
280	>	register GCOORD gc[2];  /* returned */
281		BYTE    r[2][2];        /* returned */
282		register HOLO   *hp;
283		FVECT   ro, rd;         /* rd should be normalized */
#	Line 323 | Line 334 | FVECT  ro, rd;         /* rd should be normalized */
334		}
335		v = hp->gv[gc[i].w>>1][0];
336		d = DOT(vt, v);
337	<	if (d < 0. || (gc[i].i[0] = d) >= hp->grid[((gc[i].w>>1)+1)%3])
337	>	if (d < 0. || (gc[i].i[0] = d) >= hp->grid[wg0[gc[i].w]])
338		return(FHUGE);          /* outside wall */
339		r[i][0] = 256. * (d - gc[i].i[0]);
340		v = hp->gv[gc[i].w>>1][1];
341		d = DOT(vt, v);
342	<	if (d < 0. || (gc[i].i[1] = d) >= hp->grid[((gc[i].w>>1)+2)%3])
342	>	if (d < 0. || (gc[i].i[1] = d) >= hp->grid[wg1[gc[i].w]])
343		return(FHUGE);          /* outside wall */
344		r[i][1] = 256. * (d - gc[i].i[1]);
345		}

Diff Legend

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