ViewVC Help

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

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

Comparing ray/src/hd/holo.h (file contents):
Revision 3.14 by gregl, Wed Jan 7 21:27:29 1998 UTC vs.
Revision 3.16 by gwlarson, Thu Nov 5 09:09:32 1998 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1997 Silicon Graphics, Inc. */
1	>	/* Copyright (c) 1998 Silicon Graphics, Inc. */
2
3		/* SCCSid "$SunId$ SGI" */
4
#	Line 14 | Line 14
14		#ifndef HDMAX
15		#define HDMAX           128     /* maximum active holodeck sections */
16		#endif
17	–	#ifndef int2
18	–	#define int2    short
19	–	#endif
20	–	#ifndef int4
21	–	#define int4    int
22	–	#endif
17
18		#define DCINF   (unsigned)((1L<<16)-1)  /* special value for infinity */
19		#define DCLIN   (unsigned)(1L<<11)      /* linear depth limit */
20
21		typedef struct {
22		BYTE    r[2][2];        /* ray direction index */
23	<	COLR    v;              /* value */
24	<	unsigned int2   d;      /* depth code */
25	<	} RAYVAL;               /* ray value (from second wall) */
23	>	COLR    v;              /* color value */
24	>	unsigned int2   d;      /* depth code (from entry wall) */
25	>	} RAYVAL;               /* ray value */
26
27		/*
28		* Walls are ordered:           X0      X1      X2      WN
#	Line 92 | Line 86 | typedef struct {
86
87		#define bnrays(hp,i)    ((hp)->bl[i]!=NULL ? (hp)->bl[i]->nrm : (hp)->bi[i].nrd)
88
89	<	#define hdflush(hp)     (hdfreebeam(hp,0) && hdsync(hp,0))
90	<	#define hdclobber(hp)   (hdkillbeam(hp,0) && hdsync(hp,0))
89	>	#define hdflush(hp)     (hdfreebeam(hp,0), hdsync(hp,0))
90	>	#define hdclobber(hp)   (hdkillbeam(hp,0), hdsync(hp,0))
91
92		extern HOLO     *hdinit(), *hdalloc();
93		extern BEAM     *hdgetbeam();

Diff Legend

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