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.3 by greg, Fri Mar 7 15:45:31 1997 UTC vs.
Revision 2.13 by schorsch, Fri Jun 6 16:38:47 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid $Id$ */
2   /*
3   *  object.h - header file for routines using objects and object sets.
7 *
8 *     7/28/85
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 +
13 + #ifndef  OCTREE
14 + #define  OCTREE         int
15 + #endif
16 +
17   /*
18   *      Object definitions require general specifications
19   *      which may include a number of different argument types.
# Line 35 | Line 41 | typedef struct {
41   */
42  
43   #ifndef  OBJECT
44 < #ifdef  BIGMEM
45 < #define  OBJECT         int             /* index to object array */
44 > #ifdef  SMLMEM
45 > #define  OBJECT         int2            /* index to object array */
46   #else
47 < #define  OBJECT         short           /* index to object array */
47 > #define  OBJECT         int4            /* index to object array */
48   #endif
49   #endif
50  
# Line 51 | Line 57 | typedef struct {
57   }  OBJREC;
58  
59   #ifndef  MAXOBJBLK
60 < #ifdef  BIGMEM
61 < #define  MAXOBJBLK      4095            /* maximum number of object blocks */
60 > #ifdef  SMLMEM
61 > #define  MAXOBJBLK      63              /* maximum number of object blocks */
62   #else
63 < #define  MAXOBJBLK      511             /* maximum number of object blocks */
63 > #define  MAXOBJBLK      65535           /* maximum number of object blocks */
64   #endif
65   #endif
66  
67   extern OBJREC  *objblock[MAXOBJBLK];    /* the object blocks */
68   extern OBJECT  nobjects;                /* # of objects */
69  
70 < #define  objptr(obj)    (objblock[(obj)>>6]+((obj)&077))
70 > #define  OBJBLKSHFT     9
71 > #define  OBJBLKSIZ      (1<<OBJBLKSHFT) /* object block size */
72 > #define  objptr(obj)    (objblock[(obj)>>OBJBLKSHFT]+((obj)&(OBJBLKSIZ-1)))
73  
74   #define  OVOID          (-1)            /* void object */
75   #define  VOIDID         "void"          /* void identifier */
# Line 71 | 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 < OBJECT  *setsave();
84 > #define setfree(os)     free((void *)(os))
85  
86 < #define setfree(os)     free((char *)(os))
86 > extern void  (*addobjnotify[])();        /* people to notify of new objects */
87 >
88 >                                        /* defined in modobject.c */
89 > extern OBJECT   objndx(OBJREC *op);
90 > extern OBJECT   lastmod(OBJECT obj, char *mname);
91 > extern OBJECT   modifier(char *name);
92 > extern OBJECT   object(char *oname);
93 > extern void     insertobject(OBJECT obj);
94 > extern void     clearobjndx(void);
95 >                                        /* defined in objset.c */
96 > extern void     insertelem(OBJECT *os, OBJECT obj);
97 > extern void     deletelem(OBJECT *os, OBJECT obj);
98 > extern int      inset(OBJECT *os, OBJECT obj);
99 > extern int      setequal(OBJECT *os1, OBJECT *os2);
100 > extern void     setcopy(OBJECT *os1, OBJECT *os2);
101 > extern OBJECT * setsave(OBJECT *os);
102 > extern void     setunion(OBJECT *osr, OBJECT *os1, OBJECT *os2);
103 > extern void     setintersect(OBJECT *osr, OBJECT *os1, OBJECT *os2);
104 > extern OCTREE   fullnode(OBJECT *oset);
105 > extern void     objset(OBJECT *oset, OCTREE ot);
106 > extern int      dosets(int (*f)());
107 > extern void     donesets(void);
108 >
109 >                                        /* defined in otypes.c */
110 > extern int      otype(char *ofname);
111 > extern void     objerror(OBJREC *o, int etyp, char *msg);
112 >                                        /* defined in readfargs.c */
113 > extern int      readfargs(FUNARGS *fa, FILE *fp);
114 > extern void     freefargs(FUNARGS *fa);
115 >                                        /* defined in readobj.c */
116 > extern void     readobj(char *inpspec);
117 > extern void     getobject(char *name, FILE *fp);
118 > extern OBJECT   newobject();
119 > extern void     freeobjects(int firstobj, int nobjs);
120 >                                        /* defined in free_os.c */
121 > extern int      free_os(OBJREC *op);
122 >
123 >
124 > #ifdef __cplusplus
125 > }
126 > #endif
127 > #endif /* _RAD_OBJECT_H_ */
128 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines