ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/objset.c
(Generate patch)

Comparing ray/src/common/objset.c (file contents):
Revision 1.8 by greg, Wed Oct 23 11:52:55 1991 UTC vs.
Revision 2.8 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1986 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  objset.c - routines for maintaining object sets.
6   *
7 < *      7/28/85
7 > *  External symbols declared in object.h
8   */
9  
10 + /* ====================================================================
11 + * The Radiance Software License, Version 1.0
12 + *
13 + * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 + * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 + *
16 + * Redistribution and use in source and binary forms, with or without
17 + * modification, are permitted provided that the following conditions
18 + * are met:
19 + *
20 + * 1. Redistributions of source code must retain the above copyright
21 + *         notice, this list of conditions and the following disclaimer.
22 + *
23 + * 2. Redistributions in binary form must reproduce the above copyright
24 + *       notice, this list of conditions and the following disclaimer in
25 + *       the documentation and/or other materials provided with the
26 + *       distribution.
27 + *
28 + * 3. The end-user documentation included with the redistribution,
29 + *           if any, must include the following acknowledgment:
30 + *             "This product includes Radiance software
31 + *                 (http://radsite.lbl.gov/)
32 + *                 developed by the Lawrence Berkeley National Laboratory
33 + *               (http://www.lbl.gov/)."
34 + *       Alternately, this acknowledgment may appear in the software itself,
35 + *       if and wherever such third-party acknowledgments normally appear.
36 + *
37 + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 + *       and "The Regents of the University of California" must
39 + *       not be used to endorse or promote products derived from this
40 + *       software without prior written permission. For written
41 + *       permission, please contact [email protected].
42 + *
43 + * 5. Products derived from this software may not be called "Radiance",
44 + *       nor may "Radiance" appear in their name, without prior written
45 + *       permission of Lawrence Berkeley National Laboratory.
46 + *
47 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 + * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 + * SUCH DAMAGE.
59 + * ====================================================================
60 + *
61 + * This software consists of voluntary contributions made by many
62 + * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 + * information on Lawrence Berkeley National Laboratory, please see
64 + * <http://www.lbl.gov/>.
65 + */
66 +
67   #include  "standard.h"
68  
69   #include  "octree.h"
70  
71   #include  "object.h"
72  
19 – #include  "otypes.h"
20 –
73   #ifndef  OSTSIZ
74   #ifdef  BIGMEM
75 < #define  OSTSIZ         56437           /* object table size (a prime!) */
75 > #define  OSTSIZ         262139          /* object table size (a prime!) */
76   #else
77 < #define  OSTSIZ         12329           /* object table size (a prime!) */
77 > #define  OSTSIZ         32749           /* object table size (a prime!) */
78   #endif
79   #endif
80  
81   static OBJECT  *ostable[OSTSIZ];        /* the object set table */
82  
83  
84 + void
85   insertelem(os, obj)             /* insert obj into os, no questions */
86   register OBJECT  *os;
87   OBJECT  obj;
# Line 44 | Line 97 | OBJECT  obj;
97   }
98  
99  
100 + void
101   deletelem(os, obj)              /* delete obj from os, no questions */
102   register OBJECT  *os;
103   OBJECT  obj;
# Line 63 | Line 117 | OBJECT  obj;
117   }
118  
119  
120 + int
121   inset(os, obj)                  /* determine if object is in set */
122   register OBJECT  *os;
123   OBJECT  obj;
# Line 70 | Line 125 | OBJECT  obj;
125          int  upper, lower;
126          register int  cm, i;
127  
128 +        if ((i = os[0]) <= 6) {         /* linear search algorithm */
129 +                cm = obj;
130 +                while (i-- > 0)
131 +                        if (*++os == cm)
132 +                                return(1);
133 +                return(0);
134 +        }
135          lower = 1;
136 <        upper = cm = os[0] + 1;
137 <
136 >        upper = cm = i + 1;
137 >                                        /* binary search algorithm */
138          while ((i = (lower + upper) >> 1) != cm) {
139                  cm = obj - os[i];
140                  if (cm > 0)
# Line 87 | Line 149 | OBJECT  obj;
149   }
150  
151  
152 + int
153   setequal(os1, os2)              /* determine if two sets are equal */
154   register OBJECT  *os1, *os2;
155   {
# Line 99 | Line 162 | register OBJECT  *os1, *os2;
162   }
163  
164  
165 + void
166   setcopy(os1, os2)               /* copy object set os2 into os1 */
167   register OBJECT  *os1, *os2;
168   {
# Line 109 | Line 173 | register OBJECT  *os1, *os2;
173   }
174  
175  
176 + OBJECT *
177 + setsave(os)                     /* allocate space and save set */
178 + register OBJECT  *os;
179 + {
180 +        OBJECT  *osnew;
181 +        register OBJECT  *oset;
182 +        register int  i;
183 +
184 +        if ((osnew = oset = (OBJECT *)malloc((*os+1)*sizeof(OBJECT))) == NULL)
185 +                error(SYSTEM, "out of memory in setsave\n");
186 +        for (i = *os; i-- >= 0; )       /* inline setcopy */
187 +                *oset++ = *os++;
188 +        return(osnew);
189 + }
190 +
191 +
192 + void
193 + setunion(osr, os1, os2)         /* osr = os1 Union os2 */
194 + register OBJECT  *osr, *os1, *os2;
195 + {
196 +        register int    i1, i2;
197 +
198 +        osr[0] = 0;
199 +        for (i1 = i2 = 1; i1 <= os1[0] || i2 <= os2[0]; ) {
200 +                while (i1 <= os1[0] && (i2 > os2[0] || os1[i1] <= os2[i2])) {
201 +                        osr[++osr[0]] = os1[i1];
202 +                        if (i2 <= os2[0] && os2[i2] == os1[i1])
203 +                                i2++;
204 +                        i1++;
205 +                }
206 +                while (i2 <= os2[0] && (i1 > os1[0] || os2[i2] < os1[i1]))
207 +                        osr[++osr[0]] = os2[i2++];
208 +        }
209 + }
210 +
211 +
212 + void
213 + setintersect(osr, os1, os2)     /* osr = os1 Intersect os2 */
214 + register OBJECT  *osr, *os1, *os2;
215 + {
216 +        register int    i1, i2;
217 +
218 +        osr[0] = 0;
219 +        if (os1[0] <= 0)
220 +                return;
221 +        for (i1 = i2 = 1; i2 <= os2[0]; ) {
222 +                while (os1[i1] < os2[i2])
223 +                        if (++i1 > os1[0])
224 +                                return;
225 +                while (os2[i2] < os1[i1])
226 +                        if (++i2 > os2[0])
227 +                                return;
228 +                if (os1[i1] == os2[i2])
229 +                        osr[++osr[0]] = os2[i2++];
230 +        }
231 + }
232 +
233 +
234   OCTREE
235   fullnode(oset)                  /* return octree for object set */
236   OBJECT  *oset;
# Line 165 | Line 287 | memerr:
287   }
288  
289  
290 + void
291   objset(oset, ot)                /* get object set for full node */
292   register OBJECT  *oset;
293   OCTREE  ot;
# Line 174 | Line 297 | OCTREE  ot;
297  
298          if (!isfull(ot))
299                  goto noderr;
300 <        i = oseti(ot);
301 <        if ((os = ostable[i%OSTSIZ]) == NULL)
300 >        ot = oseti(ot);
301 >        if ((os = ostable[ot%OSTSIZ]) == NULL)
302                  goto noderr;
303 <        for (i /= OSTSIZ; i--; os += *os + 1)
303 >        for (i = ot/OSTSIZ; i--; os += *os + 1)
304                  if (*os <= 0)
305                          goto noderr;
306          for (i = *os; i-- >= 0; )               /* copy set here */
# Line 188 | Line 311 | noderr:
311   }
312  
313  
314 < nonsurfinset(orig, nobjs)               /* check sets for non-surfaces */
315 < int  orig, nobjs;
314 > int
315 > dosets(f)                               /* loop through all sets */
316 > int     (*f)();
317   {
318 +        int  res = 0;
319          int  n;
320          register OBJECT  *os;
196 –        register OBJECT  i, s;
321  
322          for (n = 0; n < OSTSIZ; n++) {
323                  if ((os = ostable[n]) == NULL)
324                          continue;
325 <                while ((i = *os++) > 0)
326 <                        while (i--) {
327 <                                s = *os;
328 <                                if (s >= orig && s < orig+nobjs &&
205 <                                                !issurface(objptr(s)->otype))
206 <                                        return(1);
207 <                                os++;
208 <                        }
325 >                while (*os > 0) {
326 >                        res += (*f)(os);
327 >                        os += *os + 1;
328 >                }
329          }
330 <        return(0);
330 >        return(res);
331 > }
332 >
333 >
334 > void
335 > donesets()                      /* free ALL SETS in our table */
336 > {
337 >        register int  n;
338 >
339 >        for (n = 0; n < OSTSIZ; n++)
340 >                if (ostable[n] != NULL) {
341 >                        free((void *)ostable[n]);
342 >                        ostable[n] = NULL;
343 >                }
344   }

Diff Legend

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