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

Comparing ray/src/common/octree.h (file contents):
Revision 2.7 by greg, Fri Mar 14 21:27:46 2003 UTC vs.
Revision 2.10 by greg, Fri Jun 27 06:53:21 2003 UTC

# Line 2 | Line 2
2   /*
3   *  octree.h - header file for routines using octrees.
4   */
5 + #ifndef _RAD_OCTREE_H_
6 + #define _RAD_OCTREE_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
6 – #include "copyright.h"
7 –
11   /*
12   *      An octree is expressed as an integer which is either
13   *      an index to eight other nodes, the empty tree, or an index
# Line 33 | Line 36
36   #define  octti(ot)      (((ot)&03777)<<3)/* octree index in block */
37  
38   #ifndef  MAXOBLK
39 < #ifdef  BIGMEM
37 < #define  MAXOBLK        32767           /* maximum octree block */
38 < #else
39 > #ifdef  SMLMEM
40   #define  MAXOBLK        4095            /* maximum octree block */
41 + #else
42 + #define  MAXOBLK        32767           /* maximum octree block */
43   #endif
44   #endif
45  
# Line 79 | Line 82 | extern CUBE  thescene;                 /* the main scene */
82   #define  O_HIT          1               /* intersection */
83   #define  O_IN           2               /* cube contained entirely */
84  
82 – #ifdef NOPROTO
85  
84 – extern OCTREE   octalloc();
85 – extern void     octfree();
86 – extern void     octdone();
87 – extern OCTREE   combine();
88 – extern void     culocate();
89 – extern void     cucopy();
90 – extern int      incube();
91 – extern int      readoct();
92 – extern void     readscene();
93 – extern void     writescene();
94 –
95 – #else
96 –
86   extern OCTREE   octalloc(void);
87   extern void     octfree(OCTREE ot);
88   extern void     octdone(void);
# Line 107 | Line 96 | extern int     readoct(char *fname, int load, CUBE *scene,
96   extern void     readscene(FILE *fp, int objsiz);
97   extern void     writescene(int firstobj, int nobjs, FILE *fp);
98  
99 +
100 + #ifdef __cplusplus
101 + }
102   #endif
103 + #endif /* _RAD_OCTREE_H_ */
104 +

Diff Legend

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