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.7 by gregl, Fri Dec 12 19:52:31 1997 UTC vs.
Revision 3.11 by gregl, Thu Jan 1 10:12:24 1998 UTC

# Line 18 | Line 18
18   #define int2    short
19   #endif
20   #ifndef int4
21 < #define int4    long
21 > #define int4    int
22   #endif
23  
24   #define DCINF   (unsigned)((1L<<16)-1)  /* special value for infinity */
# Line 82 | Line 82 | typedef struct holo {
82          BEAMI   bi[1];          /* beam index (extends struct) */
83   } HOLO;                 /* holodeck section */
84  
85 + typedef struct {
86 +        HOLO    *h;             /* pointer to holodeck */
87 +        int     b;              /* beam index */
88 + } HDBEAMI;              /* holodeck beam index */
89 +
90   #define nbeams(hp)      (2*((hp)->wi[5]-1))
91   #define biglob(hp)      ((hp)->bi)
92   #define blglob(hp)      (*(hp)->bl)
# Line 94 | Line 99 | typedef struct holo {
99   extern HOLO     *hdinit(), *hdalloc();
100   extern BEAM     *hdgetbeam();
101   extern RAYVAL   *hdnewrays();
102 < extern long     hdmemuse(), hdfiluse();
102 > extern unsigned hdmemuse();
103 > extern long     hdfiluse(), hdfilen();
104   extern double   hdray(), hdinter();
105   extern unsigned hdcode();
106  
107 < extern int      hdcachesize;            /* target cache size (bytes) */
107 > extern unsigned hdcachesize;            /* target cache size (bytes) */
108   extern unsigned long    hdclock;        /* holodeck system clock */
109   extern HOLO     *hdlist[HDMAX+1];       /* holodeck pointers (NULL term.) */
110  
# Line 111 | Line 117 | extern float   hd_depthmap[];          /* depth conversion map *
117  
118   #define HOLOFMT         "Holodeck"      /* file format identifier */
119   #define HOLOVERS        0               /* file format version number */
120 < #define HOLOMAGIC       (327+HOLOVERS)  /* file magic number */
120 > #define HOLOMAGIC       (323+sizeof(long)+8*HOLOVERS)   /* file magic number */
121  
122   /*
123   * A holodeck file consists of an information header terminated by a

Diff Legend

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