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

Comparing ray/src/common/rglinst.c (file contents):
Revision 3.4 by gwlarson, Wed Sep 2 18:42:11 1998 UTC vs.
Revision 3.5 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   * Routines for reading instances and converting to OpenGL.
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   #include "octree.h"
67  
# Line 20 | Line 74 | typedef struct {
74          char    octfile[256];                   /* octree file path */
75   } OCTINST;                              /* octree to instantiate */
76  
23 – OBJECT  nobjects;                       /* number of objects loaded so far */
24 –
25 – extern int      free();
26 –
77   static double  ogetflt();
78   static long  ogetint();
79   static char  *ogetstr();
80 < static int  loadobj(), octerror(), skiptree();
80 > static int  loadobj();
81 > static void  skiptree();
82 > static void  octerror();
83   static OCTINST  *getoct();
84  
85   static char  *infn;                     /* input file name */
# Line 41 | Line 93 | static LUTAB   imtab = {imhash,NULL,NULL,NULL,0,NULL,0};
93   static LUTAB    ottab = LU_SINIT(free,free);
94  
95  
96 + int
97   o_instance(o)                           /* convert instance to list call */
98   register OBJREC *o;
99   {
# Line 69 | Line 122 | register OBJREC        *o;
122          }
123          ot = getoct(o->oargs.sarg[0]);  /* get octree reference */
124          if (ot->localmatl &= o->os != NULL)     /* set material */
125 <                setmaterial(o->os, ot->cent, 0);
125 >                setmaterial((MATREC *)o->os, ot->cent, 0);
126                                          /* call the assigned list */
127          glCallList(ot->listid);
128  
# Line 197 | Line 250 | FVECT  cent;
250   }
251  
252  
253 + int
254   loadoct(fname)                          /* read in objects from octree */
255   char  *fname;
256   {
# Line 286 | Line 340 | ogetflt()                      /* get a floating point number */
340   }
341          
342  
343 < static
343 > static void
344   skiptree()                              /* skip octree on input */
345   {
346          register int  i;
# Line 311 | Line 365 | skiptree()                             /* skip octree on input */
365   }
366  
367  
368 < static
368 > static int
369   loadobj()                               /* get next object */
370   {
371          static OBJREC    ob;
# Line 384 | Line 438 | memerr:
438   }
439  
440  
441 < static
441 > static void
442   octerror(etyp, msg)                     /* octree error */
443   int  etyp;
444   char  *msg;

Diff Legend

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