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.5 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.8 by greg, Sun Nov 1 04:41:55 2009 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  octree.c - routines dealing with octrees and cubes.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
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 < */
8 > #include "copyright.h"
9  
10   #include  "standard.h"
11  
# Line 74 | Line 19 | static OCTREE  treetop = 0;            /* next free node */
19   OCTREE
20   octalloc()                      /* allocate an octree */
21   {
22 <        register OCTREE  freet;
22 >        OCTREE  freet;
23  
24          if ((freet = ofreelist) != EMPTY) {
25                  ofreelist = octkid(freet, 0);
# Line 89 | Line 34 | octalloc()                     /* allocate an octree */
34                                  (unsigned)OCTBLKSIZ*8*sizeof(OCTREE))) == NULL)
35                          return(EMPTY);
36          }
37 <        treetop += 8;
37 >        treetop++;
38          return(freet);
39   }
40  
41  
42   void
43   octfree(ot)                     /* free an octree */
44 < register OCTREE  ot;
44 > OCTREE  ot;
45   {
46 <        register int  i;
46 >        int  i;
47  
48          if (!istree(ot))
49                  return;
# Line 112 | Line 57 | register OCTREE  ot;
57   void
58   octdone()                       /* free EVERYTHING */
59   {
60 <        register int    i;
60 >        int     i;
61  
62          for (i = 0; i < MAXOBLK; i++) {
63                  if (octblock[i] == NULL)
# Line 127 | Line 72 | octdone()                      /* free EVERYTHING */
72  
73   OCTREE
74   combine(ot)                     /* recursively combine nodes */
75 < register OCTREE  ot;
75 > OCTREE  ot;
76   {
77 <        register int  i;
78 <        register OCTREE  ores;
77 >        int  i;
78 >        OCTREE  ores;
79  
80          if (!istree(ot))        /* not a tree */
81                  return(ot);
# Line 148 | Line 93 | register OCTREE  ot;
93  
94   void
95   culocate(cu, pt)                /* locate point within cube */
96 < register CUBE  *cu;
97 < register FVECT  pt;
96 > CUBE  *cu;
97 > FVECT  pt;
98   {
99 <        register int  i;
99 >        int  i;
100          int  branch;
101  
102          while (istree(cu->cutree)) {
# Line 167 | Line 112 | register FVECT  pt;
112   }
113  
114  
170 – void
171 – cucopy(cu1, cu2)                /* copy cu2 into cu1 */
172 – register CUBE  *cu1, *cu2;
173 – {
174 –        cu1->cutree = cu2->cutree;
175 –        cu1->cusize = cu2->cusize;
176 –        VCOPY(cu1->cuorg, cu2->cuorg);
177 – }
178 –
179 –
115   int
116   incube(cu, pt)                  /* determine if a point is inside a cube */
117 < register CUBE  *cu;
118 < register FVECT  pt;
117 > CUBE  *cu;
118 > FVECT  pt;
119   {
120          if (cu->cuorg[0] > pt[0] || pt[0] >= cu->cuorg[0] + cu->cusize)
121                  return(0);

Diff Legend

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