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.15 by schorsch, Thu Jun 26 00:58:09 2003 UTC

# Line 1 | Line 1
1   /* RCSid $Id$ */
2   /*
3   *  object.h - header file for routines using objects and object sets.
4 + *
5 + *  Include after "standard.h"
6   */
7 + #ifndef _RAD_OBJECT_H_
8 + #define _RAD_OBJECT_H_
9 + #ifdef __cplusplus
10 + extern "C" {
11 + #endif
12  
13   #include "copyright.h"
14  
# Line 20 | Line 27 | typedef struct {
27          short  nsargs;                  /* # of string arguments */
28          short  nfargs;                  /* # of real arguments */
29          char  **sarg;                   /* string arguments */
30 <        FLOAT  *farg;                   /* real arguments */
30 >        RREAL  *farg;                   /* real arguments */
31   #ifdef  IARGS
32          short  niargs;                  /* # of integer arguments */
33          long  *iarg;                    /* integer arguments */
# Line 36 | Line 43 | typedef struct {
43   */
44  
45   #ifndef  OBJECT
46 < #ifdef  BIGMEM
47 < #define  OBJECT         int4            /* index to object array */
46 > #ifdef  SMLMEM
47 > #define  OBJECT         int16           /* index to object array */
48   #else
49 < #define  OBJECT         int2            /* index to object array */
49 > #define  OBJECT         int32           /* index to object array */
50   #endif
51   #endif
52  
# Line 52 | Line 59 | typedef struct {
59   }  OBJREC;
60  
61   #ifndef  MAXOBJBLK
62 < #ifdef  BIGMEM
56 < #define  MAXOBJBLK      65535           /* maximum number of object blocks */
57 < #else
62 > #ifdef  SMLMEM
63   #define  MAXOBJBLK      63              /* maximum number of object blocks */
64 + #else
65 + #define  MAXOBJBLK      65535           /* maximum number of object blocks */
66   #endif
67   #endif
68  
# Line 74 | Line 81 | extern OBJECT  nobjects;               /* # of objects */
81   *  the objects in ascending order.
82   */
83  
84 < #define  MAXSET         127             /* maximum object set size */
84 > #define  MAXSET         511             /* maximum object set size */
85  
86   #define setfree(os)     free((void *)(os))
87  
88   extern void  (*addobjnotify[])();        /* people to notify of new objects */
89  
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
90                                          /* defined in modobject.c */
91   extern OBJECT   objndx(OBJREC *op);
92   extern OBJECT   lastmod(OBJECT obj, char *mname);
# Line 146 | Line 122 | extern void    freeobjects(int firstobj, int nobjs);
122                                          /* defined in free_os.c */
123   extern int      free_os(OBJREC *op);
124  
125 < #endif /* NOPROTO */
125 >
126 > #ifdef __cplusplus
127 > }
128 > #endif
129 > #endif /* _RAD_OBJECT_H_ */
130 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines