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

Comparing ray/src/common/octree.c (file contents):
Revision 2.4 by gwlarson, Mon Aug 24 16:38:44 1998 UTC vs.
Revision 2.5 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   *  octree.c - routines dealing with octrees and cubes.
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     7/28/85
11 > * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 > * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 > *
14 > * Redistribution and use in source and binary forms, with or without
15 > * modification, are permitted provided that the following conditions
16 > * are met:
17 > *
18 > * 1. Redistributions of source code must retain the above copyright
19 > *         notice, this list of conditions and the following disclaimer.
20 > *
21 > * 2. Redistributions in binary form must reproduce the above copyright
22 > *       notice, this list of conditions and the following disclaimer in
23 > *       the documentation and/or other materials provided with the
24 > *       distribution.
25 > *
26 > * 3. The end-user documentation included with the redistribution,
27 > *           if any, must include the following acknowledgment:
28 > *             "This product includes Radiance software
29 > *                 (http://radsite.lbl.gov/)
30 > *                 developed by the Lawrence Berkeley National Laboratory
31 > *               (http://www.lbl.gov/)."
32 > *       Alternately, this acknowledgment may appear in the software itself,
33 > *       if and wherever such third-party acknowledgments normally appear.
34 > *
35 > * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 > *       and "The Regents of the University of California" must
37 > *       not be used to endorse or promote products derived from this
38 > *       software without prior written permission. For written
39 > *       permission, please contact [email protected].
40 > *
41 > * 5. Products derived from this software may not be called "Radiance",
42 > *       nor may "Radiance" appear in their name, without prior written
43 > *       permission of Lawrence Berkeley National Laboratory.
44 > *
45 > * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 > * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 > * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 > * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 > * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 > * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 > * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 > * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 > * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 > * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 > * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 > * SUCH DAMAGE.
57 > * ====================================================================
58 > *
59 > * This software consists of voluntary contributions made by many
60 > * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 > * information on Lawrence Berkeley National Laboratory, please see
62 > * <http://www.lbl.gov/>.
63   */
64  
65   #include  "standard.h"
# Line 33 | Line 85 | octalloc()                     /* allocate an octree */
85                  errno = 0;
86                  if (octbi(freet) >= MAXOBLK)
87                          return(EMPTY);
88 <                if ((octblock[octbi(freet)] = (OCTREE *)bmalloc(
88 >                if ((octblock[octbi(freet)] = (OCTREE *)malloc(
89                                  (unsigned)OCTBLKSIZ*8*sizeof(OCTREE))) == NULL)
90                          return(EMPTY);
91          }
# Line 42 | Line 94 | octalloc()                     /* allocate an octree */
94   }
95  
96  
97 + void
98   octfree(ot)                     /* free an octree */
99   register OCTREE  ot;
100   {
# Line 56 | Line 109 | register OCTREE  ot;
109   }
110  
111  
112 + void
113   octdone()                       /* free EVERYTHING */
114   {
115          register int    i;
# Line 63 | Line 117 | octdone()                      /* free EVERYTHING */
117          for (i = 0; i < MAXOBLK; i++) {
118                  if (octblock[i] == NULL)
119                          break;
120 <                bfree((char *)octblock[i], (unsigned)256*8*sizeof(OCTREE));
120 >                free((void *)octblock[i]);
121                  octblock[i] = NULL;
122          }
123          ofreelist = EMPTY;
# Line 92 | Line 146 | register OCTREE  ot;
146   }
147  
148  
149 + void
150   culocate(cu, pt)                /* locate point within cube */
151   register CUBE  *cu;
152   register FVECT  pt;
# Line 112 | Line 167 | register FVECT  pt;
167   }
168  
169  
170 + void
171   cucopy(cu1, cu2)                /* copy cu2 into cu1 */
172   register CUBE  *cu1, *cu2;
173   {
# Line 121 | Line 177 | register CUBE  *cu1, *cu2;
177   }
178  
179  
180 + int
181   incube(cu, pt)                  /* determine if a point is inside a cube */
182   register CUBE  *cu;
183   register FVECT  pt;

Diff Legend

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