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.8 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.15 by schorsch, Thu Jun 26 00:58:09 2003 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  object.h - header file for routines using objects and object sets.
4 – */
5 –
6 – /* ====================================================================
7 – * The Radiance Software License, Version 1.0
4   *
5 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 < *
12 < * Redistribution and use in source and binary forms, with or without
13 < * modification, are permitted provided that the following conditions
14 < * are met:
15 < *
16 < * 1. Redistributions of source code must retain the above copyright
17 < *         notice, this list of conditions and the following disclaimer.
18 < *
19 < * 2. Redistributions in binary form must reproduce the above copyright
20 < *       notice, this list of conditions and the following disclaimer in
21 < *       the documentation and/or other materials provided with the
22 < *       distribution.
23 < *
24 < * 3. The end-user documentation included with the redistribution,
25 < *           if any, must include the following acknowledgment:
26 < *             "This product includes Radiance software
27 < *                 (http://radsite.lbl.gov/)
28 < *                 developed by the Lawrence Berkeley National Laboratory
29 < *               (http://www.lbl.gov/)."
30 < *       Alternately, this acknowledgment may appear in the software itself,
31 < *       if and wherever such third-party acknowledgments normally appear.
32 < *
33 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 < *       and "The Regents of the University of California" must
35 < *       not be used to endorse or promote products derived from this
36 < *       software without prior written permission. For written
37 < *       permission, please contact [email protected].
38 < *
39 < * 5. Products derived from this software may not be called "Radiance",
40 < *       nor may "Radiance" appear in their name, without prior written
41 < *       permission of Lawrence Berkeley National Laboratory.
42 < *
43 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 < * SUCH DAMAGE.
55 < * ====================================================================
56 < *
57 < * This software consists of voluntary contributions made by many
58 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 < * information on Lawrence Berkeley National Laboratory, please see
60 < * <http://www.lbl.gov/>.
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 +
15   #ifndef  OCTREE
16   #define  OCTREE         int
17   #endif
# Line 75 | 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 91 | 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 107 | Line 59 | typedef struct {
59   }  OBJREC;
60  
61   #ifndef  MAXOBJBLK
62 < #ifdef  BIGMEM
111 < #define  MAXOBJBLK      65535           /* maximum number of object blocks */
112 < #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 129 | 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  
138 – #ifdef NOPROTO
139 –
140 – extern int      objndx();
141 – extern int      lastmod();
142 – extern int      modifier();
143 – extern int      object();
144 – extern void     insertobject();
145 – extern void     clearobjndx();
146 – extern void     insertelem();
147 – extern void     deletelem();
148 – extern int      inset();
149 – extern int      setequal();
150 – extern void     setcopy();
151 – extern OBJECT * setsave();
152 – extern void     setunion();
153 – extern void     setintersect();
154 – extern OCTREE   fullnode();
155 – extern void     objset();
156 – extern int      dosets();
157 – extern void     donesets();
158 – extern int      otype();
159 – extern void     objerror();
160 – extern int      readfargs();
161 – extern void     freefargs();
162 – extern void     readobj();
163 – extern void     getobject();
164 – extern int      newobject();
165 – extern void     freeobjects();
166 – extern int      free_os();
167 –
168 – #else
90                                          /* defined in modobject.c */
91 < extern int      objndx(OBJREC *op);
92 < extern int      lastmod(OBJECT obj, char *mname);
93 < extern int      modifier(char *name);
94 < extern int      object(char *oname);
91 > extern OBJECT   objndx(OBJREC *op);
92 > extern OBJECT   lastmod(OBJECT obj, char *mname);
93 > extern OBJECT   modifier(char *name);
94 > extern OBJECT   object(char *oname);
95   extern void     insertobject(OBJECT obj);
96   extern void     clearobjndx(void);
97                                          /* defined in objset.c */
# Line 196 | Line 117 | 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 int      newobject();
120 > extern OBJECT   newobject();
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