ViewVC Help

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

root/Development/ray/src/ot/bbox.c

Comparing ray/src/ot/bbox.c (file contents):
Revision 1.1 by greg, Thu Feb 2 10:33:00 1989 UTC vs.
Revision 2.1 by greg, Tue Nov 12 17:01:00 1991 UTC

#	Line 27 | Line 27 | add2bbox(o, bbmin, bbmax)              /* expand bounding box to f
27		register OBJREC  *o;
28		FVECT  bbmin, bbmax;
29		{
30	<	#define  co     ((CONE *)osp)
31	<	#define  fo     ((FACE *)osp)
32	<	#define  io     ((INSTANCE *)osp)
33	<	register char  *osp;
30	>	CONE  *co;
31	>	FACE  *fo;
32	>	INSTANCE  *io;
33		FVECT  v;
34		register int  i, j;
35
#	Line 64 | Line 63 | FVECT  bbmin, bbmax;
63		circle2bbox(CO_P1(co), co->ad, CO_R1(co), bbmin, bbmax);
64		break;
65		case OBJ_INSTANCE:
66	<	io = getinstance(o, GET_BOUNDS);
66	>	io = getinstance(o, IO_BOUNDS);
67		for (j = 0; j < 8; j++) {
68		for (i = 0; i < 3; i++) {
69		v[i] = io->obj->scube.cuorg[i];
70		if (j & 1<<i)
71		v[i] += io->obj->scube.cusize;
72		}
73	<	multp3(v, v, io->f.xfm);
73	>	multp3(v, v, io->x.f.xfm);
74		point2bbox(v, bbmin, bbmax);
75		}
76		break;
77		}
79	–	#undef  co
80	–	#undef  fo
81	–	#undef  io
78		}
79
80

Diff Legend

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