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.9 by gregl, Thu Dec 18 14:45:59 1997 UTC vs.
Revision 3.19 by gwlarson, Thu Jan 7 22:04:48 1999 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1999 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
17 >
18 > #ifndef MAXDIRSE
19 > #define MAXDIRSE        32      /* maximum seeks per directory write */
20   #endif
20 #ifndef int4
21 #define int4    long
22 #endif
21  
22   #define DCINF   (unsigned)((1L<<16)-1)  /* special value for infinity */
23   #define DCLIN   (unsigned)(1L<<11)      /* linear depth limit */
24  
25   typedef struct {
26          BYTE    r[2][2];        /* ray direction index */
27 <        COLR    v;              /* value */
28 <        unsigned int2   d;      /* depth code */
29 < } RAYVAL;               /* ray value (from second wall) */
27 >        COLR    v;              /* color value */
28 >        unsigned int2   d;      /* depth code (from entry wall) */
29 > } RAYVAL;               /* ray value */
30  
31   /*
32   * Walls are ordered:           X0      X1      X2      WN
# Line 71 | Line 69 | typedef struct holo {
69          FVECT   xv[3];          /* side vectors (second) */
70          int2    grid[3];        /* grid resolution (third) */
71          int     fd;             /* file descriptor */
72 <        short   dirty;          /* beam index needs update to file */
72 >        struct {
73 >                int     s, n;           /* dirty section start, length */
74 >        } dirseg[MAXDIRSE+1];   /* dirty beam index segments */
75 >        short   dirty;          /* number of dirty segments */
76          double  tlin;           /* linear range for depth encoding */
77 <        FVECT   wn[3];          /* wall normals (derived) */
77 <        double  wg[3];          /* wall grid multipliers (derived) */
78 <        double  wo[6];          /* wall offsets (derived) */
77 >        FVECT   wg[3];          /* wall grid vectors (derived) */
78          int     wi[6];          /* wall super-indices (derived) */
79          char    *priv;          /* pointer to private client data */
80          BEAM    **bl;           /* beam pointers (memory cache) */
# Line 87 | Line 86 | typedef struct {
86          int     b;              /* beam index */
87   } HDBEAMI;              /* holodeck beam index */
88  
89 < #define nbeams(hp)      (2*((hp)->wi[5]-1))
89 > #define nbeams(hp)      (((hp)->wi[5]-1)<<1)
90   #define biglob(hp)      ((hp)->bi)
91   #define blglob(hp)      (*(hp)->bl)
92  
93   #define bnrays(hp,i)    ((hp)->bl[i]!=NULL ? (hp)->bl[i]->nrm : (hp)->bi[i].nrd)
94  
95 < #define hdflush(hp)     (hdfreebeam(hp,0) && hdsync(hp,0))
96 < #define hdclobber(hp)   (hdkillbeam(hp,0) && hdsync(hp,0))
95 > #define hdflush(hp)     (hdfreebeam(hp,0), hdsync(hp,0))
96 > #define hdclobber(hp)   (hdkillbeam(hp,0), hdsync(hp,0))
97  
98   extern HOLO     *hdinit(), *hdalloc();
99   extern BEAM     *hdgetbeam();
100   extern RAYVAL   *hdnewrays();
101   extern unsigned hdmemuse();
102 < extern long     hdfiluse(), hdfilen();
102 > extern long     hdfiluse(), hdfilen(), hdallocfrag();
103   extern double   hdray(), hdinter();
104   extern unsigned hdcode();
105 + extern int      hdfilord();
106  
107 + #define FF_NEVER        0               /* never free fragments */
108 + #define FF_WRITE        01              /* free fragment on write */
109 + #define FF_ALLOC        02              /* free fragment on ray alloc */
110 + #define FF_READ         04              /* free fragment on read */
111 + #define FF_KILL         010             /* free fragment on beam kill */
112 +
113 + extern int      hdfragflags;            /* tells when to free fragments */
114   extern unsigned hdcachesize;            /* target cache size (bytes) */
115   extern unsigned long    hdclock;        /* holodeck system clock */
116   extern HOLO     *hdlist[HDMAX+1];       /* holodeck pointers (NULL term.) */
117  
118   extern float    hd_depthmap[];          /* depth conversion map */
119  
120 + extern int      hdwg0[6];               /* wall grid 0 index */
121 + extern int      hdwg1[6];               /* wall grid 1 index */
122 +
123   #define hddepth(hp,dc)  ( (dc) >= DCINF ? FHUGE : \
124                                  (hp)->tlin * ( (dc) >= DCLIN ? \
125                                          hd_depthmap[(dc)-DCLIN] : \
# Line 117 | Line 127 | extern float   hd_depthmap[];          /* depth conversion map *
127  
128   #define HOLOFMT         "Holodeck"      /* file format identifier */
129   #define HOLOVERS        0               /* file format version number */
130 < #define HOLOMAGIC       (327+HOLOVERS)  /* file magic number */
130 > #define HOLOMAGIC       (323+sizeof(long)+8*HOLOVERS)   /* file magic number */
131  
132   /*
133   * A holodeck file consists of an information header terminated by a

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines