ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/hd/holo.h
(Generate patch)

Comparing ray/src/hd/holo.h (file contents):
Revision 3.26 by greg, Fri Sep 3 23:52:42 2010 UTC vs.
Revision 3.28 by greg, Fri May 20 02:06:39 2011 UTC

# Line 26 | Line 26 | extern "C" {
26   #define DCLIN   (unsigned)(1L<<11)      /* linear depth limit */
27  
28   typedef struct {
29 <        BYTE    r[2][2];        /* ray direction index */
29 >        uby8    r[2][2];        /* ray direction index */
30          COLR    v;              /* color value */
31          uint16  d;              /* depth code (from entry wall) */
32   } RAYVAL;               /* ray value */
# Line 132 | Line 132 | extern int     hdwg1[6];               /* wall grid 1 index */
132  
133   #define HOLOFMT         "Holodeck"      /* file format identifier */
134   #define HOLOVERS        0               /* file format version number */
135 < #define HOLOMAGIC       (323+sizeof(BEAMI)+16*HOLOVERS) /* file magic number */
135 > #define HOLOMAGIC       (324+sizeof(BEAMI)+16*HOLOVERS) /* file magic number */
136  
137   /*
138   * A holodeck file consists of an information header terminated by a
139   * blank line, with "FORMAT=Holodeck" somewhere in it.
140   * The first integer after the information header is the
141   * above magic number, which includes the file format version number.
142 < * The first longword after the magic number is a pointer to the pointer
143 < * just before the SECOND holodeck section, or 0 if there is only one.
142 > * The first longword (off_t) after the magic number is a pointer to the
143 > * pointer just before the SECOND holodeck section, or 0 if there is only one.
144   * This longword is immediately followed by the first holodeck
145   * section header and directory.
146   * Similarly, every holodeck section in the file is preceeded by
# Line 165 | Line 165 | extern int hdlseg(int  lseg[2][3], HOLO        *hp, GCOORD     gc[
165   extern unsigned int hdcode(HOLO *hp, double d);
166   extern void hdgrid( FVECT gp, HOLO *hp, FVECT wp);
167   extern void hdworld(FVECT wp, HOLO *hp, FVECT gp);
168 < extern double hdray(FVECT ro, FVECT rd, HOLO *hp, GCOORD gc[2], BYTE r[2][2]);
169 < extern double hdinter(GCOORD gc[2], BYTE r[2][2], double *ed, HOLO *hp,
168 > extern double hdray(FVECT ro, FVECT rd, HOLO *hp, GCOORD gc[2], uby8 r[2][2]);
169 > extern double hdinter(GCOORD gc[2], uby8 r[2][2], double *ed, HOLO *hp,
170                  FVECT ro, FVECT rd);
171          /* holofile.c */
172   extern HOLO * hdinit(int fd, HDGRID *hproto);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines