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.11 by gregl, Fri Dec 19 11:49:19 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		{
23	–	FVECT   AxB;
26		double  d;
25	–	register FLOAT  *v;
27		register int    i, j;
28		/* initialize depth map */
29		if (hd_depthmap[0] < 1.) {
#	Line 35 | Line 36 | register HOLO  *hp;
36		}
37		/* compute grid coordinate vectors */
38		for (i = 0; i < 3; i++) {
39	<	fcross(AxB, hp->xv[(i+1)%3], v=hp->xv[(i+2)%3]);
39	<	VCOPY(hp->wn[i], AxB);
39	>	fcross(hp->wn[i], hp->xv[(i+1)%3], hp->xv[(i+2)%3]);
40		if (normalize(hp->wn[i]) == 0.)
41		error(USER, "degenerate holodeck section");
42		hp->wo[i<<1] = DOT(hp->wn[i],hp->orig);
43	<	hp->wo[i<<1|1] = hp->wo[i<<1] + DOT(hp->wn[i],hp->xv[i]);
44	<	fcross(hp->gv[i][0], v, AxB);
45	<	d = DOT(v,v) / DOT(hp->gv[i][0],hp->gv[i][0]) *
46	<	hp->grid[(i+1)%3];
47	<	for (j = 0; j < 3; j++)
48	<	hp->gv[i][0][j] *= d;
49	<	fcross(hp->gv[i][1], AxB, v=hp->xv[(i+1)%3]);
50	<	d = DOT(v,v) / DOT(hp->gv[i][1],hp->gv[i][1]) *
51	<	hp->grid[(i+2)%3];
52	<	for (j = 0; j < 3; j++)
53	<	hp->gv[i][1][j] *= d;
43	>	d = DOT(hp->wn[i],hp->xv[i]);
44	>	hp->wo[i<<1|1] = hp->wo[i<<1] + d;
45	>	hp->wg[i] = (double)hp->grid[i] / d;
46		}
47		/* compute linear depth range */
48		hp->tlin = VLEN(hp->xv[0]) + VLEN(hp->xv[1]) + VLEN(hp->xv[2]);
#	Line 59 | Line 51 | register HOLO  *hp;
51		for (i = 1; i < 6; i++) {
52		hp->wi[i] = 0;
53		for (j = i; j < 6; j++)
54	<	hp->wi[i] += hp->grid[((j>>1)+1)%3] *
55	<	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];
54	>	hp->wi[i] += hp->grid[wg0[j]] * hp->grid[wg1[j]];
55	>	hp->wi[i] *= hp->grid[wg0[i-1]] * hp->grid[wg1[i-1]];
56		hp->wi[i] += hp->wi[i-1];
57		}
58		}
#	Line 103 | Line 93 | HDGRID *hproto;
93
94
95		hdbcoord(gc, hp, i)             /* compute beam coordinates from index */
96	<	BCOORD  gc;             /* returned */
96	>	GCOORD  gc[2];          /* returned */
97		register HOLO   *hp;
98		register int    i;
99		{
100		register int    j, n;
101		int     n2, reverse;
102	<	BCOORD  g2;
102	>	GCOORD  g2[2];
103		/* check range */
104		if (i < 1 | i > nbeams(hp))
105		return(0);
#	Line 120 | Line 110 | register int   i;
110		break;
111		i -= hp->wi[gc[0].w=j];
112		/* find w1 */
113	<	n2 = hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
113	>	n2 = hp->grid[wg0[j]] * hp->grid[wg1[j]];
114		while (++j < 5) {
115	<	n = n2 * hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
115	>	n = n2 * hp->grid[wg0[j]] * hp->grid[wg1[j]];
116		if (n > i)
117		break;
118		i -= n;
119		}
120		gc[1].w = j;
121		/* find position on w0 */
122	<	n2 = hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
122	>	n2 = hp->grid[wg0[j]] * hp->grid[wg1[j]];
123		n = i / n2;
124	<	gc[0].i[1] = n / hp->grid[((gc[0].w>>1)+1)%3];
125	<	gc[0].i[0] = n - gc[0].i[1]*hp->grid[((gc[0].w>>1)+1)%3];
124	>	gc[0].i[1] = n / hp->grid[wg0[gc[0].w]];
125	>	gc[0].i[0] = n - gc[0].i[1]*hp->grid[wg0[gc[0].w]];
126		i -= n*n2;
127		/* find position on w1 */
128	<	gc[1].i[1] = i / hp->grid[((gc[1].w>>1)+1)%3];
129	<	gc[1].i[0] = i - gc[1].i[1]*hp->grid[((gc[1].w>>1)+1)%3];
128	>	gc[1].i[1] = i / hp->grid[wg0[gc[1].w]];
129	>	gc[1].i[0] = i - gc[1].i[1]*hp->grid[wg0[gc[1].w]];
130		if (reverse) {
131		copystruct(g2, gc+1);
132		copystruct(gc+1, gc);
#	Line 149 | Line 139 | register int   i;
139		int
140		hdbindex(hp, gc)                /* compute index from beam coordinates */
141		register HOLO   *hp;
142	<	register BCOORD gc;
142	>	register GCOORD gc[2];
143		{
144	<	BCOORD  g2;
144	>	GCOORD  g2[2];
145		int     reverse;
146		register int    i, j;
147		/* check ordering and limits */
#	Line 165 | Line 155 | register BCOORD        gc;
155		return(0);
156		i = 0;                          /* compute index */
157		for (j = gc[0].w+1; j < gc[1].w; j++)
158	<	i += hp->grid[((j>>1)+1)%3] * hp->grid[((j>>1)+2)%3];
159	<	i *= hp->grid[((gc[0].w>>1)+1)%3] * hp->grid[((gc[0].w>>1)+2)%3];
158	>	i += hp->grid[wg0[j]] * hp->grid[wg1[j]];
159	>	i *= hp->grid[wg0[gc[0].w]] * hp->grid[wg1[gc[0].w]];
160		i += hp->wi[gc[0].w];
161	<	i += (hp->grid[((gc[0].w>>1)+1)%3]*gc[0].i[1] + gc[0].i[0]) *
162	<	hp->grid[((gc[1].w>>1)+1)%3] *
163	<	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];
161	>	i += (hp->grid[wg0[gc[0].w]]*gc[0].i[1] + gc[0].i[0]) *
162	>	hp->grid[wg0[gc[1].w]] * hp->grid[wg1[gc[1].w]] ;
163	>	i += hp->grid[wg0[gc[1].w]]*gc[1].i[1] + gc[1].i[0];
164		if (reverse)
165		i += hp->wi[5] - 1;
166		return(i);
167		}
168
169
170	<	hdlseg(lseg, hp, i)                     /* compute line segment for beam */
171	<	int     lseg[2][3];
170	>	hdcell(cp, hp, gc)              /* compute cell coordinates */
171	>	register FVECT  cp[4];  /* returned (may be passed as FVECT cp[2][2]) */
172		register HOLO   *hp;
173	<	int     i;
173	>	register GCOORD *gc;
174		{
175	<	BCOORD  gc;
175	>	register FLOAT  *v;
176	>	double  d;
177	>	/* compute common component */
178	>	VCOPY(cp[0], hp->orig);
179	>	if (gc->w & 1) {
180	>	v = hp->xv[gc->w>>1];
181	>	cp[0][0] += v[0]; cp[0][1] += v[1]; cp[0][2] += v[2];
182	>	}
183	>	v = hp->xv[wg0[gc->w]];
184	>	d = (double)gc->i[0] / hp->grid[wg0[gc->w]];
185	>	VSUM(cp[0], cp[0], v, d);
186	>	v = hp->xv[wg1[gc->w]];
187	>	d = (double)gc->i[1] / hp->grid[wg1[gc->w]];
188	>	VSUM(cp[0], cp[0], v, d);
189	>	/* compute x1 sums */
190	>	v = hp->xv[wg0[gc->w]];
191	>	d = 1.0 / hp->grid[wg0[gc->w]];
192	>	VSUM(cp[1], cp[0], v, d);
193	>	VSUM(cp[3], cp[0], v, d);
194	>	/* compute y1 sums */
195	>	v = hp->xv[wg1[gc->w]];
196	>	d = 1.0 / hp->grid[wg1[gc->w]];
197	>	VSUM(cp[2], cp[0], v, d);
198	>	VSUM(cp[3], cp[3], v, d);
199	>	}
200	>
201	>
202	>	hdlseg(lseg, hp, gc)                    /* compute line segment for beam */
203	>	register int    lseg[2][3];
204	>	register HOLO   *hp;
205	>	GCOORD  gc[2];
206	>	{
207		register int    k;
208
209	<	if (!hdbcoord(gc, hp, i))
210	<	return(0);
211	<	for (k = 0; k < 2; k++)         /* compute line segment */
212	<	switch (gc[k].w>>1) {
213	<	case 0:
194	<	lseg[k][0] = (gc[k].w & 1) * (hp->grid[0]-1);
195	<	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	<	}
209	>	for (k = 0; k < 2; k++) {               /* compute end points */
210	>	lseg[k][gc[k].w>>1] = gc[k].w&1 ? hp->grid[gc[k].w>>1]-1 : 0 ;
211	>	lseg[k][wg0[gc[k].w]] = gc[k].i[0];
212	>	lseg[k][wg1[gc[k].w]] = gc[k].i[1];
213	>	}
214		return(1);
215		}
216
#	Line 229 | Line 234 | double d;
234		}
235
236
237	+	hdgrid(gp, hp, wp)              /* compute grid coordinates */
238	+	FVECT   gp;             /* returned */
239	+	register HOLO   *hp;
240	+	FVECT   wp;
241	+	{
242	+	FVECT   vt;
243	+
244	+	vt[0] = wp[0] - hp->orig[0];
245	+	vt[1] = wp[1] - hp->orig[1];
246	+	vt[2] = wp[2] - hp->orig[2];
247	+	gp[0] = DOT(vt, hp->wn[0]) * hp->wg[0];
248	+	gp[1] = DOT(vt, hp->wn[1]) * hp->wg[1];
249	+	gp[2] = DOT(vt, hp->wn[2]) * hp->wg[2];
250	+	}
251	+
252	+
253	+	hdworld(wp, hp, gp)             /* compute world coordinates */
254	+	register FVECT  wp;
255	+	register HOLO   *hp;
256	+	FVECT   gp;
257	+	{
258	+	register double d;
259	+
260	+	d = gp[0]/hp->grid[0];
261	+	VSUM(wp, hp->orig, hp->xv[0], d);
262	+
263	+	d = gp[1]/hp->grid[1];
264	+	VSUM(wp, wp, hp->xv[1], d);
265	+
266	+	d = gp[2]/hp->grid[2];
267	+	VSUM(wp, wp, hp->xv[2], d);
268	+	}
269	+
270	+
271		double
272		hdray(ro, rd, hp, gc, r)        /* compute ray within a beam */
273		FVECT   ro, rd;         /* returned */
274	<	register HOLO   *hp;
275	<	register BCOORD gc;
274	>	HOLO    *hp;
275	>	GCOORD  gc[2];
276		BYTE    r[2][2];
277		{
278	<	FVECT   p[2];
279	<	register int    i;
280	<	register FLOAT  *v;
242	<	double  d;
278	>	FVECT   cp[4], p[2];
279	>	register int    i, j;
280	>	double  d0, d1;
281		/* compute entry and exit points */
282		for (i = 0; i < 2; i++) {
283	<	VCOPY(p[i], hp->orig);
284	<	if (gc[i].w & 1) {
285	<	v = hp->xv[gc[i].w>>1];
286	<	p[i][0] += *v++; p[i][1] += *v++; p[i][2] += *v;
287	<	}
288	<	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;
283	>	hdcell(cp, hp, gc+i);
284	>	d0 = (1./256.)*(r[i][0]+.5);
285	>	d1 = (1./256.)*(r[i][1]+.5);
286	>	for (j = 0; j < 3; j++)
287	>	p[i][j] = (1.-d0-d1)*cp[0][j] +
288	>	d0*cp[1][j] + d1*cp[2][j];
289		}
290		VCOPY(ro, p[0]);                /* assign ray origin and direction */
291		rd[0] = p[1][0] - p[0][0];
#	Line 265 | Line 296 | BYTE   r[2][2];
296
297
298		double
299	<	hdinter(gc, r, hp, ro, rd)      /* compute ray intersection with section */
300	<	register BCOORD gc;     /* returned */
301	<	BYTE    r[2][2];        /* returned */
299	>	hdinter(gc, r, ed, hp, ro, rd)  /* compute ray intersection with section */
300	>	register GCOORD gc[2];  /* returned */
301	>	BYTE    r[2][2];        /* returned (optional) */
302	>	double  *ed;            /* returned (optional) */
303		register HOLO   *hp;
304	<	FVECT   ro, rd;         /* rd should be normalized */
304	>	FVECT   ro, rd;         /* normalization of rd affects distances */
305		{
306		FVECT   p[2], vt;
307		double  d, t0, t1, d0, d1;
#	Line 317 | Line 349 | FVECT  ro, rd;         /* rd should be normalized */
349		vt[0] = p[i][0] - hp->orig[0];
350		vt[1] = p[i][1] - hp->orig[1];
351		vt[2] = p[i][2] - hp->orig[2];
352	<	if (gc[i].w & 1) {
353	<	v = hp->xv[gc[i].w>>1];
354	<	vt[0] -= *v++; vt[1] -= *v++; vt[2] -= *v;
323	<	}
324	<	v = hp->gv[gc[i].w>>1][0];
325	<	d = DOT(vt, v);
326	<	if (d < 0. || (gc[i].i[0] = d) >= hp->grid[((gc[i].w>>1)+1)%3])
352	>	v = hp->wn[wg0[gc[i].w]];
353	>	d = DOT(vt, v) * hp->wg[wg0[gc[i].w]];
354	>	if (d < 0. || (gc[i].i[0] = d) >= hp->grid[wg0[gc[i].w]])
355		return(FHUGE);          /* outside wall */
356	<	r[i][0] = 256. * (d - gc[i].i[0]);
357	<	v = hp->gv[gc[i].w>>1][1];
358	<	d = DOT(vt, v);
359	<	if (d < 0. || (gc[i].i[1] = d) >= hp->grid[((gc[i].w>>1)+2)%3])
356	>	if (r != NULL)
357	>	r[i][0] = 256. * (d - gc[i].i[0]);
358	>	v = hp->wn[wg1[gc[i].w]];
359	>	d = DOT(vt, v) * hp->wg[wg1[gc[i].w]];
360	>	if (d < 0. || (gc[i].i[1] = d) >= hp->grid[wg1[gc[i].w]])
361		return(FHUGE);          /* outside wall */
362	<	r[i][1] = 256. * (d - gc[i].i[1]);
362	>	if (r != NULL)
363	>	r[i][1] = 256. * (d - gc[i].i[1]);
364		}
365	<	/* return distance from entry point */
366	<	vt[0] = ro[0] - p[0][0];
367	<	vt[1] = ro[1] - p[0][1];
338	<	vt[2] = ro[2] - p[0][2];
339	<	return(DOT(vt,rd));
365	>	if (ed != NULL)                 /* assign distance to exit point */
366	>	*ed = t1;
367	>	return(t0);                     /* return distance to entry point */
368		}

Diff Legend

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