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

Comparing ray/src/common/rglmat.c (file contents):
Revision 3.1 by gwlarson, Tue Jun 9 11:18:35 1998 UTC vs.
Revision 3.2 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 Radiance -> OpenGL materials.
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  
13 – extern int      free(), freemtl();
14 –
67   int     domats = 1;                     /* are we doing materials? */
68  
69   LUTAB   mtab = LU_SINIT(free,freemtl);
70  
71  
72 + void
73   rgl_matclear()                  /* clean up materials */
74   {
75          lu_done(&mtab);
# Line 38 | Line 91 | char   *nam;
91   }
92  
93  
94 + int
95   o_default(o)                    /* default object is non-material modifier */
96   register OBJREC *o;
97   {
# Line 55 | Line 109 | register OBJREC        *o;
109                          goto memerr;
110                  strcpy(lup->key, o->oname);
111          } else if (lup->data != NULL)
112 <                freemtl(lup->data);
112 >                freemtl((MATREC *)lup->data);
113          if ((lup->data = o->os) != NULL)        /* make material reference */
114                  ((MATREC *)lup->data)->nlinks++;
115          return;
# Line 78 | Line 132 | char   *nam;
132                          goto memerr;
133                  strcpy(lup->key, nam);
134          } else if (lup->data != NULL)
135 <                freemtl(lup->data);
135 >                freemtl((MATREC *)lup->data);
136          lup->data = (char *)malloc(sizeof(MATREC));
137          if (lup->data == NULL)
138                  goto memerr;
# Line 89 | Line 143 | memerr:
143   }
144  
145  
146 + void
147   freemtl(mp)                     /* free a material */
148   register MATREC *mp;
149   {
150          if (!--mp->nlinks)
151 <                free((char *)mp);
151 >                free((void *)mp);
152   }
153  
154  
155 + int
156   m_normal(o)                     /* compute normal material parameters */
157   register OBJREC *o;
158   {
# Line 128 | Line 184 | register OBJREC        *o;
184   }
185  
186  
187 + int
188   m_aniso(o)                      /* anisotropic material */
189   register OBJREC *o;
190   {
# Line 159 | Line 216 | register OBJREC        *o;
216   }
217  
218  
219 + int
220   m_glass(o)                      /* glass material (hopeless) */
221   OBJREC  *o;
222   {
# Line 172 | Line 230 | OBJREC *o;
230   }
231  
232  
233 + int
234   m_brdf(o)                       /* convert functional material */
235   register OBJREC *o;
236   {
# Line 198 | Line 257 | register OBJREC        *o;
257   }
258  
259  
260 + int
261   m_brdf2(o)                      /* convert advanced functional material */
262   register OBJREC *o;
263   {
# Line 217 | Line 277 | register OBJREC        *o;
277   }
278  
279  
280 + int
281   m_light(o)                      /* convert light type */
282   register OBJREC *o;
283   {
# Line 245 | Line 306 | register OBJREC        *o;
306   }
307  
308  
309 + int
310   m_mirror(o)                     /* convert mirror type */
311   register OBJREC *o;
312   {
# Line 261 | Line 323 | register OBJREC        *o;
323   }
324  
325  
326 + int
327   m_prism(o)                      /* convert prism type */
328   register OBJREC *o;
329   {

Diff Legend

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