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

Comparing ray/src/common/object.h (file contents):
Revision 2.10 by greg, Mon Mar 10 17:13:29 2003 UTC vs.
Revision 2.13 by schorsch, Fri Jun 6 16:38:47 2003 UTC

# Line 2 | Line 2
2   /*
3   *  object.h - header file for routines using objects and object sets.
4   */
5 + #ifndef _RAD_OBJECT_H_
6 + #define _RAD_OBJECT_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
11   #include "copyright.h"
12  
# Line 36 | Line 41 | typedef struct {
41   */
42  
43   #ifndef  OBJECT
44 < #ifdef  BIGMEM
40 < #define  OBJECT         int4            /* index to object array */
41 < #else
44 > #ifdef  SMLMEM
45   #define  OBJECT         int2            /* index to object array */
46 + #else
47 + #define  OBJECT         int4            /* index to object array */
48   #endif
49   #endif
50  
# Line 52 | Line 57 | typedef struct {
57   }  OBJREC;
58  
59   #ifndef  MAXOBJBLK
60 < #ifdef  BIGMEM
56 < #define  MAXOBJBLK      65535           /* maximum number of object blocks */
57 < #else
60 > #ifdef  SMLMEM
61   #define  MAXOBJBLK      63              /* maximum number of object blocks */
62 + #else
63 + #define  MAXOBJBLK      65535           /* maximum number of object blocks */
64   #endif
65   #endif
66  
# Line 74 | Line 79 | extern OBJECT  nobjects;               /* # of objects */
79   *  the objects in ascending order.
80   */
81  
82 < #define  MAXSET         127             /* maximum object set size */
82 > #define  MAXSET         511             /* maximum object set size */
83  
84   #define setfree(os)     free((void *)(os))
85  
86   extern void  (*addobjnotify[])();        /* people to notify of new objects */
87  
83 #ifdef NOPROTO
84
85 extern OBJECT   objndx();
86 extern OBJECT   lastmod();
87 extern OBJECT   modifier();
88 extern OBJECT   object();
89 extern void     insertobject();
90 extern void     clearobjndx();
91 extern void     insertelem();
92 extern void     deletelem();
93 extern int      inset();
94 extern int      setequal();
95 extern void     setcopy();
96 extern OBJECT * setsave();
97 extern void     setunion();
98 extern void     setintersect();
99 extern OCTREE   fullnode();
100 extern void     objset();
101 extern int      dosets();
102 extern void     donesets();
103 extern int      otype();
104 extern void     objerror();
105 extern int      readfargs();
106 extern void     freefargs();
107 extern void     readobj();
108 extern void     getobject();
109 extern OBJECT   newobject();
110 extern void     freeobjects();
111 extern int      free_os();
112
113 #else
88                                          /* defined in modobject.c */
89   extern OBJECT   objndx(OBJREC *op);
90   extern OBJECT   lastmod(OBJECT obj, char *mname);
# Line 146 | Line 120 | extern void    freeobjects(int firstobj, int nobjs);
120                                          /* defined in free_os.c */
121   extern int      free_os(OBJREC *op);
122  
123 < #endif /* NOPROTO */
123 >
124 > #ifdef __cplusplus
125 > }
126 > #endif
127 > #endif /* _RAD_OBJECT_H_ */
128 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines