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

Comparing ray/src/common/octree.h (file contents):
Revision 2.5 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.9 by schorsch, Fri Jun 6 16:38:47 2003 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  octree.h - header file for routines using octrees.
4   */
5 + #ifndef _RAD_OCTREE_H_
6 + #define _RAD_OCTREE_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
11 < /* ====================================================================
7 < * The Radiance Software License, Version 1.0
8 < *
9 < * 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/>.
61 < */
11 > #include "copyright.h"
12  
13   /*
14   *      An octree is expressed as an integer which is either
# Line 88 | Line 38
38   #define  octti(ot)      (((ot)&03777)<<3)/* octree index in block */
39  
40   #ifndef  MAXOBLK
41 < #ifdef  BIGMEM
92 < #define  MAXOBLK        32767           /* maximum octree block */
93 < #else
41 > #ifdef  SMLMEM
42   #define  MAXOBLK        4095            /* maximum octree block */
43 + #else
44 + #define  MAXOBLK        32767           /* maximum octree block */
45   #endif
46   #endif
47  
# Line 134 | Line 84 | extern CUBE  thescene;                 /* the main scene */
84   #define  O_HIT          1               /* intersection */
85   #define  O_IN           2               /* cube contained entirely */
86  
137 #ifdef NOPROTO
87  
139 extern OCTREE   octalloc();
140 extern void     octfree();
141 extern void     octdone();
142 extern OCTREE   combine();
143 extern void     culocate();
144 extern void     cucopy();
145 extern int      incube();
146
147 extern int      readoct();
148
149 #else
150
88   extern OCTREE   octalloc(void);
89   extern void     octfree(OCTREE ot);
90   extern void     octdone(void);
# Line 158 | Line 95 | extern int     incube(CUBE *cu, FVECT pt);
95  
96   extern int      readoct(char *fname, int load, CUBE *scene, char *ofn[]);
97  
98 + extern void     readscene(FILE *fp, int objsiz);
99 + extern void     writescene(int firstobj, int nobjs, FILE *fp);
100 +
101 +
102 + #ifdef __cplusplus
103 + }
104   #endif
105 + #endif /* _RAD_OCTREE_H_ */
106 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines