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.13 by gregl, Tue Jan 6 15:08:50 1998 UTC vs.
Revision 3.15 by gwlarson, Thu Dec 3 15:18:39 1998 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1997 Silicon Graphics, Inc. */
1	>	/* Copyright (c) 1998 Silicon Graphics, Inc. */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ SGI";
#	Line 40 | Line 40 | register HOLO  *hp;
40		d = DOT(hp->wg[i],hp->xv[i]);
41		if (d <= FTINY & d >= -FTINY)
42		error(USER, "degenerate holodeck section");
43	<	d = (double)hp->grid[i] / d;
43	>	d = hp->grid[i] / d;
44		hp->wg[i][0] *= d; hp->wg[i][1] *= d; hp->wg[i][2] *= d;
45	–	hp->wo[i<<1] = DOT(hp->wg[i],hp->orig);
46	–	d = DOT(hp->wg[i],hp->xv[i]);
47	–	hp->wo[i<<1|1] = hp->wo[i<<1] + d;
45		}
46		/* compute linear depth range */
47		hp->tlin = VLEN(hp->xv[0]) + VLEN(hp->xv[1]) + VLEN(hp->xv[2]);
#	Line 243 | Line 240 | FVECT  wp;
240		{
241		FVECT   vt;
242
243	<	vt[0] = wp[0] - hp->orig[0];
247	<	vt[1] = wp[1] - hp->orig[1];
248	<	vt[2] = wp[2] - hp->orig[2];
243	>	VSUB(vt, wp, hp->orig);
244		gp[0] = DOT(vt, hp->wg[0]);
245		gp[1] = DOT(vt, hp->wg[1]);
246		gp[2] = DOT(vt, hp->wg[2]);
#	Line 290 | Line 285 | BYTE   r[2][2];
285		d0*cp[1][j] + d1*cp[2][j];
286		}
287		VCOPY(ro, p[0]);                /* assign ray origin and direction */
288	<	rd[0] = p[1][0] - p[0][0];
294	<	rd[1] = p[1][1] - p[0][1];
295	<	rd[2] = p[1][2] - p[0][2];
288	>	VSUB(rd, p[1], p[0]);
289		return(normalize(rd));          /* return maximum inside distance */
290		}
291
#	Line 312 | Line 305 | FVECT  ro, rd;         /* normalization of rd affects distance
305		/* first, intersect walls */
306		gc[0].w = gc[1].w = -1;
307		t0 = -FHUGE; t1 = FHUGE;
308	+	VSUB(vt, ro, hp->orig);
309		for (i = 0; i < 3; i++) {               /* for each wall pair */
310		d = -DOT(rd, hp->wg[i]);        /* plane distance */
311		if (d <= FTINY && d >= -FTINY)  /* check for parallel */
312		continue;
313	<	d1 = DOT(ro, hp->wg[i]);        /* ray distances */
314	<	d0 = (d1 - hp->wo[i<<1]) / d;
315	<	d1 = (d1 - hp->wo[i<<1|1]) / d;
316	<	if (d0 < d1) {          /* check against best */
313	>	d1 = DOT(vt, hp->wg[i]);        /* ray distances */
314	>	d0 = d1 / d;
315	>	d1 = (d1 - hp->grid[i]) / d;
316	>	if (d < 0) {                    /* check against best */
317		if (d0 > t0) {
318		t0 = d0;
319		gc[0].w = i<<1;
#	Line 342 | Line 336 | FVECT  ro, rd;         /* normalization of rd affects distance
336		if (gc[0].w < 0 | gc[1].w < 0)          /* paranoid check */
337		return(FHUGE);
338		/* compute intersections */
339	<	for (i = 0; i < 3; i++) {
340	<	p[0][i] = ro[i] + rd[i]*t0;
347	<	p[1][i] = ro[i] + rd[i]*t1;
348	<	}
339	>	VSUM(p[0], ro, rd, t0);
340	>	VSUM(p[1], ro, rd, t1);
341		/* now, compute grid coordinates */
342		for (i = 0; i < 2; i++) {
343	<	vt[0] = p[i][0] - hp->orig[0];
352	<	vt[1] = p[i][1] - hp->orig[1];
353	<	vt[2] = p[i][2] - hp->orig[2];
343	>	VSUB(vt, p[i], hp->orig);
344		v = hp->wg[hdwg0[gc[i].w]];
345		d = DOT(vt, v);
346	<	if (d < 0. || (gc[i].i[0] = d) >= hp->grid[hdwg0[gc[i].w]])
346	>	if (d < 0 || d >= hp->grid[hdwg0[gc[i].w]])
347		return(FHUGE);          /* outside wall */
348	+	gc[i].i[0] = d;
349		if (r != NULL)
350		r[i][0] = 256. * (d - gc[i].i[0]);
351		v = hp->wg[hdwg1[gc[i].w]];
352		d = DOT(vt, v);
353	<	if (d < 0. || (gc[i].i[1] = d) >= hp->grid[hdwg1[gc[i].w]])
353	>	if (d < 0 || d >= hp->grid[hdwg1[gc[i].w]])
354		return(FHUGE);          /* outside wall */
355	+	gc[i].i[1] = d;
356		if (r != NULL)
357		r[i][1] = 256. * (d - gc[i].i[1]);
358		}

Diff Legend

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