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.2 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 3.6 by schorsch, Fri Nov 14 17:22:06 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
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 < */
8 > #include "copyright.h"
9  
10   #include "radogl.h"
11  
# Line 109 | Line 54 | register OBJREC        *o;
54                          goto memerr;
55                  strcpy(lup->key, o->oname);
56          } else if (lup->data != NULL)
57 <                freemtl((MATREC *)lup->data);
57 >                freemtl(lup->data);
58          if ((lup->data = o->os) != NULL)        /* make material reference */
59                  ((MATREC *)lup->data)->nlinks++;
60 <        return;
60 >        return(0);
61   memerr:
62          error(SYSTEM, "out of memory in o_default");
63 +        return(0);
64   }
65  
66  
67 + int
68 + o_unsupported(o)                /* unsupported object primitive */
69 + OBJREC  *o;
70 + {
71 +        objerror(o, WARNING, "unsupported type");
72 +        return(0);
73 + }
74 +
75 +
76   MATREC *
77   newmaterial(nam)                /* get an entry for a new material */
78   char    *nam;
# Line 132 | Line 87 | char   *nam;
87                          goto memerr;
88                  strcpy(lup->key, nam);
89          } else if (lup->data != NULL)
90 <                freemtl((MATREC *)lup->data);
90 >                freemtl(lup->data);
91          lup->data = (char *)malloc(sizeof(MATREC));
92          if (lup->data == NULL)
93                  goto memerr;
# Line 140 | Line 95 | char   *nam;
95          return((MATREC *)lup->data);
96   memerr:
97          error(SYSTEM, "out of memory in newmaterial");
98 +        return NULL; /* pro forma return */
99   }
100  
101  
102   void
103 < freemtl(mp)                     /* free a material */
104 < register MATREC *mp;
103 > freemtl(p)                      /* free a material */
104 > void    *p;
105   {
106 +        register MATREC *mp = (MATREC *)p;
107 +
108          if (!--mp->nlinks)
109                  free((void *)mp);
110   }
# Line 181 | Line 139 | register OBJREC        *o;
139                  m->u.m.specexp = 2./(o->oargs.farg[4]*o->oargs.farg[4]);
140          if (m->u.m.specexp > MAXSPECEXP)
141                  m->u.m.specexp = MAXSPECEXP;
142 +        return(0);
143   }
144  
145  
# Line 213 | Line 172 | register OBJREC        *o;
172                  m->u.m.specexp = 2./(o->oargs.farg[4]*o->oargs.farg[5]);
173          if (m->u.m.specexp > MAXSPECEXP)
174                  m->u.m.specexp = MAXSPECEXP;
175 +        return(0);
176   }
177  
178  
# Line 227 | Line 187 | OBJREC *o;
187          setcolor(m->u.m.ambdiff, 0., 0., 0.);
188          setcolor(m->u.m.specular, .08, .08, .08);
189          m->u.m.specexp = MAXSPECEXP;
190 +        return(0);
191   }
192  
193  
# Line 254 | Line 215 | register OBJREC        *o;
215                  scalecolor(m->u.m.ambdiff, 1.-o->oargs.farg[4]);
216          }
217          m->u.m.specexp = UNKSPECEXP;
218 +        return(0);
219   }
220  
221  
# Line 274 | Line 236 | register OBJREC        *o;
236                                          /* guess the rest */
237          setcolor(m->u.m.specular, .1, .1, .1);
238          m->u.m.specexp = UNKSPECEXP;
239 +        return(0);
240   }
241  
242  
# Line 303 | Line 266 | register OBJREC        *o;
266                  m->u.l.spotdir[0] = m->u.l.spotdir[1] = 0.;
267                  m->u.l.spotdir[2] = -1.;
268          }
269 +        return(0);
270   }
271  
272  
# Line 320 | Line 284 | register OBJREC        *o;
284          setcolor(m->u.m.specular, o->oargs.farg[0],
285                          o->oargs.farg[1], o->oargs.farg[2]);
286          m->u.m.specexp = MAXSPECEXP;
287 +        return(0);
288   }
289  
290  
# Line 334 | Line 299 | register OBJREC        *o;
299          setcolor(m->u.m.ambdiff, 0.2, 0.2, 0.2);
300          setcolor(m->u.m.specular, 0.1, 0.1, 0.1);
301          m->u.m.specexp = UNKSPECEXP;
302 +        return(0);
303   }

Diff Legend

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