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.7 by gwlarson, Tue Jan 19 16:01:54 1999 UTC vs.
Revision 2.21 by greg, Sun Dec 8 19:25:36 2013 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1999 Silicon Graphics, Inc. */
2 <
3 < /* SCCSid "$SunId$ SGI" */
4 <
1 > /* RCSid $Id$ */
2   /*
3   *  object.h - header file for routines using objects and object sets.
4   *
5 < *     7/28/85
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 + #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 16 | Line 22
22   */
23  
24   typedef struct {
25 +        char  **sarg;                   /* string arguments */
26 +        RREAL  *farg;                   /* real arguments */
27          short  nsargs;                  /* # of string arguments */
28          short  nfargs;                  /* # of real arguments */
21        char  **sarg;                   /* string arguments */
22        FLOAT  *farg;                   /* real arguments */
29   #ifdef  IARGS
30          short  niargs;                  /* # of integer arguments */
31          long  *iarg;                    /* integer arguments */
32   #endif
33   }  FUNARGS;
34  
35 < #define  MAXSTR         128             /* maximum string length */
35 > #define  MAXSTR         512             /* maximum string (word) length */
36  
37   /*
38   *      An object is defined as an index into an array of
# Line 35 | Line 41 | typedef struct {
41   */
42  
43   #ifndef  OBJECT
44 < #ifdef  BIGMEM
45 < #define  OBJECT         int4            /* index to object array */
44 > #ifdef  SMLMEM
45 > #define  OBJECT         int16           /* index to object array */
46   #else
47 < #define  OBJECT         int2            /* index to object array */
47 > #define  OBJECT         int32           /* index to object array */
48   #endif
49   #endif
50  
# Line 51 | Line 57 | typedef struct {
57   }  OBJREC;
58  
59   #ifndef  MAXOBJBLK
60 < #ifdef  BIGMEM
55 < #define  MAXOBJBLK      65535           /* maximum number of object blocks */
56 < #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 73 | 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 int      eqreal(double d1, double d2);
94 > extern int      eqobjects(OBJECT obj1, OBJECT obj2);
95 > extern void     insertobject(OBJECT obj);
96 > extern void     clearobjndx(void);
97 >                                        /* defined in objset.c */
98 > extern void     insertelem(OBJECT *os, OBJECT obj);
99 > extern void     deletelem(OBJECT *os, OBJECT obj);
100 > extern int      inset(OBJECT *os, OBJECT obj);
101 > extern int      setequal(OBJECT *os1, OBJECT *os2);
102 > extern void     setcopy(OBJECT *os1, OBJECT *os2);
103 > extern OBJECT * setsave(OBJECT *os);
104 > extern void     setunion(OBJECT *osr, OBJECT *os1, OBJECT *os2);
105 > extern void     setintersect(OBJECT *osr, OBJECT *os1, OBJECT *os2);
106 > extern OCTREE   fullnode(OBJECT *oset);
107 > extern void     objset(OBJECT *oset, OCTREE ot);
108 > extern int      dosets(int (*f)());
109 > extern void     donesets(void);
110 >
111 >                                        /* defined in otypes.c */
112 > extern int      otype(char *ofname);
113 > extern void     objerror(OBJREC *o, int etyp, char *msg);
114 >                                        /* defined in readfargs.c */
115 > extern int      readfargs(FUNARGS *fa, FILE *fp);
116 > extern void     freefargs(FUNARGS *fa);
117 >                                        /* defined in readobj.c */
118 > extern void     readobj(char *inpspec);
119 > extern void     getobject(char *name, FILE *fp);
120 > extern OBJECT   newobject(void);
121 > extern void     freeobjects(int firstobj, int nobjs);
122 >                                        /* defined in free_os.c */
123 > extern int      free_os(OBJREC *op);
124 >
125 >
126 > #ifdef __cplusplus
127 > }
128 > #endif
129 > #endif /* _RAD_OBJECT_H_ */
130 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines