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.5 by greg, Tue Sep 16 06:31:48 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 144 | Line 99 | memerr:
99  
100  
101   void
102 < freemtl(mp)                     /* free a material */
103 < register MATREC *mp;
102 > freemtl(p)                      /* free a material */
103 > void    *p;
104   {
105 +        register MATREC *mp = (MATREC *)p;
106 +
107          if (!--mp->nlinks)
108                  free((void *)mp);
109   }
# Line 181 | Line 138 | register OBJREC        *o;
138                  m->u.m.specexp = 2./(o->oargs.farg[4]*o->oargs.farg[4]);
139          if (m->u.m.specexp > MAXSPECEXP)
140                  m->u.m.specexp = MAXSPECEXP;
141 +        return(0);
142   }
143  
144  
# Line 213 | Line 171 | register OBJREC        *o;
171                  m->u.m.specexp = 2./(o->oargs.farg[4]*o->oargs.farg[5]);
172          if (m->u.m.specexp > MAXSPECEXP)
173                  m->u.m.specexp = MAXSPECEXP;
174 +        return(0);
175   }
176  
177  
# Line 227 | Line 186 | OBJREC *o;
186          setcolor(m->u.m.ambdiff, 0., 0., 0.);
187          setcolor(m->u.m.specular, .08, .08, .08);
188          m->u.m.specexp = MAXSPECEXP;
189 +        return(0);
190   }
191  
192  
# Line 254 | Line 214 | register OBJREC        *o;
214                  scalecolor(m->u.m.ambdiff, 1.-o->oargs.farg[4]);
215          }
216          m->u.m.specexp = UNKSPECEXP;
217 +        return(0);
218   }
219  
220  
# Line 274 | Line 235 | register OBJREC        *o;
235                                          /* guess the rest */
236          setcolor(m->u.m.specular, .1, .1, .1);
237          m->u.m.specexp = UNKSPECEXP;
238 +        return(0);
239   }
240  
241  
# Line 303 | Line 265 | register OBJREC        *o;
265                  m->u.l.spotdir[0] = m->u.l.spotdir[1] = 0.;
266                  m->u.l.spotdir[2] = -1.;
267          }
268 +        return(0);
269   }
270  
271  
# Line 320 | Line 283 | register OBJREC        *o;
283          setcolor(m->u.m.specular, o->oargs.farg[0],
284                          o->oargs.farg[1], o->oargs.farg[2]);
285          m->u.m.specexp = MAXSPECEXP;
286 +        return(0);
287   }
288  
289  
# Line 334 | Line 298 | register OBJREC        *o;
298          setcolor(m->u.m.ambdiff, 0.2, 0.2, 0.2);
299          setcolor(m->u.m.specular, 0.1, 0.1, 0.1);
300          m->u.m.specexp = UNKSPECEXP;
301 +        return(0);
302   }

Diff Legend

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