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

Comparing ray/src/common/rglfile.c (file contents):
Revision 3.2 by gwlarson, Mon Aug 17 17:57:59 1998 UTC vs.
Revision 3.4 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Load Radiance object(s) and create OpenGL display lists
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 + */
64 +
65   #include "radogl.h"
66  
67   #ifndef NLIST2ALLOC
68   #define NLIST2ALLOC     16              /* batch of display lists to get */
69   #endif
70  
17 – extern int      o_sphere(), o_face(), o_cone(), o_ring(),
18 –                o_source(), o_instance();
19 –
20 – extern int      m_normal(), m_glass(), m_aniso(), m_brdf(), m_brdf2(),
21 –                m_light(), m_prism(), m_mirror();
22 –
71   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
72  
73 + static int      nextlist, nlistleft = 0;
74  
75 < static
75 >
76 > static void
77   initotypes()                    /* initialize ofun array */
78   {
79          if (ofun[OBJ_SPHERE].funp == o_sphere)
# Line 69 | Line 119 | initotypes()                   /* initialize ofun array */
119   int
120   newglist()                      /* allocate an OGL list id */
121   {
122 <        static int      nextlist, nleft = 0;
73 <
74 <        if (!nleft--) {
122 >        if (!nlistleft--) {
123                  nextlist = glGenLists(NLIST2ALLOC);
124 <                nleft = NLIST2ALLOC-1;
124 >                if (!nextlist)
125 >                        error(SYSTEM, "no list space left in newglist");
126 >                nlistleft = NLIST2ALLOC-1;
127          }
128          return(nextlist++);
129   }
130  
131  
132 + void
133   rgl_checkerr(where)             /* check for GL or GLU error */
134   char    *where;
135   {
# Line 93 | Line 144 | char   *where;
144  
145  
146   int
147 < rgl_filelist(ic, inp)           /* load scene files into display list */
147 > rgl_filelist(ic, inp, nl)       /* load scene files into display list */
148   int     ic;
149   char    **inp;
150 + int     *nl;                    /* returned number of lists (optional) */
151   {
152          int     listid;
153  
# Line 110 | Line 162 | char   **inp;
162          glEndList();            /* end of top display list */
163          lightdefs();            /* define light sources */
164          loadoctrees();          /* load octrees (sublists) for instances */
165 +        if (nl != NULL)         /* return total number of lists allocated */
166 +                *nl = nextlist - listid;
167          return(listid);         /* all done -- return list id */
168   }
169  
170  
171   int
172 < rgl_octlist(fname, cent, radp)  /* load octree objects into display list */
172 > rgl_octlist(fname, cent, radp, nl)      /* load scen into display list */
173   char    *fname;
174   FVECT   cent;                   /* returned octree center (optional) */
175   FLOAT   *radp;                  /* returned octree size (optional) */
176 + int     *nl;                    /* returned number of lists (optional) */
177   {
178          double  r;
179          int     listid;
# Line 137 | Line 192 | FLOAT  *radp;                  /* returned octree size (optional) */
192          glEndList();            /* close top list */
193          lightdefs();            /* define light sources */
194          loadoctrees();          /* load referenced octrees into sublists */
195 +        if (nl != NULL)         /* return total number of lists allocated */
196 +                *nl = nextlist - listid;
197          return(listid);
198   }
199  
200  
201 + void
202   rgl_load(inpspec)               /* convert scene description into OGL calls */
203   char    *inpspec;
204   {
# Line 183 | Line 241 | char   *inpspec;
241   }
242  
243  
244 + void
245   rgl_object(name, fp)                    /* read the next object */
246   char  *name;
247   FILE  *fp;

Diff Legend

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