--- ray/src/common/rglsurf.c 1998/12/11 13:53:32 3.3 +++ ray/src/common/rglsurf.c 2003/02/22 02:07:22 3.4 @@ -1,13 +1,67 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rglsurf.c,v 3.4 2003/02/22 02:07:22 greg Exp $"; #endif - /* * Convert Radiance -> OpenGL surfaces. */ +/* ==================================================================== + * 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 + * . + */ + #include "radogl.h" #ifndef NSLICES @@ -29,6 +83,7 @@ static char *glu_rout = "unk"; /* active GLU routine * #define NOPOLY() if (curpolysize) {glEnd(); curpolysize = 0;} else +void setmaterial(mp, cent, ispoly) /* prepare for new material */ register MATREC *mp; FVECT cent; @@ -80,7 +135,7 @@ register FVECT v[]; /* vertex list */ } -static +static void glu_error(en) /* report an error as a warning */ GLenum en; { @@ -111,8 +166,8 @@ newtess() /* allocate GLU tessellation object */ { if ((gluto = gluNewTess()) == NULL) error(INTERNAL, "gluNewTess failed"); - gluTessCallback(gluto, GLU_TESS_BEGIN, glBegin); - gluTessCallback(gluto, GLU_TESS_VERTEX, glVertex3dv); + gluTessCallback(gluto, GLU_TESS_BEGIN, (_GLUfuncptr)glBegin); + gluTessCallback(gluto, GLU_TESS_VERTEX, (_GLUfuncptr)glVertex3dv); gluTessCallback(gluto, GLU_TESS_END, glEnd); gluTessCallback(gluto, GLU_TESS_COMBINE, myCombine); gluTessCallback(gluto, GLU_TESS_ERROR, glu_error); @@ -130,6 +185,7 @@ newquadric() /* allocate GLU quadric structure */ } +int o_face(o) /* convert a face */ register OBJREC *o; { @@ -143,8 +199,8 @@ register OBJREC *o; if (area <= FTINY) return; if (dolights) /* check for source */ - doflatsrc(o->os, cent, norm, area); - setmaterial(o->os, cent, 1); /* set material */ + doflatsrc((MATREC *)o->os, cent, norm, area); + setmaterial((MATREC *)o->os, cent, 1); /* set material */ if (o->oargs.nfargs/3 != curpolysize) { if (curpolysize) glEnd(); curpolysize = o->oargs.nfargs/3; @@ -179,6 +235,7 @@ register OBJREC *o; } +void surfclean() /* clean up surface routines */ { setmaterial(NULL, NULL, 0); @@ -194,6 +251,7 @@ surfclean() /* clean up surface routines */ } +int o_sphere(o) /* convert a sphere */ register OBJREC *o; { @@ -206,9 +264,9 @@ register OBJREC *o; } else if (o->oargs.farg[3] <= FTINY) return; if (dolights) - dosphsrc(o->os, o->oargs.farg, + dosphsrc((MATREC *)o->os, o->oargs.farg, PI*o->oargs.farg[3]*o->oargs.farg[3]); - setmaterial(o->os, o->oargs.farg, 0); + setmaterial((MATREC *)o->os, o->oargs.farg, 0); if (gluqo == NULL) newquadric(); glu_rout = "making sphere"; gluQuadricOrientation(gluqo, @@ -223,6 +281,7 @@ register OBJREC *o; } +int o_cone(o) /* convert a cone or cylinder */ register OBJREC *o; { @@ -232,7 +291,7 @@ register OBJREC *o; iscyl = o->otype==OBJ_CYLINDER | o->otype==OBJ_TUBE; if (o->oargs.nfargs != (iscyl ? 7 : 8)) - objerror(o, "bad # real arguments"); + objerror(o, USER, "bad # real arguments"); if (o->oargs.farg[6] < -FTINY) { o->oargs.farg[6] = -o->oargs.farg[6]; if (iscyl) @@ -256,7 +315,7 @@ register OBJREC *o; cent[0] = .5*(o->oargs.farg[0] + o->oargs.farg[3]); cent[1] = .5*(o->oargs.farg[1] + o->oargs.farg[4]); cent[2] = .5*(o->oargs.farg[2] + o->oargs.farg[5]); - setmaterial(o->os, cent, 0); + setmaterial((MATREC *)o->os, cent, 0); if (gluqo == NULL) newquadric(); glu_rout = "making cylinder"; gluQuadricOrientation(gluqo, o->otype==OBJ_CUP | o->otype==OBJ_TUBE ? @@ -285,13 +344,14 @@ register OBJREC *o; } +int o_ring(o) /* convert a ring */ register OBJREC *o; { double x1, y1, d; if (o->oargs.nfargs != 8) - objerror(o, "bad # real arguments"); + objerror(o, USER, "bad # real arguments"); if (o->oargs.farg[7] < o->oargs.farg[6]) { register double d = o->oargs.farg[7]; o->oargs.farg[7] = o->oargs.farg[6]; @@ -304,10 +364,10 @@ register OBJREC *o; if (o->oargs.farg[7] - o->oargs.farg[6] <= FTINY) return; if (dolights) - doflatsrc(o->os, o->oargs.farg, o->oargs.farg+3, + doflatsrc((MATREC *)o->os, o->oargs.farg, o->oargs.farg+3, PI*(o->oargs.farg[7]*o->oargs.farg[7] - o->oargs.farg[6]*o->oargs.farg[6])); - setmaterial(o->os, o->oargs.farg, 0); + setmaterial((MATREC *)o->os, o->oargs.farg, 0); if (gluqo == NULL) newquadric(); glu_rout = "making disk"; gluQuadricOrientation(gluqo, GLU_OUTSIDE);