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

Comparing ray/src/common/instance.h (file contents):
Revision 2.3 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.6 by greg, Fri Jun 27 06:53:21 2003 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  instance.h - header file for routines using octree objects.
4   *
5   *  Include after object.h and octree.h
6   */
7 + #ifndef _RAD_INSTANCE_H_
8 + #define _RAD_INSTANCE_H_
9 + #ifdef __cplusplus
10 + extern "C" {
11 + #endif
12  
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 – */
64 –
13   typedef struct scene {
14          char  *name;                    /* octree name */
15          int  nref;                      /* number of references */
# Line 76 | Line 24 | typedef struct {
24          SCENE  *obj;                    /* loaded object */
25   }  INSTANCE;                    /* instance of octree */
26  
79 – #ifdef NOPROTO
27  
81 – extern SCENE  *getscene();
82 – extern INSTANCE  *getinstance();
83 – extern void  freescene();
84 – extern void  freeinstance();
85 –
86 – #else
87 –
28   extern SCENE  *getscene(char *sname, int flags);
29   extern INSTANCE  *getinstance(OBJREC *o, int flags);
30   extern void  freescene(SCENE *sc);
31   extern void  freeinstance(OBJREC *o);
32  
33 +
34 + #ifdef __cplusplus
35 + }
36   #endif
37 + #endif /* _RAD_INSTANCE_H_ */
38 +

Diff Legend

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