--- ray/src/common/rglmat.c	2003/02/22 02:07:22	3.2
+++ ray/src/common/rglmat.c	2003/09/16 06:31:48	3.5
@@ -1,66 +1,11 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rglmat.c,v 3.2 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: rglmat.c,v 3.5 2003/09/16 06:31:48 greg Exp $";
 #endif
 /*
  * Routines for Radiance -> OpenGL materials.
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
 #include "radogl.h"
 
@@ -109,15 +54,25 @@ register OBJREC	*o;
 			goto memerr;
 		strcpy(lup->key, o->oname);
 	} else if (lup->data != NULL)
-		freemtl((MATREC *)lup->data);
+		freemtl(lup->data);
 	if ((lup->data = o->os) != NULL)	/* make material reference */
 		((MATREC *)lup->data)->nlinks++;
-	return;
+	return(0);
 memerr:
 	error(SYSTEM, "out of memory in o_default");
+	return(0);
 }
 
 
+int
+o_unsupported(o)		/* unsupported object primitive */
+OBJREC	*o;
+{
+	objerror(o, WARNING, "unsupported type");
+	return(0);
+}
+
+
 MATREC *
 newmaterial(nam)		/* get an entry for a new material */
 char	*nam;
@@ -132,7 +87,7 @@ char	*nam;
 			goto memerr;
 		strcpy(lup->key, nam);
 	} else if (lup->data != NULL)
-		freemtl((MATREC *)lup->data);
+		freemtl(lup->data);
 	lup->data = (char *)malloc(sizeof(MATREC));
 	if (lup->data == NULL)
 		goto memerr;
@@ -144,9 +99,11 @@ memerr:
 
 
 void
-freemtl(mp)			/* free a material */
-register MATREC	*mp;
+freemtl(p)			/* free a material */
+void	*p;
 {
+	register MATREC	*mp = (MATREC *)p;
+
 	if (!--mp->nlinks)
 		free((void *)mp);
 }
@@ -181,6 +138,7 @@ register OBJREC	*o;
 		m->u.m.specexp = 2./(o->oargs.farg[4]*o->oargs.farg[4]);
 	if (m->u.m.specexp > MAXSPECEXP)
 		m->u.m.specexp = MAXSPECEXP;
+	return(0);
 }
 
 
@@ -213,6 +171,7 @@ register OBJREC	*o;
 		m->u.m.specexp = 2./(o->oargs.farg[4]*o->oargs.farg[5]);
 	if (m->u.m.specexp > MAXSPECEXP)
 		m->u.m.specexp = MAXSPECEXP;
+	return(0);
 }
 
 
@@ -227,6 +186,7 @@ OBJREC	*o;
 	setcolor(m->u.m.ambdiff, 0., 0., 0.);
 	setcolor(m->u.m.specular, .08, .08, .08);
 	m->u.m.specexp = MAXSPECEXP;
+	return(0);
 }
 
 
@@ -254,6 +214,7 @@ register OBJREC	*o;
 		scalecolor(m->u.m.ambdiff, 1.-o->oargs.farg[4]);
 	}
 	m->u.m.specexp = UNKSPECEXP;
+	return(0);
 }
 
 
@@ -274,6 +235,7 @@ register OBJREC	*o;
 					/* guess the rest */
 	setcolor(m->u.m.specular, .1, .1, .1);
 	m->u.m.specexp = UNKSPECEXP;
+	return(0);
 }
 
 
@@ -303,6 +265,7 @@ register OBJREC	*o;
 		m->u.l.spotdir[0] = m->u.l.spotdir[1] = 0.;
 		m->u.l.spotdir[2] = -1.;
 	}
+	return(0);
 }
 
 
@@ -320,6 +283,7 @@ register OBJREC	*o;
 	setcolor(m->u.m.specular, o->oargs.farg[0],
 			o->oargs.farg[1], o->oargs.farg[2]);
 	m->u.m.specexp = MAXSPECEXP;
+	return(0);
 }
 
 
@@ -334,4 +298,5 @@ register OBJREC	*o;
 	setcolor(m->u.m.ambdiff, 0.2, 0.2, 0.2);
 	setcolor(m->u.m.specular, 0.1, 0.1, 0.1);
 	m->u.m.specexp = UNKSPECEXP;
+	return(0);
 }