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.9 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.12 by greg, Thu May 15 05:13:35 2003 UTC

# Line 36 | Line 36 | typedef struct {
36   */
37  
38   #ifndef  OBJECT
39 < #ifdef  BIGMEM
40 < #define  OBJECT         int4            /* index to object array */
41 < #else
39 > #ifdef  SMLMEM
40   #define  OBJECT         int2            /* index to object array */
41 + #else
42 + #define  OBJECT         int4            /* index to object array */
43   #endif
44   #endif
45  
# Line 52 | Line 52 | typedef struct {
52   }  OBJREC;
53  
54   #ifndef  MAXOBJBLK
55 < #ifdef  BIGMEM
56 < #define  MAXOBJBLK      65535           /* maximum number of object blocks */
57 < #else
55 > #ifdef  SMLMEM
56   #define  MAXOBJBLK      63              /* maximum number of object blocks */
57 + #else
58 + #define  MAXOBJBLK      65535           /* maximum number of object blocks */
59   #endif
60   #endif
61  
# Line 74 | Line 74 | extern OBJECT  nobjects;               /* # of objects */
74   *  the objects in ascending order.
75   */
76  
77 < #define  MAXSET         127             /* maximum object set size */
77 > #define  MAXSET         511             /* maximum object set size */
78  
79   #define setfree(os)     free((void *)(os))
80  
# Line 82 | Line 82 | extern void  (*addobjnotify[])();        /* people to
82  
83   #ifdef NOPROTO
84  
85 < extern int      objndx();
86 < extern int      lastmod();
87 < extern int      modifier();
88 < extern int      object();
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();
# Line 106 | Line 106 | extern int     readfargs();
106   extern void     freefargs();
107   extern void     readobj();
108   extern void     getobject();
109 < extern int      newobject();
109 > extern OBJECT   newobject();
110   extern void     freeobjects();
111   extern int      free_os();
112  
113   #else
114                                          /* defined in modobject.c */
115 < extern int      objndx(OBJREC *op);
116 < extern int      lastmod(OBJECT obj, char *mname);
117 < extern int      modifier(char *name);
118 < extern int      object(char *oname);
115 > extern OBJECT   objndx(OBJREC *op);
116 > extern OBJECT   lastmod(OBJECT obj, char *mname);
117 > extern OBJECT   modifier(char *name);
118 > extern OBJECT   object(char *oname);
119   extern void     insertobject(OBJECT obj);
120   extern void     clearobjndx(void);
121                                          /* defined in objset.c */
# Line 141 | Line 141 | extern void    freefargs(FUNARGS *fa);
141                                          /* defined in readobj.c */
142   extern void     readobj(char *inpspec);
143   extern void     getobject(char *name, FILE *fp);
144 < extern int      newobject();
144 > extern OBJECT   newobject();
145   extern void     freeobjects(int firstobj, int nobjs);
146                                          /* defined in free_os.c */
147   extern int      free_os(OBJREC *op);
148  
149 < #endif
149 > #endif /* NOPROTO */

Diff Legend

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