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

Comparing ray/src/common/octree.h (file contents):
Revision 1.4 by greg, Thu Apr 18 12:54:26 1991 UTC vs.
Revision 1.5 by greg, Wed Oct 23 11:53:36 1991 UTC

# Line 20 | Line 20
20   *              < -1:   it is an index to a set of objects
21   */
22  
23 < typedef int  OCTREE;
23 > #ifndef  OCTREE
24 > #define  OCTREE         int
25 > #endif
26  
27   #define  EMPTY          (-1)
28  
# Line 32 | Line 34 | typedef int  OCTREE;
34   #define  octbi(ot)      ((ot)>>8)       /* octree block index */
35   #define  octti(ot)      (((ot)&0377)<<3)/* octree index in block */
36  
37 + #ifndef  MAXOBLK
38 + #ifdef  BIGMEM
39 + #define  MAXOBLK        8191            /* maximum octree block */
40 + #else
41   #define  MAXOBLK        4095            /* maximum octree block */
42 + #endif
43 + #endif
44  
45   extern OCTREE  *octblock[MAXOBLK];      /* octree blocks */
46  
# Line 64 | Line 72 | extern CUBE  thescene;                 /* the main scene */
72                                  /* octree format identifier */
73   #define  OCTFMT         "Radiance_octree"
74                                  /* magic number for octree files */
75 < #define  OCTMAGIC       (283+sizeof(OBJECT))
75 > #define  MAXOBJSIZ      8               /* maximum sizeof(OBJECT) */
76 > #define  OCTMAGIC       ( 4 *MAXOBJSIZ+251)     /* increment first value */
77                                  /* octree node types */
78   #define  OT_EMPTY       0
79   #define  OT_FULL        1

Diff Legend

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